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

@@ -269,9 +269,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                 String weekday = frequencys[1];
                 // 当前时间是星期几
                 String w = DateUtil.dayOfWeek(new Date()) + "";
-                if (!w.equals(weekday)) {
-                    isCreate = false;
-                }
+                isCreate = w.equals(weekday);
             }
             // 每月
             else if ("month".equals(frequencys[0])) {
@@ -280,24 +278,16 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                 if ("32".equals(monthday)) {
                     String nowDay = DateUtil.format(new Date(), "yyyy-MM-dd");
                     String lastDay = DateUtil.format(DateUtil.endOfMonth(new Date()), "yyyy-MM-dd");
-                    if (!nowDay.equals(lastDay)) {
-                        isCreate = false;
-                    }
+                    isCreate = nowDay.equals(lastDay);
                 } else {
-                    if (!(DateUtil.dayOfMonth(new Date()) + "").equals(monthday)) {
-                        isCreate = false;
-                    }
+                    isCreate = (DateUtil.dayOfMonth(new Date()) + "").equals(monthday);
                 }
             }
             // 每年
             else if ("year".equals(frequencys[0])) {
                 String monthday = frequencys[1];
                 String day = frequencys[2];
-                if (monthday.equals(MONTH_ENG.get(DateUtil.thisMonth())) && day.equals(String.valueOf(DateUtil.thisDayOfMonth()))) {
-                    isCreate = true;
-                } else {
-                    isCreate = false;
-                }
+                isCreate = monthday.equals(MONTH_ENG.get(DateUtil.thisMonth())) && day.equals(String.valueOf(DateUtil.thisDayOfMonth()));
             } else {
                 isCreate = false;
             }

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

@@ -183,7 +183,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
         JSCommonUtils.parameterCheck(list::isEmpty, "", "安全检查模板暂无定时任务");
         //循环list
         list.forEach(checkTemplateDo -> {
-            checkTemplateService.assembleCheckTask(checkTemplateDo, true);
+            checkTemplateService.assembleCheckTask(checkTemplateDo, false);
         });
 
 
@@ -361,6 +361,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                                 updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
                                 updateGenerationDateList.add(updateGenerationDateDo[0]);
                             });
+                    endInstance.add(Calendar.YEAR, -(task.getKey() - 1));
                 }
             } else if (SaveConstans.INSPECTION_CYCLE_UNIT.MONTH.equals(checkCycleUnit)) {
                 // 关键步骤：定位到当月最后一天
@@ -390,6 +391,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                                 updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
                                 updateGenerationDateList.add(updateGenerationDateDo[0]);
                             });
+                    startInstance.add(Calendar.MONTH, -(task.getKey() - 1));
                 }
             } else if (SaveConstans.INSPECTION_CYCLE_UNIT.DAY.equals(checkCycleUnit)) {
                 // 对于天的任务 直接判断上次生成时间和当前时间相隔的天数是否满足要求
@@ -416,6 +418,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                                 updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
                                 updateGenerationDateList.add(updateGenerationDateDo[0]);
                             });
+                    endInstance.add(Calendar.DAY_OF_MONTH, -(task.getKey() - 1));
                 }
 
             } else {