定时任务优化小时，分钟，统一一天内的时间

inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java

@@ -558,7 +558,7 @@ public class PatrolTaskExecController extends BaseController {
                                 logger.info("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime));
                                 task.setFixedStartTime(exeTime);
                                 final String taskType = "INTER-BY-HOUR";
-                                parseTaskToRedis(taskType, task, null);
+                                parseTaskToRedis(taskType, task, task.getIntervalEndTime());
                             }
                         } else {
                             log.info("[TASK] isInterTaskByHour intervalNumber error: {}", intervalNumber);
@@ -567,13 +567,15 @@ public class PatrolTaskExecController extends BaseController {
                         // 按分钟执行
                         int intervalNumber = task.getIntervalNumber();
                         if (intervalNumber > 0) {
-                            List<Date> exeTimes = getExecTimesByMinute(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalEndTime()), intervalNumber);
+                            // 取当天的执行时间
+                            String endTime = DateUtils.format(DateUtils.YYYY_MM_DD, DateUtils.addDays(task.getIntervalStartTime(), 1)) + " 00:00:00";
+                            List<Date> exeTimes = getExecTimesByMinute(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), endTime, intervalNumber);
                             if (exeTimes.size() > 0) {
-                                Date date = exeTimes.get(exeTimes.size() - 1);
+//                                Date date = exeTimes.get(exeTimes.size() - 1);
                                 for (Date exeTime : exeTimes) {
                                     task.setFixedStartTime(exeTime);
                                     final String taskType = "INTER-BY-MINUTE";
-                                    parseTaskToRedis(taskType, task, date);
+                                    parseTaskToRedis(taskType, task, task.getIntervalEndTime());
                                 }
                             }
                         } else {
@@ -1025,7 +1027,5 @@ public class PatrolTaskExecController extends BaseController {
         if(fixedDay1.equals(currentDay1) && (value >= 0 && value <= 60000 && fixedDate1.before(currentDate1) || fixedDate1.getTime() == currentDate1.getTime())) {
             System.out.println("过期时间没超过1分钟");
         }
-
-        System.out.println(DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date()));
     }
 }