diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 16cc616..30d3198 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -35,6 +35,7 @@ import java.net.URLConnection; import java.net.URLEncoder; import java.text.DecimalFormat; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -1173,16 +1174,11 @@ public class JobMainTask { .isEnable("1") .build(); List presetPosList = taskExecClient.selectPatrolPresetPosList(patrolPresetPos); - PatrolPresetPos presetPos = !presetPosList.isEmpty() ? presetPosList.get(0) : - PatrolPresetPos.builder().presetPosId("1") - .presetPosCode("1") - .channelCode("ffffffffffffffffff#ffffffffffffffffffffffffffffffff") - .channelId("999999") - .patrolPointId(1234567890L) - .channelType("vl") - .isEnable("1") - .eqpBookId("1") - .build(); + if (presetPosList.isEmpty()) { + log.info("getInfosByRecord: {} PatrolPresetPos no found", patrolTaskInfo.getDeviceId()); + continue; + } + PatrolPresetPos presetPos = presetPosList.get(0); String deviceCode = "ffffffffffffffffff"; try { String[] channelCodeList = presetPos.getChannelCode().split(StringUtils.HASHTAG); @@ -2039,12 +2035,14 @@ public class JobMainTask { List patrolTaskControlList = new ArrayList<>(); for (PatrolTask patrolTask : patrolTaskList) { log.debug("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType()); - if(StringUtils.isNotEmpty(patrolTask.getDevType()) + // 添加可见光任务 + if (StringUtils.isNotEmpty(patrolTask.getDevType()) && patrolTask.getDevType().contains("2")) { patrolTaskListEx.add(patrolTask); } - if(StringUtils.isNotEmpty(patrolTask.getDevType()) + // 添加无人机/机器狗任务 + if (StringUtils.isNotEmpty(patrolTask.getDevType()) && (patrolTask.getDevType().contains("0") || patrolTask.getDevType().contains("1"))) { patrolTaskControlList.add(patrolTask); } @@ -2093,8 +2091,10 @@ public class JobMainTask { @SuppressWarnings({"unused"}) public void execEveryDayTask() { log.debug("***************************** JobTaskTimer execEveryDayTask *************************************"); - - Collection redisKeys = redisService.keys(RedisConst.TASK_CODE_EX); + String today = LocalDate.now().toString(); + String key = RedisConst.TASK_CODE_EX + today + "*"; + Collection redisKeys = redisService.keys(key); + log.info("TodayTask key:{}, size:{}", key, redisKeys.size()); for (String redisKey : redisKeys) { try { //redisKey = RedisConst.TASK_CODE + task.getTaskCode() + StringUtils.AT + DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getFixedStartTime())