待办接口改回多线程查询

project_data/sql/1.0.11/quartz/quartz.sql

@@ -0,0 +1,8 @@
+delete
+from sys_job
+where job_name ='刷新冗余机构Path';
+
+INSERT INTO `sys_job`(`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`,
+                      `status`, `create_by`, `create_time`, `update_by`, `update_time`)
+VALUES ('刷新冗余机构Path', 'DEFAULT', 'OrgTask.refreshRedundancyOrgPath', '0 0 3 * * ?', '1', '1', '0', NULL, now(), NULL,
+        NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -132,41 +132,41 @@ public class PanelServiceImpl implements PanelService {
         if (ObjectUtil.isEmpty(panelListDto.getRoleIdList())) {
             return new ArrayList<>();
         }
-        List<PanelListVo> panelListVos = resumptionService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos1 = coreMonitoringRetrievalTaskService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos2 = iCoreEvaluateTaskService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos3 = safetyTaskService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos4 = drillTaskService.selectCurUserTaskList(panelListDto);
-
-        PanelListDto tempReqest = new PanelListDto();
-        BeanUtils.copyProperties(panelListDto, tempReqest);
-        tempReqest.setStartTime(DateUtil.offsetMonth(DateUtil.beginOfQuarter(new Date()), -3));
-        tempReqest.setEndTime(DateUtil.endOfQuarter(new Date()));
-        List<PanelListVo> panelListVos5 = drillTaskService.selectRecList(tempReqest);
-        List<PanelListVo> panelListVos6 = eduTrainingTaskService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos7 = questionService.selectCurUserTaskList(panelListDto);
-        List<PanelListVo> panelListVos8 = coreIntroduceLetterService.selectToDoApproveListForAPP(panelListDto);
-        List<PanelListVo> resultList = new ArrayList<>();
-        resultList.addAll(panelListVos);
-        resultList.addAll(panelListVos1);
-        resultList.addAll(panelListVos2);
-        resultList.addAll(panelListVos3);
-        resultList.addAll(panelListVos4);
-        resultList.addAll(panelListVos5);
-        resultList.addAll(panelListVos6);
-        resultList.addAll(panelListVos7);
-        resultList.addAll(panelListVos8);
+//        List<PanelListVo> panelListVos = resumptionService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos1 = coreMonitoringRetrievalTaskService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos2 = iCoreEvaluateTaskService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos3 = safetyTaskService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos4 = drillTaskService.selectCurUserTaskList(panelListDto);
+//
+//        PanelListDto tempReqest = new PanelListDto();
+//        BeanUtils.copyProperties(panelListDto, tempReqest);
+//        tempReqest.setStartTime(DateUtil.offsetMonth(DateUtil.beginOfQuarter(new Date()), -3));
+//        tempReqest.setEndTime(DateUtil.endOfQuarter(new Date()));
+//        List<PanelListVo> panelListVos5 = drillTaskService.selectRecList(tempReqest);
+//        List<PanelListVo> panelListVos6 = eduTrainingTaskService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos7 = questionService.selectCurUserTaskList(panelListDto);
+//        List<PanelListVo> panelListVos8 = coreIntroduceLetterService.selectToDoApproveListForAPP(panelListDto);
+//        List<PanelListVo> resultList = new ArrayList<>();
+//        resultList.addAll(panelListVos);
+//        resultList.addAll(panelListVos1);
+//        resultList.addAll(panelListVos2);
+//        resultList.addAll(panelListVos3);
+//        resultList.addAll(panelListVos4);
+//        resultList.addAll(panelListVos5);
+//        resultList.addAll(panelListVos6);
+//        resultList.addAll(panelListVos7);
+//        resultList.addAll(panelListVos8);
 
         //履职任务
-       /* CompletableFuture<List<PanelListVo>> resumptionTaskFuture = CompletableFuture.supplyAsync(() ->
+        CompletableFuture<List<PanelListVo>> resumptionTaskFuture = CompletableFuture.supplyAsync(() ->
                 resumptionService.selectCurUserTaskList(panelListDto), threadPoolTaskExecutor
         );
 
-    *//*    //布撤防
+    /*    //布撤防
         CompletableFuture<List<PanelListVo>> protectionTaskFuture = CompletableFuture.supplyAsync(() ->
                 protectionService.selectCurUserTaskList(panelListDto), threadPoolTaskExecutor
         );
-*//*
+    */
         //监控调阅任务
         CompletableFuture<List<PanelListVo>> monitorTaskFuture = CompletableFuture.supplyAsync(() ->
                 coreMonitoringRetrievalTaskService.selectCurUserTaskList(panelListDto), threadPoolTaskExecutor
@@ -226,7 +226,7 @@ public class PanelServiceImpl implements PanelService {
                         questionTaskFuture.join(), letterOutInFuture.join()
                 )
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());*/
+                .collect(Collectors.toList());
         //将resultList根据type字段分组，并排序
         Map<Integer, List<PanelListVo>> listMap = resultList.stream()
                 .sorted(Comparator.comparing(PanelListVo::getType))