|
|
|
@ -1934,7 +1934,7 @@ public class JobMainTask { |
|
|
|
|
|
|
|
@SuppressWarnings({"unused"}) |
|
|
|
public void execEveryDayTask(List<PatrolTask> patrolTaskList) { |
|
|
|
log.info("***************************** JobTaskTimer execEveryDayTask with parameters *************************************"); |
|
|
|
log.debug("***************************** JobTaskTimer execEveryDayTask with parameters *************************************"); |
|
|
|
for (PatrolTask patrolTask : patrolTaskList) { |
|
|
|
List<PatrolTaskInfo> taskInfos = new ArrayList<>(); |
|
|
|
String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA); |
|
|
|
@ -1944,7 +1944,7 @@ public class JobMainTask { |
|
|
|
taskInfos.addAll(infosByRecord); |
|
|
|
} |
|
|
|
log.info("execEveryDayTask taskInfos size: {}", taskInfos.size()); |
|
|
|
log.info("execEveryDayTask patrolTask: {}", patrolTask); |
|
|
|
log.debug("execEveryDayTask patrolTask: {}", patrolTask); |
|
|
|
final String taskPatrolId = getTaskPatrolId(patrolTask); |
|
|
|
final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); |
|
|
|
log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); |
|
|
|
@ -2042,7 +2042,7 @@ public class JobMainTask { |
|
|
|
List<PatrolTask> patrolTaskListEx = new ArrayList<>(); |
|
|
|
List<PatrolTask> patrolTaskControlList = new ArrayList<>(); |
|
|
|
for (PatrolTask patrolTask : patrolTaskList) { |
|
|
|
log.info("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); |
|
|
|
log.debug("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); |
|
|
|
if(StringUtils.isNotEmpty(patrolTask.getDevType()) |
|
|
|
&& patrolTask.getDevType().contains("2")) { |
|
|
|
patrolTaskListEx.add(patrolTask); |
|
|
|
@ -2096,7 +2096,7 @@ public class JobMainTask { |
|
|
|
|
|
|
|
@SuppressWarnings({"unused"}) |
|
|
|
public void execEveryDayTask() { |
|
|
|
log.info("***************************** JobTaskTimer execEveryDayTask *************************************"); |
|
|
|
log.debug("***************************** JobTaskTimer execEveryDayTask *************************************"); |
|
|
|
|
|
|
|
Collection<String> redisKeys = redisService.keys(RedisConst.TASK_CODE_EX); |
|
|
|
for (String redisKey : redisKeys) { |
|
|
|
@ -2141,7 +2141,7 @@ public class JobMainTask { |
|
|
|
|
|
|
|
long diffMinutes = currentDate.getTime() - fixedDate.getTime(); |
|
|
|
if (taskInfos.get(redisKey) == null && fixedDay.equals(currentDay) && (diffMinutes >= 0 && diffMinutes <= 60000 && fixedDate.before(currentDate) || fixedDate.getTime() == currentDate.getTime())) { |
|
|
|
log.info(Color.YELLOW + "[JOB] TASK_CODE: {}, FIXED START TIME: {}" + Color.END, taskCode, fixedStartTime); |
|
|
|
log.debug(Color.YELLOW + "[JOB] TASK_CODE: {}, FIXED START TIME: {}" + Color.END, taskCode, fixedStartTime); |
|
|
|
taskInfos.put(redisKey, "1"); |
|
|
|
extractRedisTask(redisKey, taskCode); |
|
|
|
} |
|
|
|
@ -2155,7 +2155,7 @@ public class JobMainTask { |
|
|
|
|
|
|
|
@SuppressWarnings({"unused"}) |
|
|
|
public void makeEveryDayTask() { |
|
|
|
log.info("***************************** JobTaskTimer makeEveryDayTask *************************************"); |
|
|
|
log.debug("***************************** JobTaskTimer makeEveryDayTask *************************************"); |
|
|
|
|
|
|
|
try { |
|
|
|
taskExecClient.makeCurrentDayTask(); |
|
|
|
|