修改调阅

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

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
@@ -128,10 +130,16 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         TMonitoringRetrievalPlan plan = tMonitoringRetrievalPlanMapper.selectById(id);
         BeanUtils.copyProperties(plan, tMonitoringRetrievalPlanVO);
         boolean isEdit = false;
+        boolean isComplete = false;
         if (plan.getParentId() != null) {
             isEdit = true;
         }
         tMonitoringRetrievalPlanVO.setIsEdit(isEdit);
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
+        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks) && plan.getParentId() == null) {
+            isComplete = true;
+        }
+        tMonitoringRetrievalPlanVO.setIsComplete(isComplete);
         return tMonitoringRetrievalPlanVO;
     }
 
@@ -197,7 +205,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                             tm.setEndTime(time);
                             tMonitoringRetrievalPlans.add(tm);
                         }
-                    }else {
+                    } else {
                         SysOrg sysOrg = new SysOrg();
                         sysOrg.setPath(tm.getOrgPath());
                         sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
@@ -305,6 +313,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                             cal.add(Calendar.DATE, amount);
                             Date time = cal.getTime();
                             tMonitoringRetrievalPlan1.setEndTime(time);
+                            //   List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans1 = tMonitoringRetrievalPlans(l.getPath(), l.getType(), tMonitoringRetrievalPlan1);
                         }
                         tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan1);
                     } else {
@@ -446,8 +455,74 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         return 1;
     }
 
+    private List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans(String path, Integer type, TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
+        List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
+        SysOrg sysOrg = new SysOrg();
+        sysOrg.setPath(path);
+        sysOrg.setType(Integer.valueOf(type));
+        List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
+        for (SysOrg s : sysOrgs) {
+            TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
+            BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
+            plan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
+            plan.setOrgId(s.getId());
+            plan.setOrgName(s.getShortName());
+            plan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+            plan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
+            plan.setOrgPath(s.getPath());
+            plan.setOrgType(tMonitoringRetrievalPlan.getOrgType());
+            plan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
+            plan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
+            plan.setPlanStatus(ZERO);
+            plan.setCreateBy(SecurityUtils.getUsername());
+            plan.setUpdateTime(DateUtils.getNowDate());
+            plan.setUpdateBy(SecurityUtils.getUsername());
+            plan.setCreateTime(DateUtils.getNowDate());
+            plan.setDescription(tMonitoringRetrievalPlan.getDescription());
+            plan.setCreateType(1);
+            plan.setParentId(tMonitoringRetrievalPlan.getId());
+            plan.setIsDistribute("1");
+            if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
+                    tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
+                plan.setStartTime(new Date());
+                int amount = 0;
+                LocalDate lastDayOfMonth;
+                switch (tMonitoringRetrievalPlan.getPlanCycle()) {
+                    case "1":
+                        amount = 1;
+                        break;
+                    case "2":
+                        amount = 7;
+                        break;
+                    case "3":
+                        LocalDate currentDate = LocalDate.now();
+                        lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+                        amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
+                        break;
+                    case "4":
+                        amount = getDayNum(3);
+                        break;
+                    case "5":
+                        amount = getDayNum(6);
+                        break;
+                    case "6":
+                        amount = getDayNum(12);
+                        break;
+                }
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(new Date());
+                cal.add(Calendar.DATE, amount);
+                Date time = cal.getTime();
+                plan.setEndTime(time);
+            }
+            tMonitoringRetrievalPlans.add(plan);
+        }
+        return tMonitoringRetrievalPlans;
+    }
+
     @Override
     public int withdraw(Long id) {
+        DateRange startAndEnd;
         TMonitoringRetrievalPlan plan = baseMapper.selectById(id);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(PARENT_ID, id);
@@ -457,15 +532,33 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 tMonitoringRetrievalPlan.setPlanStatus(2);
                 tMonitoringRetrievalPlan.setIsDistribute("0");
                 baseMapper.updateById(tMonitoringRetrievalPlan);
-                iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());
+                //删除所有的任务，现在删除本周期的任务
                 if (plan.getPlanCycle().equals("0")) {
+                    iCoreMonitoringRetrievalTaskService.deleteAllTaskByPlanId(tMonitoringRetrievalPlan.getId());
+                    //如果无周期删除计划
                     baseMapper.deleteById(tMonitoringRetrievalPlan.getId());
                 }
             }
+            if (!plan.getPlanCycle().equals("0")) {
+                switch (plan.getPlanCycle()) {
+                    //天
+                    case "1":
+                        LocalDate localDate = LocalDate.now();
+                        iCoreMonitoringRetrievalTaskService.deleteDayTaskByPlanId(plan.getId(), plan.getPlanCycle(), localDate);
+                        break;
+                    default:
+                        startAndEnd = DateUtils.getStartAndEnd(new Date(), Integer.valueOf(plan.getPlanCycle()) + 1);
+                        iCoreMonitoringRetrievalTaskService.deleteDayTaskByTime(plan.getId(), plan.getPlanCycle(), startAndEnd.getStartTime(), startAndEnd.getEndTime());
+                        break;
+                }
+            }
         }
         plan.setPlanStatus(2);
         plan.setIsDistribute("0");
-        iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(id);
+        if (!plan.getPlanCycle().equals("0")) {
+            startAndEnd = DateUtils.getStartAndEnd(new Date(), Integer.valueOf(plan.getPlanCycle()) + 1);
+            iCoreMonitoringRetrievalTaskService.deleteDayTaskByTimeAndPlanId(id, plan.getPlanCycle(), startAndEnd.getStartTime(), startAndEnd.getEndTime());
+        }
         return baseMapper.updateById(plan);
     }
 
@@ -625,98 +718,99 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Override
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(tMonitoringRetrievalPlan.getId());
-        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
-            throw new ServiceException("下发任务已做完，不能修改");
-        }
-        //  iCoreMonitoringRetrievalTaskService.updateDeleteTaskByPlanId(tMonitoringRetrievalPlan.getId(), 1);
-        iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());
+        //如果计划下面的任务都是没完成就删除所有任务，有完成就只修改
         tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
         BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
         plan.setIsDistribute("0");
         int i = tMonitoringRetrievalPlanMapper.updateById(plan);
-        try {
-            QueryWrapper queryWrapper = new QueryWrapper();
-            queryWrapper.eq("parent_id", plan.getId());
-            baseMapper.delete(queryWrapper);
-            SysOrg sysOrg1 = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
-            List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
-            if (sysOrg1.getType() == 1) {
-                distribute(plan.getId());
-            } else {
-                SysOrg sysOrg = new SysOrg();
-                sysOrg.setPath(plan.getOrgPath());
-                sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
-                List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
-                for (SysOrg s : sysOrgs) {
-                    TMonitoringRetrievalPlan plan1 = new TMonitoringRetrievalPlan();
-                    BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan1);
-                    plan1.setPlanName(tMonitoringRetrievalPlan.getPlanName());
-                    plan1.setOrgId(s.getId());
-                    plan1.setOrgName(s.getShortName());
-                    plan1.setRoleId(tMonitoringRetrievalPlan.getRoleId());
-                    plan1.setRoleName(tMonitoringRetrievalPlan.getRoleName());
-                    plan1.setOrgPath(s.getPath());
-                    plan1.setOrgType(tMonitoringRetrievalPlan.getOrgType());
-                    plan1.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
-                    plan1.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
-                    plan1.setPlanStatus(ZERO);
-                    plan1.setCreateBy(SecurityUtils.getUsername());
-                    plan1.setUpdateTime(DateUtils.getNowDate());
-                    plan1.setUpdateBy(SecurityUtils.getUsername());
-                    plan1.setCreateTime(DateUtils.getNowDate());
-                    plan1.setDescription(tMonitoringRetrievalPlan.getDescription());
-                    plan1.setCreateType(1);
-                    plan1.setParentId(tMonitoringRetrievalPlan.getId());
-                    plan1.setIsDistribute("1");
-                    if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
-                            tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
-                        plan1.setStartTime(new Date());
-                        int amount = 0;
-                        LocalDate lastDayOfMonth;
-                        switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                            case "1":
-                                amount = 1;
-                                break;
-                            case "2":
-                                amount = 7;
-                                break;
-                            case "3":
-                                LocalDate currentDate = LocalDate.now();
-                                lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
-                                amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
-                                break;
-                            case "4":
-                                amount = getDayNum(3);
-                                break;
-                            case "5":
-                                amount = getDayNum(6);
-                                break;
-                            case "6":
-                                amount = getDayNum(12);
-                                break;
+        if (CollectionUtils.isEmpty(coreMonitoringRetrievalTasks)) {
+            iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());
+            try {
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq("parent_id", plan.getId());
+                baseMapper.delete(queryWrapper);
+                SysOrg sysOrg1 = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+                List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
+                if (sysOrg1.getType() == 1) {
+                    distribute(plan.getId());
+                } else {
+                    SysOrg sysOrg = new SysOrg();
+                    sysOrg.setPath(plan.getOrgPath());
+                    sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
+                    List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
+                    for (SysOrg s : sysOrgs) {
+                        TMonitoringRetrievalPlan plan1 = new TMonitoringRetrievalPlan();
+                        BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan1);
+                        plan1.setPlanName(tMonitoringRetrievalPlan.getPlanName());
+                        plan1.setOrgId(s.getId());
+                        plan1.setOrgName(s.getShortName());
+                        plan1.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+                        plan1.setRoleName(tMonitoringRetrievalPlan.getRoleName());
+                        plan1.setOrgPath(s.getPath());
+                        plan1.setOrgType(tMonitoringRetrievalPlan.getOrgType());
+                        plan1.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
+                        plan1.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
+                        plan1.setPlanStatus(ZERO);
+                        plan1.setCreateBy(SecurityUtils.getUsername());
+                        plan1.setUpdateTime(DateUtils.getNowDate());
+                        plan1.setUpdateBy(SecurityUtils.getUsername());
+                        plan1.setCreateTime(DateUtils.getNowDate());
+                        plan1.setDescription(tMonitoringRetrievalPlan.getDescription());
+                        plan1.setCreateType(1);
+                        plan1.setParentId(tMonitoringRetrievalPlan.getId());
+                        plan1.setIsDistribute("1");
+                        if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
+                                tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
+                            plan1.setStartTime(new Date());
+                            int amount = 0;
+                            LocalDate lastDayOfMonth;
+                            switch (tMonitoringRetrievalPlan.getPlanCycle()) {
+                                case "1":
+                                    amount = 1;
+                                    break;
+                                case "2":
+                                    amount = 7;
+                                    break;
+                                case "3":
+                                    LocalDate currentDate = LocalDate.now();
+                                    lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+                                    amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
+                                    break;
+                                case "4":
+                                    amount = getDayNum(3);
+                                    break;
+                                case "5":
+                                    amount = getDayNum(6);
+                                    break;
+                                case "6":
+                                    amount = getDayNum(12);
+                                    break;
+                            }
+                            Calendar cal = Calendar.getInstance();
+                            cal.setTime(new Date());
+                            cal.add(Calendar.DATE, amount);
+                            Date time = cal.getTime();
+                            plan1.setEndTime(time);
                         }
-                        Calendar cal = Calendar.getInstance();
-                        cal.setTime(new Date());
-                        cal.add(Calendar.DATE, amount);
-                        Date time = cal.getTime();
-                        plan1.setEndTime(time);
+                        tMonitoringRetrievalPlans.add(plan1);
                     }
-                    tMonitoringRetrievalPlans.add(plan1);
-                }
-                if ((tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE) || tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
-                    try {
-                        iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
-                    } catch (Exception e) {
-                        throw new ServiceException("下发任务异常，请联系管理员");
+                    if ((tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE) || tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
+                        try {
+                            iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+                        } catch (Exception e) {
+                            throw new ServiceException("下发任务异常，请联系管理员");
+                        }
                     }
                 }
-            }
 
-        } catch (Exception e) {
-            e.getMessage();
+            } catch (Exception e) {
+                e.getMessage();
+            }
         }
+
+
         return i;
     }
 
@@ -736,18 +830,10 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             TMonitoringRetrievalPlan monitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
             List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
             if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
-                throw new ServiceException("下发任务已做完，不能删除");
+                throw new ServiceException("计划有已完成或者已逾期的任务，不能被删除。");
             }
-            //如果是下发的任务
-      /*      if (monitoringRetrievalPlan.getParentId() != null) {
-                //不能删除
-                throw new ServiceException("子任务，不能删除");
-            } else {*/
-            //   if (monitoringRetrievalPlan.getCreateType() == 0) {
             i = tMonitoringRetrievalPlanMapper.updatePlan(monitoringRetrievalPlan);
             iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(id);
-            // }
-            // }
         }
         return i;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/TMonitoringRetrievalPlanVO.java

@@ -15,4 +15,6 @@ public class TMonitoringRetrievalPlanVO extends TMonitoringRetrievalPlan {
     @ApiModelProperty(value = "是否可以编辑")
     private Boolean isEdit;
     private Long parentOrgId;
+    @ApiModelProperty(value = "是否有已完成和已逾期")
+    private Boolean isComplete;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -273,9 +273,11 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         coreResumptionConfiguration.setDelFlag("0");
         List<CoreResumptionConfiguration> coreResumptionConfigurations = baseMapper.selectCoreResumptionConfigurationList(coreResumptionConfiguration);
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "2");
-        resumptions.forEach(r -> {
-            addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
-        });
+        if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
+            resumptions.forEach(r -> {
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+            });
+        }
     }
 
     @Override
@@ -285,11 +287,11 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         coreResumptionConfiguration.setDelFlag("0");
         List<CoreResumptionConfiguration> coreResumptionConfigurations = baseMapper.selectCoreResumptionConfigurationList(coreResumptionConfiguration);
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "3");
-      if(CollectionUtils.isNotEmpty(coreResumptionConfigurations)){
-          resumptions.forEach(r -> {
-              addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
-          });
-      }
+        if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
+            resumptions.forEach(r -> {
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+            });
+        }
     }
 
     @Override
@@ -299,9 +301,11 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         coreResumptionConfiguration.setDelFlag("0");
         List<CoreResumptionConfiguration> coreResumptionConfigurations = baseMapper.selectCoreResumptionConfigurationList(coreResumptionConfiguration);
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "4");
-        resumptions.forEach(r -> {
-            addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
-        });
+        if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
+            resumptions.forEach(r -> {
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+            });
+        }
     }
 
     @Override
@@ -311,8 +315,10 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         coreResumptionConfiguration.setDelFlag("0");
         List<CoreResumptionConfiguration> coreResumptionConfigurations = baseMapper.selectCoreResumptionConfigurationList(coreResumptionConfiguration);
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "1");
-        resumptions.forEach(r -> {
-            addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
-        });
+        if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
+            resumptions.forEach(r -> {
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+            });
+        }
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -16,6 +16,7 @@ import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -104,6 +105,53 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     void deleteTaskByPlanId(@Param("planId") Long planId);
 
+    /**
+     * 根据计划删除
+     * @param planId
+     */
+    void deleteAllTaskByPlanId(@Param("planId") Long planId);
+    void deleteDayTaskByTime(Long planId, String cycle, Date startTime, Date endTime);
+    void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime);
+    /**
+     * 删除周任务
+     * @param planId
+     * @param cycle
+     * @param week
+     * @param year
+     */
+   void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year);
+
+    /**
+     * 删除天任务
+     * @param planId
+     * @param cycle
+     * @param ymdDate
+     */
+    void deleteDayTaskByPlanId(Long planId, String cycle, String ymdDate);
+
+    /**
+     * 删除月任务
+     * @param planId
+     * @param cycle
+     * @param month
+     * @param year
+     */
+    void deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year);
+
+    /**
+     * 删除季度
+     * @param planId
+     * @param cycle
+     * @param quarter
+     * @param year
+     */
+    void  deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
+
+    /**
+     * 已完成
+     * @param planId
+     * @return
+     */
     List<CoreMonitoringRetrievalTask> selectCompleteByPlanId(Long planId);
 
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);

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

@@ -16,6 +16,7 @@ import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -109,6 +110,64 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
 
     void deleteTaskByPlanId(Long planId);
 
+    /**
+     * 根据计划删除所有任务
+     * @param planId
+     */
+    void deleteAllTaskByPlanId(Long planId);
+
+    /**
+     * 删除日任务
+     * @param planId
+     * @param cycle
+     * @param ymdDate
+     */
+    void  deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate);
+void  deleteDayTaskByTime(Long planId, String cycle,Date startTime,Date endTime);
+void  deleteDayTaskByTimeAndPlanId(Long planId, String cycle,Date startTime,Date endTime);
+    /**
+     * 删除周任务
+     * @param planId
+     * @param cycle
+     * @param week
+     * @param year
+     */
+    void  deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year);
+
+    /**
+     * 删除月任务
+     * @param planId
+     * @param cycle
+     * @param month
+     * @param year
+     */
+    void  deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year);
+
+    /**
+     * 删除季度任务
+     * @param planId
+     * @param cycle
+     * @param quarter
+     * @param year
+     */
+    void  deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
+
+    /**
+     * 删除半年任务
+     * @param planId
+     * @param cycle
+     * @param halfYear
+     * @param year
+     */
+    void  deleteHalfYearTaskByPlanId(Long planId, String cycle, String halfYear, String year);
+
+    /**
+     * 删除年任务
+     * @param planId
+     * @param cycle
+     * @param year
+     */
+    void  deleteYearTaskByPlanId(Long planId, String cycle, String year);
     void deleteWaitTaskByPlanId(Long planId);
 
     void updateDeleteTaskByPlanId(Long planId, Integer isDeleted);

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

@@ -399,6 +399,51 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
+    public void deleteAllTaskByPlanId(Long planId) {
+        coreMonitoringRetrievalTaskMapper.deleteAllTaskByPlanId(planId);
+    }
+
+    @Override
+    public void deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate) {
+        coreMonitoringRetrievalTaskMapper.deleteDayTaskByPlanId(planId,cycle,ymdDate.toString());
+    }
+
+    @Override
+    public void deleteDayTaskByTime(Long planId, String cycle, Date startTime, Date endTime) {
+        coreMonitoringRetrievalTaskMapper.deleteDayTaskByTime(planId,cycle,startTime,endTime);
+    }
+
+    @Override
+    public void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime) {
+
+    }
+
+    @Override
+    public void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year) {
+
+    }
+
+    @Override
+    public void deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year) {
+
+    }
+
+    @Override
+    public void deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year) {
+
+    }
+
+    @Override
+    public void deleteHalfYearTaskByPlanId(Long planId, String cycle, String halfYear, String year) {
+
+    }
+
+    @Override
+    public void deleteYearTaskByPlanId(Long planId, String cycle, String year) {
+
+    }
+
+    @Override
     public void deleteWaitTaskByPlanId(Long planId) {
         coreMonitoringRetrievalTaskMapper.deleteWaitTaskByPlanId(planId);
     }
@@ -791,7 +836,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         map.put("workendTime",DateUtil.format(workendTime,"yyyy-MM-dd"));
         map.put("orgId",orgId);
         Integer num = workTimeService.checkWorkTime(map,SecurityConstants.INNER);
-        if(num>0){
+       if(num>0){
             return true;
         }else {
             return  false;

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

@@ -92,7 +92,8 @@
         a.plan_status,
         a.end_time,
         a.description,
-        a.is_distribute
+        a.is_distribute,
+        a.parent_id
         FROM
         core_monitoring_retrieval_plan a
         LEFT JOIN core_monitoring_retrieval_plan b ON a.parent_id = b.id

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -425,6 +425,34 @@
                                    OR parent_id = #{planId}) b)
           and status in (0, 3)
     </delete>
+    <delete id="deleteAllTaskByPlanId">
+        delete
+        from core_monitoring_retrieval_task
+        where plan_id = #{planId}
+    </delete>
+    <delete id="deleteDayTaskByPlanId">
+        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date=#{ymdDate}
+                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id=#{planId})
+    </delete>
+    <delete id="deleteWeekTaskByPlanId">
+        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle}  AND ymd_week=#{week}
+                                                     AND ymd_year=#{year}
+                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id=#{planId})
+    </delete>
+    <delete id="deleteMonthTaskByPlanId">
+        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_month=#{month}
+                                                     AND ymd_year=#{year}
+                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id=#{planId})
+    </delete>
+    <delete id="deleteQuarterTaskByPlanId"></delete>
+    <delete id="deleteDayTaskByTime">
+        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date BETWEEN #{startTime} AND #{endTime}
+                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id=#{planId})
+    </delete>
+    <delete id="deleteDayTaskByTimeAndPlanId">
+        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date BETWEEN #{startTime} AND #{endTime}
+                                                     AND plan_id =#{planId}
+    </delete>
 
 
     <update id="updateDeleteTaskByPlanId">
@@ -503,6 +531,6 @@
             core_monitoring_retrieval_task
         WHERE
             plan_id = #{planId}
-          AND `status` =2
+        and    `status` IN (2,3)
     </select>
 </mapper>