Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/quartz/quartz.sql

@@ -26,3 +26,6 @@ INSERT INTO `sys_job`( `job_name`, `job_group`, `invoke_target`, `cron_expressio
 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 ( '生成每月安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildMonthTask', '1 1 1 1 * ?', '1', '1', '0', '省联社账号', '2023-10-10 10:37:20', '', NULL);
 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 ( '生成每半年安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildHalfYearTask', '1 1 1 1 1/6 ?', '1', '1', '0', '省联社账号', '2023-10-10 10:38:31', '', NULL);
 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 ( '生成每年安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildYearTask', '1 1 1 1 1 ? *', '1', '1', '0', '省联社账号', '2023-10-10 10:39:38', '', NULL);
+-- 预案演练逾期任务状态修改定时任务
+DELETE from sys_job where invoke_target='CoreDrillTask.updateDrillTaskStatus()';
+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 ( '预案演练逾期任务状态修改', 'DEFAULT', 'CoreDrillTask.updateDrillTaskStatus()', '0 0 1 * * ?', '1', '1', '0', 'slsjyc', '2023-10-19 08:56:30', '', NULL);

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

@@ -833,6 +833,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 throw new ServiceException("计划有已完成或者已逾期的任务，不能被删除。");
             }
             i = tMonitoringRetrievalPlanMapper.updatePlan(monitoringRetrievalPlan);
+            if (i < 1) {
+                return i;
+            }
             iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(id);
         }
         return i;

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

@@ -112,62 +112,24 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
 
     /**
      * 根据计划删除所有任务
+     *
      * @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);
+    void deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate);
 
-    /**
-     * 删除月任务
-     * @param planId
-     * @param cycle
-     * @param month
-     * @param year
-     */
-    void  deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year);
+    void deleteDayTaskByTime(Long planId, String cycle, Date startTime, Date endTime);
 
-    /**
-     * 删除季度任务
-     * @param planId
-     * @param cycle
-     * @param quarter
-     * @param year
-     */
-    void  deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
+    void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime);
 
-    /**
-     * 删除半年任务
-     * @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

@@ -413,33 +413,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime) {
-
-    }
-
-    @Override
-    public void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year) {
-
+        coreMonitoringRetrievalTaskMapper.deleteDayTaskByTimeAndPlanId(planId,cycle,startTime,endTime);
     }
 
-    @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) {