监控调阅任务

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -73,6 +73,8 @@ public interface RemoteOrgService {
      */
     @GetMapping("/org/getUpOrgs/{orgId}")
     List<Long> getUpOrgs(@PathVariable("orgId") Long orgId);
+    @GetMapping("/list/findAllOrg")
+    List<SysOrg> findAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 获取机构及父级机构的名称

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -100,6 +100,11 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             public List<IdNameVo> getParentName(List<Long> ids){
                 return  new ArrayList<>();
             }
+
+            @Override
+            public List<SysOrg> findAllOrg(String source) {
+                return null;
+            }
         };
     }
 }

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

@@ -51,25 +51,25 @@ private static final long serialVersionUID=1L;
     private Date ymdDate;
 
     /** 年 */
-    private Long ymdYear;
+    private Integer ymdYear;
 
     /** 半年 */
-    private Long ymdHalfyear;
+    private Integer ymdHalfyear;
 
     /** 季度 */
-    private Long ymdQuarter;
+    private Integer ymdQuarter;
 
     /** 月 */
-    private Long ymdMonth;
+    private Integer ymdMonth;
 
     /** 周 */
-    private Long ymdWeek;
+    private Integer ymdWeek;
 
     /** 日 */
-    private Long ymdDay;
+    private Integer ymdDay;
 
     /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
-    private Long cycle;
+    private Integer cycle;
 
     /** 开始时间 */
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -93,7 +93,7 @@ private static final long serialVersionUID=1L;
 
     /** 状态 */
             @ApiModelProperty(value = "状态")
-    private Long status;
+    private Integer status;
 
     /** 角色id */
     private Long roleId;
@@ -102,7 +102,7 @@ private static final long serialVersionUID=1L;
     private Long retrievalUser;
 
     /** 第几次调阅（根据计划的频次计算的来） */
-    private Long orderNum;
+    private Integer orderNum;
 
     /** 批次号（同一计划多频次为一个批次号） */
     private Long batchNum;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/RetrievalTaskCycle.java

@@ -0,0 +1,36 @@
+package com.xunmei.common.core.enums;
+
+/**
+ * 用户状态
+ * 
+ * @author xunmei
+ */
+public enum RetrievalTaskCycle
+{
+    NOCYCLE(0, "无周期"),
+    DAYCYCLE(1, "每日"),
+    WEEKCYCLE(2, "每月"),
+    MONTHCYCLE(3, "每月"),
+    QUARTERCYCLE(4, "每季度"),
+    HALFYEARCYCLE(4, "每半年"),
+    YEARCYCLE(5, "每年");
+
+    private final Integer code;
+    private final String info;
+
+    RetrievalTaskCycle(Integer code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -106,5 +108,37 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
         return toAjax(coreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(ids));
     }
 
+    /**
+     * 每天生成日任务
+     * 如果当天是周一还需生成周任务
+     * @return
+     */
+    @GetMapping("/dayTask/{taskTime}")
+    public AjaxResult dayTask(@PathVariable("taskTime") LocalDate taskTime) {
+        try {
+            coreMonitoringRetrievalTaskService.dayTask(taskTime);
+            return AjaxResult.success("任务生成成功");
+        } catch (Exception e) {
+            return AjaxResult.error("任务生成失败" + e.getMessage());
+        }
+
+    }
+
+    /**
+     * 1.1生成周期为每月，每季，每半年，每年的任务
+     * 4.1||10.1日生成周期为每月，每季
+     * 7.1日获取执行周期为每月，每季,每半年的
+     * 其他日期生成月任务
+     * @return
+     */
+    @GetMapping("/monthTask/{taskTime}")
+    public AjaxResult monthTask(@PathVariable("taskTime") LocalDate taskTime) {
+        try {
+            coreMonitoringRetrievalTaskService.monthTask(taskTime);
+            return AjaxResult.success("任务生成成功");
+        } catch (Exception e) {
+            return AjaxResult.error("任务生成失败" + e.getMessage());
+        }
+    }
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -1,10 +1,13 @@
 package com.xunmei.core.retrieval.service;
 
 import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
@@ -77,4 +80,8 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException;
 
     List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO);
+
+    void noCycleTask(List<TMonitoringRetrievalPlan> planList);
+    void dayTask(LocalDate taskTime);
+    void monthTask(LocalDate taskTime);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.retrieval.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
@@ -8,11 +9,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.DateRange;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.enums.RetrievalTaskCycle;
 import com.xunmei.common.core.utils.DateHelper;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.IDHelper;
+import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
@@ -21,6 +30,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,9 +38,14 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -47,16 +62,17 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     private RemoteOrgService orgService;
     @Resource
     private RemoteDictDataService dictDataService;
+    @Resource
+    private ITMonitoringRetrievalPlanService tMonitoringRetrievalPlanService;
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
 
         Page<CoreMonitoringRetrievalTaskVo> page;
         //分页
-        if (request.getPageNum()!=null&&request.getPageSize()!=null)
-        {
+        if (request.getPageNum() != null && request.getPageSize() != null) {
             page = new Page<>(request.getPageNum(), request.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
         //下穿
@@ -77,16 +93,16 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         request.setPageSize(null);
         request.setPageNum(null);
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        List<SysDictData>  listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.dictType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
+        List<SysDictData> listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.dictType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
         final TableDataInfo tableDataInfo = this.selectPage(request);
         if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
             throw new RuntimeException("导出数据为空!");
         }
         List<CoreMonitoringRetrievalTaskVo> list = this.selectPage(request).getRows();
-        list.forEach(r->{
-            r.setStatusText(listDict.stream().filter(d->d.getDictValue().equals(r.getStatus())).findFirst().orElse(new SysDictData()).getDictLabel());
+        list.forEach(r -> {
+            r.setStatusText(listDict.stream().filter(d -> d.getDictValue().equals(r.getStatus())).findFirst().orElse(new SysDictData()).getDictLabel());
         });
-        list.forEach(r->r.setNo(list.indexOf(r)+1));
+        list.forEach(r -> r.setNo(list.indexOf(r) + 1));
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("序号", "no");
         writer.addHeaderAlias("任务名称", "taskName");
@@ -152,7 +168,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
      */
     @Override
     public int insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
-            return coreMonitoringRetrievalTaskMapper.insert(CoreMonitoringRetrievalTask);
+        return coreMonitoringRetrievalTaskMapper.insert(CoreMonitoringRetrievalTask);
     }
 
     /**
@@ -187,4 +203,221 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     public int deleteCoreMonitoringRetrievalTaskById(Long id) {
         return coreMonitoringRetrievalTaskMapper.deleteById(id);
     }
+
+    /**
+     * 无周期任务生成
+     */
+    public void noCycleTask(List<TMonitoringRetrievalPlan> planList){
+        List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
+        LocalDate taskTime = planList.get(0).getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();;
+        for (TMonitoringRetrievalPlan plan : planList) {
+            //获取计划关联的机构
+            List<SysOrg> listByType = orgList.stream().filter(r->r.getId().equals(plan.getOrgId())&&r.getDeleted()==0&&r.getIsLock()==0).collect(Collectors.toList());
+            if(CollectionUtil.isNotEmpty(listByType)){
+                List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime,listByType.get(0));
+                if (CollectionUtil.isNotEmpty(list)) {
+                    taskList.addAll(list);
+                }
+            }
+        }
+        this.saveBatch(taskList);
+    }
+    /**
+     * 每天生成日任务 如果当天是周一还需生成周任务
+     *
+     * @param taskTime
+     */
+    @Override
+    public void dayTask(LocalDate taskTime) {
+        if (ObjectUtil.isEmpty(taskTime)) {
+            taskTime = LocalDate.now();
+        }
+
+        List<CoreMonitoringRetrievalTask> list = new ArrayList<>();
+        //获取所有机构
+        List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        if(CollectionUtil.isEmpty(orgList)){
+            log.error("获取机构信息失败!");
+            return;
+        }
+        //是周一生成周任务
+        if (taskTime.getDayOfWeek() == DayOfWeek.MONDAY) {
+            List<CoreMonitoringRetrievalTask> listWeek = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.WEEKCYCLE.getCode(), taskTime,orgList);
+            if (CollectionUtil.isNotEmpty(listWeek)) {
+                list.addAll(listWeek);
+            }
+        }
+        //生成每日任务
+        List<CoreMonitoringRetrievalTask> listDay = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.DAYCYCLE.getCode(), taskTime,orgList);
+        if (CollectionUtil.isNotEmpty(listDay)) {
+            list.addAll(listDay);
+        }
+        this.saveBatch(list);
+
+    }
+
+    /**
+     * 1.1生成周期为每月，每季，每半年，每年的任务
+     * 4.1||10.1日生成周期为每月，每季
+     * 7.1日获取执行周期为每月，每季,每半年的
+     * 其他日期生成月任务
+     *
+     * @param taskTime
+     */
+    @Override
+    public void monthTask(LocalDate taskTime) {
+        if (ObjectUtil.isEmpty(taskTime)) {
+            taskTime = LocalDate.now();
+        }
+        List<CoreMonitoringRetrievalTask> list = new ArrayList<>();
+        //获取所有机构
+        List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        //判断taskTime不是每月1号将taskTime设置为每月1号
+        if (taskTime.getDayOfMonth() != 1) {
+            taskTime = taskTime.withDayOfMonth(1);
+        }
+        //1.1生成周期为每月，每季，每半年，每年的任务
+        if (taskTime.getMonthValue() == 1) {
+            //季度任务
+            List<CoreMonitoringRetrievalTask> listQuarter = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.QUARTERCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listQuarter)) {
+                list.addAll(listQuarter);
+            }
+            //半年任务
+            List<CoreMonitoringRetrievalTask> listHalfYear = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.HALFYEARCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listHalfYear)) {
+                list.addAll(listHalfYear);
+            }
+            //年任务
+            List<CoreMonitoringRetrievalTask> listYear = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.YEARCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listYear)) {
+                list.addAll(listYear);
+            }
+        }
+        //4.1||10.1日生成周期为每月，每季
+        if (taskTime.getMonthValue() == 4 || taskTime.getMonthValue() == 10) {
+            //季度任务
+            List<CoreMonitoringRetrievalTask> listQuarter = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.QUARTERCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listQuarter)) {
+                list.addAll(listQuarter);
+            }
+        }
+        //7.1日获取执行周期为每月，每季,每半年的
+        if (taskTime.getMonthValue() == 7) {
+            //季度任务
+            List<CoreMonitoringRetrievalTask> listQuarter = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.QUARTERCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listQuarter)) {
+                list.addAll(listQuarter);
+            }
+            //半年任务
+            List<CoreMonitoringRetrievalTask> listHalfYear = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.HALFYEARCYCLE.getCode(), taskTime, orgList);
+            if (CollectionUtil.isNotEmpty(listHalfYear)) {
+                list.addAll(listHalfYear);
+            }
+        }
+        //所有日期都要生成月任务
+        List<CoreMonitoringRetrievalTask> listMonth = this.buildCoreMonitoringRetrievalTask(RetrievalTaskCycle.MONTHCYCLE.getCode(), taskTime, orgList);
+        if (CollectionUtil.isNotEmpty(listMonth)) {
+            list.addAll(listMonth);
+        }
+        this.saveBatch(list);
+
+    }
+
+    /**
+     *
+     * @param cycle 周期
+     * @param taskTime 日期
+     * @param orgList 机构
+     * @return
+     */
+
+    private List<CoreMonitoringRetrievalTask> buildCoreMonitoringRetrievalTask(Integer cycle, LocalDate taskTime,List<SysOrg> orgList) {
+        List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
+        //获取计划
+        QueryWrapper<TMonitoringRetrievalPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanCycle, cycle);
+        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanStatus, 0);
+        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getIsDeleted, 0);
+        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getCreateType, 1);
+        List<TMonitoringRetrievalPlan> planList = tMonitoringRetrievalPlanService.list();
+        //按计划生成任务
+        for (TMonitoringRetrievalPlan plan : planList) {
+            //获取计划关联的机构
+            List<SysOrg> listByType = orgList.stream().filter(r->r.getId().equals(plan.getOrgId())&&r.getDeleted()==0&&r.getIsLock()==0).collect(Collectors.toList());
+            if(CollectionUtil.isNotEmpty(listByType)){
+                List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime,listByType.get(0));
+                if (CollectionUtil.isNotEmpty(list)) {
+                    taskList.addAll(list);
+                }
+            }
+        }
+        return taskList;
+    }
+
+    /**
+     *
+     * @param plan 计划
+     * @param taskTime 日期
+     * @param sysOrg 机构
+     * @return
+     */
+    private List<CoreMonitoringRetrievalTask> buildCoreMonitoringRetrievalTask(TMonitoringRetrievalPlan plan, LocalDate taskTime,SysOrg sysOrg) {
+         List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
+              Long batchNum = IDHelper.id();
+              for(int i=0;i<plan.getPlanFrequency();i++){
+                  CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum,i+1,plan,sysOrg,taskTime);
+                  taskList.add(task);
+              }
+
+      return taskList;
+
+    }
+
+    /**
+     *
+     * @param batchNum 批次
+     * @param frequency 第几次
+     * @param plan 计划
+     * @param sysOrg 机构
+     * @param taskTime 日期
+     * @return
+     */
+    private CoreMonitoringRetrievalTask buildCoreMonitoringRetrievalTask(Long batchNum, int frequency, TMonitoringRetrievalPlan plan, SysOrg sysOrg,LocalDate taskTime) {
+        Date dateTime = Date.from(taskTime.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        Ymd ymd = Ymd.of(dateTime);
+        DateRange dateRange =null;
+        if(Integer.parseInt(plan.getPlanCycle())==0){
+           //无周期任务获取计划时间//重计划中获取
+            dateRange.setStartTime(plan.getStartTime());
+            dateRange.setEndTime(plan.getEndTime());
+        }else {
+            //周期任务获取计划时间
+            dateRange = DateUtils.getStartAndEnd(dateTime,Integer.parseInt(plan.getPlanCycle()));
+        }
+        CoreMonitoringRetrievalTask task = new CoreMonitoringRetrievalTask();
+        task.setId(IDHelper.id());
+        task.setTaskName(plan.getPlanName()+"第"+frequency+"次调阅");
+        task.setCycle(Integer.parseInt(plan.getPlanCycle()));
+        task.setOrgId(sysOrg.getId());
+        task.setOrgPath(sysOrg.getPath());
+        task.setOrgName(sysOrg.getName());
+        task.setBatchNum(batchNum);
+        task.setPlanId(plan.getId());
+        task.setOrderNum(frequency);
+        task.setPlanEndTime(dateRange.getStartTime());
+        task.setPlanEndTime(dateRange.getEndTime());
+        task.setYmdDate(ymd.getDate());
+        task.setYmdYear(ymd.getYear());
+        task.setYmdHalfyear(ymd.getHalfyear());
+        task.setYmdQuarter(ymd.getQuarter());
+        task.setYmdMonth(ymd.getMonth());
+        task.setYmdWeek(ymd.getWeek());
+        task.setYmdDay(ymd.getDay());
+        task.setRoleId(plan.getRoleId());
+        task.setStatus(0);
+        return task;
+    }
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -106,6 +106,13 @@ public class SysOrgController extends BaseController {
         return R.ok(sysOrgService.selectSysOrgList(sysOrg));
     }
 
+    @ApiOperation(value = "查询SysOrg列表")
+    @InnerAuth
+    @GetMapping("/list/findAllOrg")
+    public List<SysOrg> findAllOrg(SysOrg sysOrg) {
+        return sysOrgService.selectSysOrgList(sysOrg);
+    }
+
     /**
      * 查询机构列表
      */