巡检优化

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGather.java

@@ -76,7 +76,7 @@ public class FillGather implements Serializable {
     private DataScope dataScope;
 
     /**
-     * 频次周期（天）
+     * 频次周期（小时）
      */
     private Integer period;
 

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -105,7 +105,7 @@ public class FillGatherTask implements Serializable {
     private Integer taskType;
 
     /**
-     * 巡检任务周期频次 （天）
+     * 巡检任务周期频次 （小时）
      */
     private Integer period;
 

platform-dao/src/main/java/com/platform/dao/vo/query/hidden/HiddenDangerVO.java

@@ -128,4 +128,6 @@ public class HiddenDangerVO extends BaseVO implements Serializable {
     private String dutyUserName;
 
     private String areaUserName;
+
+    private String sbCph;
 }

platform-rest/src/main/java/com/platform/rest/task/FillGatherTaskTask.java

@@ -121,11 +121,19 @@ public class FillGatherTaskTask {
 
     private List<FillGatherTask> validateList(List<FillGatherTask> list,String nowDateStr){
         List<FillGatherTask> retList = new ArrayList<>();
+        // 当前时间
+        LocalDateTime now = LocalDateTime.now();
         for(FillGatherTask task : list){
             LocalDateTime lastCreatedTime = task.getCreatedTime();
-            String targetCreatedTimeStr = DateUtils.dateToString(lastCreatedTime.plusDays(task.getPeriod()),DateUtils.PATTERN_YMD);
+            // 目标时间
+            LocalDateTime targetTime = lastCreatedTime.plusHours(task.getPeriod());
+            /*String targetCreatedTimeStr = DateUtils.dateToString(lastCreatedTime.plusDays(task.getPeriod()),DateUtils.PATTERN_YMD);
             if(nowDateStr.equals(targetCreatedTimeStr)){
                 retList.add(task);
+            }*/
+            if(targetTime.isAfter(now)){
+                // 超过当前频次周期的生成任务
+                retList.add(task);
             }
         }
         return retList;

platform-service/src/main/java/com/platform/service/hidden/impl/HiddenDangerServiceImpl.java

@@ -18,6 +18,7 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.hidden.HiddenDangerService;
 import com.platform.service.repair.strategy.RepairBaseStrategy;
 import com.platform.service.repair.strategy.RepairStrategyFactory;
+import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysFileService;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
@@ -37,6 +38,8 @@ import java.util.List;
 public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper, HiddenDanger, HiddenDangerDTO> implements HiddenDangerService {
     @Resource
     private SysFileService sysFileService;
+    @Resource
+    private SbInfoService sbInfoService;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -126,6 +129,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         });
         vo.setBeforeImageList(beforeImageList);
         vo.setFileList(fileList);
+        vo.setSbCph(sbInfoService.getById(vo.getSbId()).getCph());
         return vo;
     }