fix：巡视方案修改时，将任务定期执行策略都清空

inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/domain/SysDictData.java

@@ -12,7 +12,6 @@ import lombok.*;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Data
 public class SysDictData extends BaseEntity {
     private static final long serialVersionUID = 1L;
     @Excel(
@@ -56,6 +55,22 @@ public class SysDictData extends BaseEntity {
     )
     private String status;
 
+    public Long getDictCode() {
+        return dictCode;
+    }
+
+    public void setDictCode(Long dictCode) {
+        this.dictCode = dictCode;
+    }
+
+    public Long getDictSort() {
+        return dictSort;
+    }
+
+    public void setDictSort(Long dictSort) {
+        this.dictSort = dictSort;
+    }
+
     @NotBlank(
             message = "字典标签不能为空"
     )
@@ -68,6 +83,10 @@ public class SysDictData extends BaseEntity {
         return this.dictLabel;
     }
 
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
+    }
+
     @NotBlank(
             message = "字典键值不能为空"
     )
@@ -96,6 +115,10 @@ public class SysDictData extends BaseEntity {
         return this.dictType;
     }
 
+    public void setDictType(String dictType) {
+        this.dictType = dictType;
+    }
+
     @Size(
             min = 0,
             max = 100,
@@ -105,8 +128,31 @@ public class SysDictData extends BaseEntity {
         return this.cssClass;
     }
 
+    public void setCssClass(String cssClass) {
+        this.cssClass = cssClass;
+    }
+
+    public String getListClass() {
+        return listClass;
+    }
+
+    public void setListClass(String listClass) {
+        this.listClass = listClass;
+    }
 
     public boolean getDefault() {
         return "Y".equals(this.isDefault);
     }
+
+    public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -1013,7 +1013,8 @@ public class PatrolTaskController extends BaseController {
                 if (key != null && key.contains(String.valueOf(patrolTask.getTaskId()))) {
                     return AjaxResult.error("任务正在执行，禁止修改！");
                 }
-
+                // 将任务定期执行策略都清空
+                patrolTaskService.clearTaskScheduleStrategy(patrolTask.getTaskId().toString());
                 patrolTask.setStorage(message);
                 String cycleMonthText;
                 if (StringUtils.isNotEmpty(patrolTask.getCycleMonth())) {
@@ -1247,7 +1248,8 @@ public class PatrolTaskController extends BaseController {
                 if (key != null && key.contains(String.valueOf(patrolTask.getTaskId()))) {
                     return AjaxResult.error("任务正在执行，禁止修改！");
                 }
-
+                // 将任务定期执行策略都清空
+                patrolTaskService.clearTaskScheduleStrategy(patrolTask.getTaskId().toString());
                 if (!eqList.isEmpty()) {
                     patrolTask.setStorage(message);
                     String cycleMonthText;
@@ -3110,7 +3112,7 @@ public class PatrolTaskController extends BaseController {
         long start = System.currentTimeMillis();
         PatrolTaskStatus patro = this.patrolTaskStatusService.selectPatrolTaskStatusByLineId(patrolTaskStatus.getLineId());
         List<PatrolData> newList = getNewList(patrolTaskStatus, patro.getTaskPatrolledId());
-        logger.info("数据处理耗时: {} ms", (System.currentTimeMillis() - start));
+        logger.info("{}条数据处理耗时: {} ms", newList != null ? newList.size() : 0, (System.currentTimeMillis() - start));
         long startExport = System.currentTimeMillis();
         exportExcelV2(response, newList);
         logger.info("任务详情导出耗时: {} ms", (System.currentTimeMillis() - startExport));

inspect-main/inspect-main-task/src/main/java/com/inspect/task/mapper/PatrolTaskMapper.java

@@ -60,4 +60,6 @@ public interface PatrolTaskMapper {
     List<JSONObject> selectBasedataPatrolPointPresetList(@Param("patrolPointIds") List<String> patrolPointIds);
 
     List<JSONObject> selectPatrolPresetPosList(@Param("patrolPointIds") List<String> patrolPointIds);
+
+    void clearTaskScheduleStrategy(String taskId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/IPatrolTaskService.java

@@ -63,4 +63,6 @@ public interface IPatrolTaskService {
     List<JSONObject> selectBasedataPatrolPointPresetList(List<String> patrolPointIds);
 
     List<JSONObject> selectPatrolPresetPosList(List<String> patrolPointIds);
+
+    void clearTaskScheduleStrategy(String taskId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/impl/PatrolTaskServiceImpl.java

@@ -127,6 +127,12 @@ public class PatrolTaskServiceImpl implements IPatrolTaskService {
         return count;
     }
 
+    @Override
+    public void clearTaskScheduleStrategy(String taskId) {
+        this.patrolTaskMapper.clearTaskScheduleStrategy(taskId);
+        taskCalendarGenerator.onTaskChange();
+    }
+
     public int deletePatrolTaskByTaskIds(Long[] taskIds) {
         int count = this.patrolTaskMapper.deletePatrolTaskByTaskIds(taskIds);
         taskCalendarGenerator.onTaskChange();

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -1382,10 +1382,10 @@
                            ON a.device_id = c.patrol_point_id
 
                  LEFT JOIN basedata_device d
-                           ON c.device_id = d.device_id
+                           ON c.relation_device_id = d.device_id
 
                  LEFT JOIN basedata_area e
-                           ON e.area_id = d.area_id
+                           ON e.area_id = d.relation_area_id
 
                  LEFT JOIN patrol_task_status s
                            ON s.task_patrolled_id = a.task_patrolled_id

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskMapper.xml

@@ -342,6 +342,26 @@
         where task_id = #{taskId}
     </update>
 
+
+    <update id="clearTaskScheduleStrategy" parameterType="String">
+        UPDATE patrol_task
+        SET fixed_start_time = NULL,
+        cycle_month = NULL,
+        cycle_week = NULL,
+        cycle_execute_time = NULL,
+        cycle_start_time = NULL,
+        cycle_end_time = NULL,
+        interval_number = NULL,
+        interval_type = NULL,
+        interval_execute_time = NULL,
+        interval_start_time = NULL,
+        interval_end_time = NULL,
+        execution_status = NULL,
+        task_cycle = NULL
+        WHERE
+        task_id = #{taskId}
+    </update>
+
     <delete id="deletePatrolTaskByTaskId" parameterType="Long">
         delete
         from patrol_task