瀏覽代碼

修改bug

luowei 1 年之前
父節點
當前提交
5db631a837

+ 123 - 72
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -1,6 +1,7 @@
 package com.xunmei.common.core.domain.retrieval.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,186 +25,236 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_monitoring_retrieval_task")
-@ApiModel(value = "CoreMonitoringRetrievalTask对象" , description = "监控调阅任务")
-public class CoreMonitoringRetrievalTask extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
+public class CoreMonitoringRetrievalTask extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 计划id */
+    /**
+     * 计划id
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
-    /** 任务名称 */
-            @ApiModelProperty(value = "任务名称")
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty(value = "任务名称")
     private String taskName;
 
-    /** 调阅机构 */
+    /**
+     * 调阅机构
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /** 调阅机构 */
+    /**
+     * 调阅机构
+     */
     private String orgPath;
 
-    /** 调阅机构 */
-            @ApiModelProperty(value = "调阅机构")
+    /**
+     * 调阅机构
+     */
+    @ApiModelProperty(value = "调阅机构")
     private String orgName;
 
-    /** 年月日 */
+    /**
+     * 年月日
+     */
     private Date ymdDate;
 
-    /** 年 */
+    /**
+     * 年
+     */
     private Integer ymdYear;
 
-    /** 半年 */
+    /**
+     * 半年
+     */
     private Integer ymdHalfyear;
 
-    /** 季度 */
+    /**
+     * 季度
+     */
     private Integer ymdQuarter;
 
-    /** 月 */
+    /**
+     * 月
+     */
     private Integer ymdMonth;
 
-    /** 周 */
+    /**
+     * 周
+     */
     private Integer ymdWeek;
 
-    /** 日 */
+    /**
+     * 日
+     */
     private Integer ymdDay;
 
-    /** 周期无周期、每日、每周、每月、每季度、每半年、每年(0-6) */
+    /**
+     * 周期无周期、每日、每周、每月、每季度、每半年、每年(0-6)
+     */
     private String cycle;
 
-    /** 开始时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "开始时间")
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
     private Date planStartTime;
 
-    /** 结束时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "结束时间")
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
     private Date planEndTime;
 
-    /** 调阅开始时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "调阅开始时间")
+    /**
+     * 调阅开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅开始时间")
     private Date startTime;
 
-    /** 调阅结束时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "调阅结束时间")
+    /**
+     * 调阅结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅结束时间")
     private Date endTime;
 
-    /** 状态 */
-            @ApiModelProperty(value = "状态")
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
     private String status;
 
-    /** 角色id */
+    /**
+     * 角色id
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
-    /** 调阅人 */
+    /**
+     * 调阅人
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long retrievalUser;
 
-    /** 第几次调阅(根据计划的频次计算的来) */
+    /**
+     * 第几次调阅(根据计划的频次计算的来)
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Integer orderNum;
 
-    /** 批次号(同一计划多频次为一个批次号) */
+    /**
+     * 批次号(同一计划多频次为一个批次号)
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long batchNum;
 
-    /** 提交时间 */
+    /**
+     * 提交时间
+     */
     private Date submitTime;
 
-    /** 异常数 */
+    /**
+     * 异常数
+     */
     @ApiModelProperty(value = "异常数")
     private Integer exceptionCount;
     @ApiModelProperty(value = "0正常,1删除")
     private Integer isDeleted;
 
-      private String pdfUrl;
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+    private String pdfUrl;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("planId" ,getPlanId())
+                .append("planId", getPlanId())
 
 
-                .append("taskName" ,getTaskName())
+                .append("taskName", getTaskName())
 
 
-                .append("orgId" ,getOrgId())
+                .append("orgId", getOrgId())
 
 
-                .append("orgPath" ,getOrgPath())
+                .append("orgPath", getOrgPath())
 
 
-                .append("orgName" ,getOrgName())
+                .append("orgName", getOrgName())
 
 
-                .append("ymdDate" ,getYmdDate())
+                .append("ymdDate", getYmdDate())
 
 
-                .append("ymdYear" ,getYmdYear())
+                .append("ymdYear", getYmdYear())
 
 
-                .append("ymdHalfyear" ,getYmdHalfyear())
+                .append("ymdHalfyear", getYmdHalfyear())
 
 
-                .append("ymdQuarter" ,getYmdQuarter())
+                .append("ymdQuarter", getYmdQuarter())
 
 
-                .append("ymdMonth" ,getYmdMonth())
+                .append("ymdMonth", getYmdMonth())
 
 
-                .append("ymdWeek" ,getYmdWeek())
+                .append("ymdWeek", getYmdWeek())
 
 
-                .append("ymdDay" ,getYmdDay())
+                .append("ymdDay", getYmdDay())
 
 
-                .append("cycle" ,getCycle())
+                .append("cycle", getCycle())
 
 
-                .append("planStartTime" ,getPlanStartTime())
+                .append("planStartTime", getPlanStartTime())
 
 
-                .append("planEndTime" ,getPlanEndTime())
+                .append("planEndTime", getPlanEndTime())
 
 
-                .append("startTime" ,getStartTime())
+                .append("startTime", getStartTime())
 
 
-                .append("endTime" ,getEndTime())
+                .append("endTime", getEndTime())
 
 
-                .append("status" ,getStatus())
+                .append("status", getStatus())
 
 
-                .append("roleId" ,getRoleId())
+                .append("roleId", getRoleId())
 
 
-                .append("retrievalUser" ,getRetrievalUser())
+                .append("retrievalUser", getRetrievalUser())
 
 
-                .append("orderNum" ,getOrderNum())
+                .append("orderNum", getOrderNum())
 
 
-                .append("batchNum" ,getBatchNum())
+                .append("batchNum", getBatchNum())
 
 
-                .append("submitTime" ,getSubmitTime())
+                .append("submitTime", getSubmitTime())
 
 
-                .append("exceptionCount" ,getExceptionCount())
-        .toString();
-        }
-        }
+                .append("exceptionCount", getExceptionCount())
+                .toString();
+    }
+}

+ 4 - 6
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -54,10 +54,7 @@ import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import java.util.stream.Collectors;
 
@@ -924,8 +921,9 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
     public AccessPdf buildSafetyCheckRegisterBookData(AccessPdfVO accessPdfVO) {
         AccessPdf accessPdf = new AccessPdf();
         accessPdf.setTaskTitle("标题");
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
-        String dateStr = format.format(accessPdfVO.getTaskStartTime());
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
+       Calendar calendar=Calendar.getInstance();
+        String dateStr = format.format(accessPdfVO.getTaskStartTime())+"-"+calendar.get(Calendar.HOUR_OF_DAY)+"时"+calendar.get(Calendar.MINUTE)+"分";
         accessPdf.setTaskStartTime(dateStr);
         accessPdf.setCheckUser(accessPdfVO.getCheckUser());
         accessPdf.setOrgId(accessPdfVO.getOrgId());

+ 6 - 2
soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -130,7 +130,7 @@
         SELECT
             e.device_name AS hostName,
             d.device_name AS videoChannelName,
-            c.project AS project,
+            f.dict_label AS project,
             IF
                 ( c.situation = 0, '正常', '异常' ) AS situation,
             c.abnormal_illustrate AS abnormalIllustrate
@@ -140,8 +140,11 @@
                 LEFT JOIN core_monitoring_task_monitor_info c ON c.task_monitor_id = b.id
                 LEFT JOIN sys_device d ON b.video_channel = d.id
                 LEFT JOIN sys_device e ON e.id = d.host_id
+                LEFT JOIN sys_dict_data f ON f.dict_value = c.project
+                AND f.dict_type = 'core_registration_project'
         WHERE
             c.project IS NOT NULL
+          AND c.situation = 1
           AND a.task_id = #{taskId}
     </select>
     <select id="selectTask" resultType="com.xunmei.core.access.vo.AccessPdfVO">
@@ -152,7 +155,8 @@
             cycle AS cycle,
             plan_start_time AS startTime,
             plan_end_time AS endTime,
-            b.task_start_time AS taskStartTime
+            b.task_start_time AS taskStartTime,
+            b.create_by AS checkUser
         FROM
             core_monitoring_retrieval_task a
                 LEFT JOIN core_monitoring_task_registration b ON a.id = b.task_id

+ 60 - 24
soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -241,7 +241,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
 
-        writer.setPageEvent(new PdfPageHelperEvent(ListUtil.split((List<String>) data.get("fileImage"), 6).size() + 1, writer, fs,tableFont));
+        writer.setPageEvent(new PdfPageHelperEvent(ListUtil.split((List<String>) data.get("fileImage"), 6).size() + 1, writer, fs, tableFont));
         document.open();
         PdfUtil.dealHeader(document, fs, "学 习 教 育 记 录", 24);
         PdfUtil.dealEduBody(document, table, tableFont, data);
@@ -339,31 +339,67 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
         Font font = new Font(fs, 9, Font.NORMAL);
-        PdfUtil.dealHeader(document, fs, data.getOrgName()+data.getPlanCycle()+"("+data.getStartTime()+"~"+data.getEndTime()+")", 14);
-        String checkTime =  data.getTaskStartTime();
-        String checkUser = "检查人: " + data.getCheckUser();
-   /*     PdfPCell orgCell = new PdfPCell(new Phrase(orgName, font));
-        orgCell.setColspan(16);
+        PdfUtil.dealHeader(document, fs, "监控点阅情况登记簿", 14);
+        String checkTime = data.getTaskStartTime();
+        String checkUser = data.getCheckUser();
+
+        PdfPCell orgCell = new PdfPCell(new Phrase("调阅单位", font));
+        orgCell.setColspan(8);
         orgCell.setRowspan(1);
         orgCell.setBorder(Rectangle.NO_BORDER);
-        orgCell.setHorizontalAlignment(Element.ALIGN_LEFT);*/
-        PdfPCell checkUserCell1 = new PdfPCell(new Phrase(checkUser, font));
-        checkUserCell1.setColspan(15);
-        PdfPCell checkUserCell = new PdfPCell(new Phrase(checkUser, font));
-        checkUserCell.setColspan(20);
-        checkUserCell.setRowspan(1);
-        checkUserCell.setBorder(Rectangle.NO_BORDER);
-        checkUserCell.setHorizontalAlignment(Element.ALIGN_CENTER);
-
-        PdfPCell dateStrCell = new PdfPCell(new Phrase(checkTime, font));
-        dateStrCell.setColspan(10);
-        dateStrCell.setRowspan(1);
-        dateStrCell.setBorder(Rectangle.NO_BORDER);
-        dateStrCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
-      //  table.addCell(orgCell);
-        table.addCell(checkUserCell);
-        table.addCell(dateStrCell);
+        orgCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+
+        PdfPCell orgNameCell = new PdfPCell(new Phrase(data.getOrgName(), font));
+        orgNameCell.setColspan(15);
+        orgNameCell.setRowspan(1);
+        orgNameCell.setBorder(Rectangle.NO_BORDER);
+        orgNameCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+
+        PdfPCell userCell = new PdfPCell(new Phrase("调阅人", font));
+        userCell.setColspan(8);
+        userCell.setRowspan(1);
+        userCell.setBorder(Rectangle.NO_BORDER);
+        userCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell userNameCell = new PdfPCell(new Phrase(checkUser, font));
+        userNameCell.setColspan(15);
+        userNameCell.setRowspan(1);
+        userNameCell.setBorder(Rectangle.NO_BORDER);
+        userNameCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell timeNameCell = new PdfPCell(new Phrase("调阅时间", font));
+        timeNameCell.setColspan(9);
+        timeNameCell.setRowspan(1);
+        timeNameCell.setBorder(Rectangle.NO_BORDER);
+        timeNameCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell timeCell = new PdfPCell(new Phrase(checkTime, font));
+        timeCell.setColspan(37);
+        timeCell.setRowspan(1);
+        timeCell.setBorder(Rectangle.NO_BORDER);
+        timeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+      /*  PdfPCell findCell = new PdfPCell(new Phrase("发现问题情况", font));
+        findCell.setColspan(46);
+        findCell.setRowspan(1);
+        findCell.setBorder(Rectangle.NO_BORDER);
+        findCell.setHorizontalAlignment(Element.ALIGN_RIGHT);*/
+
+/*        table.addCell(orgCell);
+        table.addCell(orgNameCell);
+        table.addCell(userCell);
+        table.addCell(userNameCell);
+        table.addCell(timeNameCell);
+        table.addCell(timeCell);*/
+        //    table.addCell(findCell);
         Font titleFont = new Font(fs, 8, Font.NORMAL);
+        PdfUtil.createPDFCell(titleFont, table, "调阅单位", Element.ALIGN_MIDDLE, 8, 0);
+        PdfUtil.createPDFCell(titleFont, table, data.getOrgName(), Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(titleFont, table, "调阅人", Element.ALIGN_MIDDLE, 8, 0);
+        PdfUtil.createPDFCell(titleFont, table, checkUser, Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(titleFont, table, "调阅时间", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(titleFont, table, checkTime, Element.ALIGN_MIDDLE, 37, 0);
+        PdfUtil.createPDFCell(titleFont, table, "发现问题情况", Element.ALIGN_MIDDLE, 46, 0);
         PdfUtil.dealAccessPBody(document, table, tableFont, titleFont, data.getDataVos());
         document.close();
         writer.close();
@@ -385,7 +421,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
 
-        writer.setPageEvent(new PdfPageHelperEvent(ListUtil.split((List<String>) data.get("fileImage"), 6).size() + 1, writer, fs,tableFont));
+        writer.setPageEvent(new PdfPageHelperEvent(ListUtil.split((List<String>) data.get("fileImage"), 6).size() + 1, writer, fs, tableFont));
         document.open();
         PdfUtil.dealHeader(document, fs, "预 案 演 练 记 录", 24);
         PdfUtil.dealDrillBody(document, table, tableFont, data);

+ 12 - 13
soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -503,19 +503,19 @@ public class PdfUtil {
         }
     }
     public static void dealAccessPBody(Document document, PdfPTable table, Font tableFont, Font tableTitleFont, List<AccessDataVo> data)throws DocumentException {
-        PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 2, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "视频主机", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "视频通道", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "项目", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "检查情况", Element.ALIGN_MIDDLE, 2, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "说明", Element.ALIGN_MIDDLE, 17, 0);
+
+        PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 3, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "硬盘录像机", Element.ALIGN_MIDDLE, 16, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "通道名称", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "检查项目", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "存在问题", Element.ALIGN_MIDDLE, 9, 0);
         for (int i = 1; i <= data.size(); i++) {
-            PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getHostName(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getVideoChannelName(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getProject(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getSituation().equals("0") ? "正常" : "异常", Element.ALIGN_MIDDLE, 2, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 17, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 3, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getHostName(), Element.ALIGN_MIDDLE, 16, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getVideoChannelName(), Element.ALIGN_MIDDLE, 9, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getProject(), Element.ALIGN_MIDDLE, 9, 0, 10);
+         //   PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getSituation().equals("0") ? "正常" : "异常", Element.ALIGN_MIDDLE, 2, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 9, 0, 10);
      }
         document.add(table);
     }
@@ -526,7 +526,6 @@ public class PdfUtil {
         PdfUtil.createPDFCell(tableTitleFont, table, "检查情况", Element.ALIGN_MIDDLE, 5, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "存在的问题及整改意见", Element.ALIGN_MIDDLE, 15, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "整改期限", Element.ALIGN_MIDDLE, 2, 0);
-//        List<Object> dataList = (List<Object>) data.get("content");
         for (int i = 1; i <= data.size(); i++) {
             PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getItemName(), Element.ALIGN_MIDDLE, 5, 0, 10);

+ 1 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -121,7 +121,7 @@ public class SysAreaCheckController extends BaseController {
     }
 
     @ApiOperation(value = "获取SysNfcBind通过机构id")
-    @RequiresPermissions("system:bind:query")
+
     @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();

+ 1 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaController.java

@@ -63,7 +63,7 @@ public class SysAreaController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "根据机构获取区域")
-    @RequiresPermissions("system:area:query")
+
     @GetMapping("/getAreaByOrg/{orgId}")
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
  /*       SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);