Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

.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/drill/mapper/CoreDrillPlanMapper.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanPageDto;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -88,4 +89,6 @@ public interface CoreDrillPlanMapper extends BaseMapper<CoreDrillPlan> {
     void updatePlanName(@Param("planId") Long planId, @Param("planName") String planName);
 
     void delByIds(@Param("list")List<Long> list);
+
+    List<CoreDrillPlan> selectNeedBuildTaskPlanList(@Param("cycle") Integer cycle, @Param("cycleList") List<Integer> cycleList);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -22,6 +22,7 @@ import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.drill.domain.*;
 import com.xunmei.common.core.domain.drill.dto.*;
 import com.xunmei.common.core.domain.drill.vo.*;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
@@ -301,8 +302,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setCreateTime(new Date());
             coreDrillTask.setStartDate(DateUtil.beginOfDay(new Date()));
             // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
-            Long endTime= coreDrillTask.getStartDate().getTime();
-            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            Long endTime = coreDrillTask.getStartDate().getTime();
+            Date end = new Date(endTime + 7 * 24 * 60 * 60 * 1000 - 1000);
             coreDrillTask.setEndDate(end);
         }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
@@ -840,22 +841,13 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         if (ObjectUtil.isNull(date)) {
             date = new Date();
         }
-        List<Integer> cycleList = DateUtils.checkDate(date);
         List<CoreDrillPlan> planList;
+
         if (null == cycle) {
-            planList = coreDrillPlanMapper.selectList(new LambdaQueryWrapper<CoreDrillPlan>()
-                    .eq(CoreDrillPlan::getStandard, 0)
-                    .eq(CoreDrillPlan::getPlanStatus, DrillPlanStatus.USING.getCode())
-                    .in(CoreDrillPlan::getPlanCycle, cycleList)
-                    .eq(CoreDrillPlan::getDeleted, 0)
-                    .select(CoreDrillPlan::getId, CoreDrillPlan::getPlanCycle));
+            List<Integer> cycleList = DateUtils.checkDate(date);
+            planList = coreDrillPlanMapper.selectNeedBuildTaskPlanList(null, cycleList);
         } else {
-            planList = coreDrillPlanMapper.selectList(new LambdaQueryWrapper<CoreDrillPlan>()
-                    .eq(CoreDrillPlan::getStandard, 0)
-                    .eq(CoreDrillPlan::getPlanStatus, DrillPlanStatus.USING.getCode())
-                    .eq(CoreDrillPlan::getPlanCycle, cycle)
-                    .eq(CoreDrillPlan::getDeleted, 0)
-                    .select(CoreDrillPlan::getId, CoreDrillPlan::getPlanCycle));
+            planList = coreDrillPlanMapper.selectNeedBuildTaskPlanList(cycle, null);
         }
         if (ObjectUtil.isEmpty(planList)) {
             return "没有需要生成的任务";

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingPlanMapper.java

@@ -89,4 +89,6 @@ public interface CoreEduTrainingPlanMapper extends BaseMapper<CoreEduTrainingPla
     void updatePlanName(@Param("planId") Long planId, @Param("planName") String planName);
 
     Integer delByIds(@Param("list") List<Long> list);
+
+    List<CoreEduTrainingPlan> selectNeedBuildTaskPlanList(@Param("cycle") Integer cycle, @Param("cycleList") List<Integer> cycleList);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -276,8 +276,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request, task);
         task.setStartDate(DateUtil.beginOfDay(new Date()));
-        Long endTime= (new Date()).getTime();
-        task.setEndDate(DateUtil.endOfDay(new Date(endTime+7*24*60*60*1000-1000)));
+        Long endTime = (new Date()).getTime();
+        task.setEndDate(DateUtil.endOfDay(new Date(endTime + 7 * 24 * 60 * 60 * 1000 - 1000)));
 //        task.setEndDate(DateUtil.endOfDay(new Date()));
 
         task.setCreateTime(DateUtils.getNowDate());
@@ -328,8 +328,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTask.setTitle(request.getTitle());
             coreEduTrainingTask.setStartDate(DateUtil.beginOfDay(new Date()));
             // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
-            Long endTime=coreEduTrainingTask.getStartDate().getTime();
-            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            Long endTime = coreEduTrainingTask.getStartDate().getTime();
+            Date end = new Date(endTime + 7 * 24 * 60 * 60 * 1000 - 1000);
             coreEduTrainingTask.setEndDate(end);
 //            coreEduTrainingTask.setEndDate(DateUtils.toDate(request.getTrainingEndDateTime()));
 
@@ -849,6 +849,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         return list;
     }
 
+    public static void main(String[] args) {
+        System.out.println(DateUtils.checkDate(new Date()));
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -856,22 +859,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         if (ObjectUtil.isNull(date)) {
             date = new Date();
         }
-        List<Integer> cycleList = DateUtils.checkDate(date);
+
         List<CoreEduTrainingPlan> planList;
+
         if (null == cycle) {
-            planList = coreEduTrainingPlanMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingPlan>()
-                    .eq(CoreEduTrainingPlan::getStandard, 0)
-                    .eq(CoreEduTrainingPlan::getPlanStatus, EduTrainingPlanStatus.USING.getCode())
-                    .in(CoreEduTrainingPlan::getPlanCycle, cycleList)
-                    .eq(CoreEduTrainingPlan::getDeleted, 0)
-                    .select(CoreEduTrainingPlan::getId, CoreEduTrainingPlan::getPlanCycle));
+            List<Integer> cycleList = DateUtils.checkDate(date);
+            planList = coreEduTrainingPlanMapper.selectNeedBuildTaskPlanList(null, cycleList);
         } else {
-            planList = coreEduTrainingPlanMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingPlan>()
-                    .eq(CoreEduTrainingPlan::getStandard, 0)
-                    .eq(CoreEduTrainingPlan::getPlanStatus, EduTrainingPlanStatus.USING.getCode())
-                    .eq(CoreEduTrainingPlan::getPlanCycle, cycle)
-                    .eq(CoreEduTrainingPlan::getDeleted, 0)
-                    .select(CoreEduTrainingPlan::getId, CoreEduTrainingPlan::getPlanCycle));
+            planList = coreEduTrainingPlanMapper.selectNeedBuildTaskPlanList(cycle, null);
         }
         //此list中Plan对象仅id与planCycle字段有值,其他字段为空
         if (ObjectUtil.isEmpty(planList)) {
@@ -924,7 +919,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                     .list();
             List<Long> taskIdList = taskList.stream().map(CoreEduTrainingTask::getId).collect(Collectors.toList());
             delTaskByIdList(taskIdList);
-            list=taskIdList;
+            list = taskIdList;
         }
         return list;
     }

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
@@ -349,7 +349,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             sysOrg.setType(Integer.valueOf(p.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
             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 +415,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 +467,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 +549,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 +567,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 +659,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 +717,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);
                     }
                 }

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanMapper.xml

@@ -690,4 +690,21 @@
             #{item}
         </foreach>
     </delete>
+
+    <select id="selectNeedBuildTaskPlanList" resultType="com.xunmei.common.core.domain.drill.domain.CoreDrillPlan">
+        SELECT id, plan_cycle
+        FROM `core_drill_plan` p
+        where p.deleted = 0
+        and p.plan_status = 1
+        <if test="cycle != null">
+            p.plan_cycle=#{cycle}
+        </if>
+        <if test="cycleList != null and cycleList.size>0">
+            and p.plan_cycle in
+            <foreach collection="cycleList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and (p.standard = 0 or p.parent_id is not null)
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingPlanMapper.xml

@@ -634,4 +634,20 @@
             #{item}
         </foreach>
     </delete>
+    <select id="selectNeedBuildTaskPlanList" resultType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan">
+        SELECT id, plan_cycle
+        FROM `core_edu_training_plan` p
+        where p.deleted = 0
+        and p.plan_status = 1
+        <if test="cycle != null">
+            p.plan_cycle=#{cycle}
+        </if>
+        <if test="cycleList != null and cycleList.size>0">
+            and p.plan_cycle in
+            <foreach collection="cycleList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and (p.standard = 0 or p.parent_id is not null)
+    </select>
 </mapper>