定时任务

.gitignore

@@ -18,6 +18,7 @@ target/
 *.iws
 *.iml
 *.ipr
+*.yml
 
 ### NetBeans ###
 /nbproject/private/

project_data/sql/0.0.5/quartz/quartz.sql

@@ -1,6 +1,8 @@
 UPDATE sys_job set `status`=0 WHERE job_name='生成每周履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='生成每月履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每日每周任务补救';
+UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveDayTaskByDate' where id=118 and `job_name`= '调阅监控每日每周任务补救';
+UPDATE sys_job set `invoke_target`='RetrievalTask.retrieveMonthTaskByDate' where id=117 and `job_name`= '调阅监控每月季度半年年任务补救接口';
 -- UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每月季度半年年任务补救接口';
 
 -- 预案演练逾期任务状态修改定时任务

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

@@ -101,7 +101,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             //对list进行重新编号和保存
             //对lista 按机构进行分组
             Map<Long, List<CoreMonitoringRetrievalTask>> map = lista.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getOrgId));
-            for (Map.Entry<Long, List<CoreMonitoringRetrievalTask>>  entry : map.entrySet()) {
+            for (Map.Entry<Long, List<CoreMonitoringRetrievalTask>> entry : map.entrySet()) {
                 List<CoreMonitoringRetrievalTask> listb = entry.getValue();
                 for (int i = 0; i < listb.size(); i++) {
                     listb.get(i).setOrderNum(i + 1);
@@ -267,22 +267,22 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
 
     @Override
     public void deleteTaskByStartTime(Long planId, String startTime) {
-        coreMonitoringRetrievalTaskMapper.deleteTaskByStartTime(planId,startTime);
+        coreMonitoringRetrievalTaskMapper.deleteTaskByStartTime(planId, startTime);
     }
 
     @Override
     public List<Long> selectTaskByStartTime(Long planId, String startTime) {
-        return coreMonitoringRetrievalTaskMapper.selectTaskByStartTime(planId,startTime);
+        return coreMonitoringRetrievalTaskMapper.selectTaskByStartTime(planId, startTime);
     }
 
     @Override
     public void deleteTaskByToday(Long planId, String day) {
-        coreMonitoringRetrievalTaskMapper.deleteTaskByToday(planId,day);
+        coreMonitoringRetrievalTaskMapper.deleteTaskByToday(planId, day);
     }
 
     @Override
     public List<Long> selectTaskByToday(Long planId, String day) {
-        return coreMonitoringRetrievalTaskMapper.selectTaskByToday(planId,day);
+        return coreMonitoringRetrievalTaskMapper.selectTaskByToday(planId, day);
     }
 
     @Override
@@ -348,8 +348,15 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             sysOrg.setPath(p.getOrgPath());
             sysOrg.setType(Integer.valueOf(p.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
+    /*        for (int i = orgList.size() - 1; i >= 0; i--) {
+                if (null == orgList.get(i).getType()) {
+                    orgList.remove(i);
+                } else if (null == orgList.get(i).getPath()) {
+                    orgList.remove(i);
+                }
+            }*/
             List<SysOrg> sysOrgs = orgList.stream().
-                    filter(s -> s.getPath().contains(p.getOrgPath()) && (s.getType() != null && s.getType().toString().equals(p.getOrgType())))
+                    filter(s -> (s.getPath()!=null&&s.getPath().contains(p.getOrgPath()) )&& (s.getType() != null && s.getType().toString().equals(p.getOrgType())))
                     .collect(Collectors.toList());
             for (SysOrg s : sysOrgs) {
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
@@ -415,7 +422,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         orgList.add(sysOrg);
         final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, dateRange.getStartTime(), dateRange.getEndTime());
         //Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
-        Map<Short, DateRange> dateRanges = TaskCreatingServiceImplBase.splitTaskTime((short)plan.getPlanFrequency().intValue(), EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())), dateRange.getStartTime(), dateRange.getEndTime(), workTimeList);
+        Map<Short, DateRange> dateRanges = TaskCreatingServiceImplBase.splitTaskTime((short) plan.getPlanFrequency().intValue(), EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())), dateRange.getStartTime(), dateRange.getEndTime(), workTimeList);
         //判断作息（无周期排开）
 //        if (!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())) {
 /*        int idx = 1;
@@ -467,9 +474,9 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         }*/
         CoreMonitoringRetrievalTask task = new CoreMonitoringRetrievalTask();
         task.setId(IdWorker.getId());
-        if(totalNumber==1&&plan.getPlanFrequency()==1){
+        if (totalNumber == 1 && plan.getPlanFrequency() == 1) {
             task.setTaskName(plan.getPlanName() + "调阅任务");
-        }else{
+        } else {
             task.setTaskName(plan.getPlanName() + "第" + frequency + "次调阅");
         }
     /*    if (totalNumber > 1) {
@@ -549,7 +556,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         }
         //生成新的任务
         // if(CollectionUtil.isNotEmpty(keyValues)){
-        this.rebuildtask(keyValues, ymdDate, orgIds,baoliuTaskList);
+        this.rebuildtask(keyValues, ymdDate, orgIds, baoliuTaskList);
         // }
 
     }
@@ -567,9 +574,9 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 if (CollectionUtil.isNotEmpty(listTask)) {
                     deleteTaskList.addAll(listTask);
                 }
-            if (CollectionUtil.isNotEmpty(listTaska)) {
-                baoliuTaskList.addAll(listTaska);
-            }
+                if (CollectionUtil.isNotEmpty(listTaska)) {
+                    baoliuTaskList.addAll(listTaska);
+                }
                 if (CollectionUtil.isNotEmpty(keyValueList)) {
                     keyValues.addAll(keyValueList);
                 }
@@ -659,28 +666,28 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, localDate, listByType.get(0));
                 if (CollectionUtil.isNotEmpty(list)) {
                     /**if (plan.getPlanCycle().equals(RetrievalTaskCycle.DAYCYCLE.getCode().toString())) {**/
-                        List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(lista)) {
-                            //获取保留的数据
-                            List<CoreMonitoringRetrievalTask> listbl =baoliuTaskList.stream().filter(r->r.getPlanId().equals(plan.getId())&&r.getOrgId().equals(r.getOrgId())).collect(Collectors.toList());
-                            //去掉保留的数据
-                            if(CollectionUtil.isNotEmpty(listbl)){
-                                List<Integer> integers = listbl.stream().map(m->m.getOrderNum()).collect(Collectors.toList());
-                                List<CoreMonitoringRetrievalTask> listb = lista.stream().filter(r->!integers.contains(r.getOrderNum())).collect(Collectors.toList());
-                                if(CollectionUtil.isNotEmpty(listb)){
-                                    listb.forEach(r->r.setBatchNum(listbl.get(0).getBatchNum()));
-                                }
-                                taskList.addAll(listb);
-                            }else{
-                                taskList.addAll(lista);
+                    List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(lista)) {
+                        //获取保留的数据
+                        List<CoreMonitoringRetrievalTask> listbl = baoliuTaskList.stream().filter(r -> r.getPlanId().equals(plan.getId()) && r.getOrgId().equals(r.getOrgId())).collect(Collectors.toList());
+                        //去掉保留的数据
+                        if (CollectionUtil.isNotEmpty(listbl)) {
+                            List<Integer> integers = listbl.stream().map(m -> m.getOrderNum()).collect(Collectors.toList());
+                            List<CoreMonitoringRetrievalTask> listb = lista.stream().filter(r -> !integers.contains(r.getOrderNum())).collect(Collectors.toList());
+                            if (CollectionUtil.isNotEmpty(listb)) {
+                                listb.forEach(r -> r.setBatchNum(listbl.get(0).getBatchNum()));
                             }
-                        }
-                    /**} else {
-                        List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(lista)) {
+                            taskList.addAll(listb);
+                        } else {
                             taskList.addAll(lista);
                         }
-                    }**/
+                    }
+                    /**} else {
+                     List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
+                     if (CollectionUtil.isNotEmpty(lista)) {
+                     taskList.addAll(lista);
+                     }
+                     }**/
                 }
             }
         }
@@ -717,19 +724,19 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 Map<Long, List<CoreMonitoringRetrievalTask>> taskMap1 = taskList1.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getBatchNum));
                 for (Map.Entry<Long, List<CoreMonitoringRetrievalTask>> et : taskMap.entrySet()) {
                     List<CoreMonitoringRetrievalTask> taskList2 = et.getValue();
-                    List<CoreMonitoringRetrievalTask> taskList3 =taskList2.stream().filter(t->!t.getStatus().equals("2")).collect(Collectors.toList());
+                    List<CoreMonitoringRetrievalTask> taskList3 = taskList2.stream().filter(t -> !t.getStatus().equals("2")).collect(Collectors.toList());
                     //获取要留下的任务
-                    List<CoreMonitoringRetrievalTask> taskList4 =taskList2.stream().filter(t->t.getStatus().equals("2")).collect(Collectors.toList());
-                    if(CollectionUtil.isNotEmpty(taskList3)){
+                    List<CoreMonitoringRetrievalTask> taskList4 = taskList2.stream().filter(t -> t.getStatus().equals("2")).collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(taskList3)) {
                         deleteTaskList.addAll(taskList3);
-                    }else{
+                    } else {
                         Long planId = taskList2.get(0).getPlanId();
                         KeyValueVo keyValue = new KeyValueVo();
                         keyValue.setKey(entry.getKey());
                         keyValue.setValue(planId);
                         keyValues.add(keyValue);
                     }
-                    if(CollectionUtil.isNotEmpty(taskList4)){
+                    if (CollectionUtil.isNotEmpty(taskList4)) {
                         baoliuTaskList.addAll(taskList4);
                     }
                 }