|
@@ -95,7 +95,7 @@ public class FillGatherTaskTask {
|
|
startTime = LocalDateTime.now();
|
|
startTime = LocalDateTime.now();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- newTask.setCreatedTime(startTime); // 巡检开始时间
|
|
|
|
|
|
+ newTask.setCreatedTime(startTime.withSecond(0)); // 巡检开始时间
|
|
fillGatherTaskService.saveModelNoId(newTask);
|
|
fillGatherTaskService.saveModelNoId(newTask);
|
|
// 老旧巡检任务,修改为已生成
|
|
// 老旧巡检任务,修改为已生成
|
|
FillGatherTask updTask = new FillGatherTask();
|
|
FillGatherTask updTask = new FillGatherTask();
|
|
@@ -117,9 +117,12 @@ public class FillGatherTaskTask {
|
|
}
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
|
public static void main(String[] args) {
|
|
- String name = "甲三巡检_2023-02-23_2023-02-24_2023-02-24_2023-02-25";
|
|
|
|
- String[] arr = name.split("_");
|
|
|
|
- System.out.println(LocalDateTime.now().plusDays(1).withHour(8));
|
|
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
|
+ LocalDateTime end = now.withSecond(0);
|
|
|
|
+ //LocalDateTime end = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.getDayOfMonth(),now.getHour(),now.getMinute(),00,123);
|
|
|
|
+
|
|
|
|
+ System.out.println(now);
|
|
|
|
+ System.out.println(end);
|
|
}
|
|
}
|
|
|
|
|
|
private void saveDetails(String content,String newTaskId,String taskId){
|
|
private void saveDetails(String content,String newTaskId,String taskId){
|
|
@@ -177,8 +180,9 @@ public class FillGatherTaskTask {
|
|
if(nowDateStr.equals(targetCreatedTimeStr)){
|
|
if(nowDateStr.equals(targetCreatedTimeStr)){
|
|
retList.add(task);
|
|
retList.add(task);
|
|
}*/
|
|
}*/
|
|
-
|
|
|
|
- if(targetTime.isBefore(now)){
|
|
|
|
|
|
+ String targetStr = DateUtils.dateToString(targetTime,DateUtils.PATTERN_YMD_HMS);
|
|
|
|
+ String nowStr = DateUtils.dateToString(now,DateUtils.PATTERN_YMD_HMS);
|
|
|
|
+ if(targetTime.isBefore(now) || targetStr.equals(nowStr)){
|
|
// 超过当前频次周期的生成任务
|
|
// 超过当前频次周期的生成任务
|
|
retList.add(task);
|
|
retList.add(task);
|
|
}
|
|
}
|