feature 隐患任务生成逻辑代码提交

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ScheduledTasksServiceImpl.java

@@ -349,46 +349,26 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                 endInstance.set(Calendar.DAY_OF_MONTH, 31);
                 for (Map.Entry<Integer, List<ApsHazardInvestigationTemplateZibiaoDo>> task : groupByCycle.entrySet()) {
                     endInstance.add(Calendar.YEAR, task.getKey() - 1);
-                    // 如果当前时间是1月1号直接生成隐患任务
-                    if ((today.getMonth() == Month.JANUARY) && (today.getDayOfMonth() == 1)) {
-                        task.getValue()
-                                .parallelStream()
-                                .filter(info -> info.getGenerationdate() == null ||
-                                        JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle()
-                                ).forEach(apsHazardInvestigationTemplateZibiaoDo -> {
-                                   updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
-                                    dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
-
-                                    updateGenerationDateDo[0].setId(apsHazardInvestigationTemplateZibiaoDo.getId());
-                                    updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
-                                    updateGenerationDateList.add(updateGenerationDateDo[0]);
-                                });
-                    } else {
-                        task.getValue()
-                                .parallelStream()
-                                .filter(info -> info.getGenerationdate() == null)
-                                .forEach(apsHazardInvestigationTemplateZibiaoDo -> {
-                                    updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
-                                    dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
-
-                                    updateGenerationDateDo[0].setId(apsHazardInvestigationTemplateZibiaoDo.getId());
-                                    updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
-                                    updateGenerationDateList.add(updateGenerationDateDo[0]);
-                                });
-                    }
+                    task.getValue()
+                            .parallelStream()
+                            .filter(info -> info.getGenerationdate() == null ||
+                                    JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle()
+                            )
+                            .forEach(apsHazardInvestigationTemplateZibiaoDo -> {
+                                updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
+                                dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
+                                updateGenerationDateDo[0].setId(apsHazardInvestigationTemplateZibiaoDo.getId());
+                                updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
+                                updateGenerationDateList.add(updateGenerationDateDo[0]);
+                            });
                 }
-                ;
-
             } else if (SaveConstans.INSPECTION_CYCLE_UNIT.MONTH.equals(checkCycleUnit)) {
-
                 // 关键步骤：定位到当月最后一天
                 startInstance.set(Calendar.DAY_OF_MONTH, 1);      // 设置为当月第一天
                 // 设置时间为23:59:59
                 startInstance.set(Calendar.HOUR_OF_DAY, 0);
                 startInstance.set(Calendar.MINUTE, 0);
                 startInstance.set(Calendar.SECOND, 0);
-
-
                 // 关键步骤：定位到当月最后一天
                 endInstance.set(Calendar.DAY_OF_MONTH, 1);      // 设置为当月第一天
                 endInstance.add(Calendar.MONTH, 1);             // 跳到下个月第一天
@@ -399,11 +379,10 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                 endInstance.set(Calendar.SECOND, 59);
                 for (Map.Entry<Integer, List<ApsHazardInvestigationTemplateZibiaoDo>> task : groupByCycle.entrySet()) {
                     endInstance.add(Calendar.MONTH, task.getKey() - 1);
-                    // 如果当前时间是1月1号直接生成隐患任务
                     task.getValue()
                             .parallelStream()
                             .filter(info -> info.getGenerationdate() == null ||
-                                    JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >=  info.getInspectioncycle())
+                                    JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle())
                             .forEach(apsHazardInvestigationTemplateZibiaoDo -> {
                                 updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
                                 dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
@@ -438,8 +417,6 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                                 updateGenerationDateList.add(updateGenerationDateDo[0]);
                             });
                 }
-                ;
-
 
             } else {
                 log.error("暂不支持的周期单位：{}", checkCycleUnit);
@@ -458,7 +435,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
     }
 
     public static boolean isSameDatePart(Date date, LocalDateTime localDateTime) {
-        if(date==null || localDateTime==null){
+        if (date == null || localDateTime == null) {
             return false;
         }
         // 1. 转换 Date -> LocalDate