From 66a5d63d5029694b37be28a29eb79b9a8e2147f6 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Mon, 12 May 2025 11:12:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E8=BD=AC=E6=8D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 25 ++++++++----------- .../controller/ResultAnalysisController.java | 2 +- .../com/inspect/message/MessageUtils.java | 11 ++++++-- .../controller/PatrolResultController.java | 2 +- .../service/AnalyseRemoteService.java | 4 +-- 5 files changed, 24 insertions(+), 20 deletions(-) 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 9bba616..19fdda7 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 @@ -1328,7 +1328,6 @@ public class JobMainTask { if (j != 0) { intervalExecuteTime[0] = String.valueOf(Integer.parseInt(intervalExecuteTime[0]) + 1); } - startThread(patrolTaskInfo, patrolPresetPos, patrolPresetAction, hour, minute, task, intervalExecuteTime, false); } } else if ("2".equals(task.getIntervalType())) { @@ -1336,14 +1335,7 @@ public class JobMainTask { if (j != 0) { intervalExecuteTime[0] = String.valueOf(Integer.parseInt(intervalExecuteTime[0]) + 1); } - startThread(patrolTaskInfo, - patrolPresetPos, - patrolPresetAction, - hour, - minute, - task, - intervalExecuteTime, - false); + startThread(patrolTaskInfo, patrolPresetPos, patrolPresetAction, hour, minute, task, intervalExecuteTime, false); } } } @@ -1659,15 +1651,20 @@ public class JobMainTask { Collection redisKeys = redisService.keys(RedisConst.TASK_CODE_EX); for (String redisKey : redisKeys) { try { + //redisKey = RedisConst.TASK_CODE + task.getTaskCode() + StringUtils.AT + DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getFixedStartTime()) String[] keywords = StringUtils.split(redisKey, StringUtils.AT); if (keywords.length == 3) { String taskCode = keywords[1]; - String fixedStartTime = keywords[2]; if (isTaskSlotEmpty(taskCode)) { - long currentDays = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis()); - long fixedDays = TimeUnit.MILLISECONDS.toDays(DateUtils.parse(DateUtils.yyyyMMddHHmmss2, fixedStartTime).getTime()); - long currentMinutes = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis()); - long fixedStartMinutes = TimeUnit.MILLISECONDS.toMinutes(DateUtils.parse(DateUtils.yyyyMMddHHmmss2, fixedStartTime).getTime()); + long currentTime = System.currentTimeMillis(); + long currentDays = TimeUnit.MILLISECONDS.toDays(currentTime); + long currentMinutes = TimeUnit.MILLISECONDS.toMinutes(currentTime); + + String fixedStartTime = keywords[2]; + long planTime = DateUtils.parse(DateUtils.yyyyMMddHHmmss2, fixedStartTime).getTime(); + long fixedDays = TimeUnit.MILLISECONDS.toDays(planTime); + long fixedStartMinutes = TimeUnit.MILLISECONDS.toMinutes(planTime); + if (currentDays == fixedDays && currentMinutes >= fixedStartMinutes) { extractRedisTask(redisKey, taskCode); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index d6b89d0..dbf7892 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -153,7 +153,7 @@ public class ResultAnalysisController extends BaseController { JSONObject parseObject = JSONObject.parseObject(brr.getResultContent()); Object jsonArray = parseObject.get("resultList"); pointPrelist = JSONArray.parseArray(jsonArray + "", resultList.class); - if (!pointPrelist.isEmpty()) { + if (pointPrelist != null && !pointPrelist.isEmpty()) { resultList resultList = (resultList) pointPrelist.get(0); if (resultList.getResults() != null && !resultList.getResults().isEmpty()) { List ss = resultList.getResults().stream().map(results::getType).collect(Collectors.toList()); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java index 298e618..467567d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java @@ -15,9 +15,16 @@ public class MessageUtils { @Autowired private IPatrolTaskService patrolTaskService; + private String language = null; + public String get(String key) { - String language = patrolTaskService.selectConfigByKey("LANGUAGE"); - log.info("language:{}, key:{}", language, key); + if(language == null) { + language = patrolTaskService.selectConfigByKey("LANGUAGE"); + if(language == null) { + language = ""; + } + } +// log.info("language:{}, key:{}", language, key); if(language == null || !language.equalsIgnoreCase("en")) { return key; } else { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index ca9edb5..d1e6bfb 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -943,7 +943,7 @@ public class PatrolResultController extends BaseController { } } - //qinyl 大模型 + //qinyl 大模型(目前也是走初篩) if (!bigModelList.isEmpty()) { AnalyseRequest analyseReq = new AnalyseRequest(); analyseReq.setTaskPatrolId(patrolResultList.get(0).getTaskPatrolledId()); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java index 12dc2fe..f4bd7e9 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java @@ -35,7 +35,7 @@ public class AnalyseRemoteService { @Resource private IPatrolTaskService patrolTaskService; - //qinyl 只取第一个,analyseReq.getObjectList().get(0) + //qinyl public void sendRequest(AnalyseRequest analyseReq, String[] typeList, boolean isFilter) { String requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); String taskPatrolId = analyseReq.getTaskPatrolId(); @@ -55,7 +55,7 @@ public class AnalyseRemoteService { final String analyzeFilterRequestIdRedisKey = AnalyseConstants.ANALYSE_FILTER_REQUEST.concat(requestId); log.info("[FILTER] sendRequest analyseFilterRequestIdRedisKey: {}, analyseReq: {}", analyzeFilterRequestIdRedisKey, analyseReq); this.redisService.setCacheObject(analyzeFilterRequestIdRedisKey, analyseReq.clone(), 1L, TimeUnit.HOURS); - AnalyseReqItem analyseReqItem = analyseReq.getObjectList().get(0); + AnalyseReqItem analyseReqItem = analyseReq.getObjectList().get(0);//只取第一个 analyseReqItem.setTypeList(typeList); analyseReq.setObjectList(Collections.singletonList(analyseReqItem)); requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL);