From 8f245bccbd25a194513ea8535ade3fd49312a0a1 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 23 Sep 2025 13:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E7=AB=99=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspect/job/task/JobMainTask.java | 1 + .../task/controller/PatrolTaskController.java | 8 +++++++- .../java/com/inspect/task/domain/PatrolData.java | 15 +++++++++++++-- .../resources/mapper/task/PatrolResultMapper.xml | 4 +++- 4 files changed, 24 insertions(+), 4 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 a35e52b..f9c3122 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 @@ -2073,6 +2073,7 @@ public class JobMainTask { if (keywords.length == 3) { String taskCode = keywords[1]; if (isTaskSlotEmpty(taskCode)) { + log.info(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode); // long currentTime = System.currentTimeMillis(); // long currentDays = TimeUnit.MILLISECONDS.toDays(currentTime); // long currentMinutes = TimeUnit.MILLISECONDS.toMinutes(currentTime); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index ee130a0..d10c0b2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -262,6 +262,9 @@ public class PatrolTaskController extends BaseController { if (!filterDatas.isEmpty()) { item.setImg((filterDatas.get(0)).getImgAnalyse()); item.setFilterDesc((filterDatas.get(0)).getDesc()); + if (StringUtils.isEmpty(item.getImageNormalUrlPath())) { + item.setImageNormalUrlPath((filterDatas.get(0)).getImageNormalUrlPath()); + } // filterList.remove(filterDatas.get(0)); filterList.removeAll(filterDatas); } @@ -2468,6 +2471,9 @@ public class PatrolTaskController extends BaseController { if (!filterDatas.isEmpty()) { item.setImg((filterDatas.get(0)).getImgAnalyse()); item.setFilterDesc((filterDatas.get(0)).getDesc()); + if (StringUtils.isEmpty(item.getImageNormalUrlPath())) { + item.setImageNormalUrlPath((filterDatas.get(0)).getImageNormalUrlPath()); + } // filterList.remove(filterDatas.get(0)); filterList.removeAll(filterDatas); } @@ -2674,7 +2680,7 @@ public class PatrolTaskController extends BaseController { }); return output.toByteArray(); } catch (Exception e) { - logger.warn("图片下载压缩失败: {}", imagePath, e); + logger.warn("图片下载压缩失败: {}", imagePath); return new byte[0]; } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java index fdf522a..0064dc0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java @@ -77,6 +77,8 @@ public class PatrolData implements Comparable { private String algType; private String objectId; private String imageNormalUrlPath; + + private String filePath; private String suggestion; @@ -233,6 +235,10 @@ public class PatrolData implements Comparable { return this.imageNormalUrlPath; } + public String getFilePath() { + return this.filePath; + } + public String getSuggestion() { return this.suggestion; } @@ -341,6 +347,10 @@ public class PatrolData implements Comparable { this.imageNormalUrlPath = imageNormalUrlPath; } + public void setFilePath(String filePath) { + this.filePath = filePath; + } + public void setSuggestion(String suggestion) { this.suggestion = suggestion; } @@ -357,12 +367,12 @@ public class PatrolData implements Comparable { if (this == object) return true; if (object == null || getClass() != object.getClass()) return false; PatrolData that = (PatrolData) object; - return Objects.equals(deviceName, that.deviceName) && Objects.equals(channelName, that.channelName) && Objects.equals(deviceSource, that.deviceSource) && Objects.equals(pointName, that.pointName) && Objects.equals(pointId, that.pointId) && Objects.equals(warnStatus, that.warnStatus) && Objects.equals(algName, that.algName) && Objects.equals(resValue, that.resValue) && Objects.equals(img, that.img) && Objects.equals(filterDesc, that.filterDesc) && Objects.equals(brightDesc, that.brightDesc) && Objects.equals(imgAnalyse, that.imgAnalyse) && Objects.equals(brightImgAnalyse, that.brightImgAnalyse) && Objects.equals(desc, that.desc) && Objects.equals(lineId, that.lineId) && Objects.equals(patrolTime, that.patrolTime) && Objects.equals(pointStatus, that.pointStatus) && Objects.equals(imgType, that.imgType) && Objects.equals(dataType, that.dataType) && Objects.equals(filter, that.filter) && Objects.equals(requestId, that.requestId) && Objects.equals(resStatus, that.resStatus) && Objects.equals(brightResStatus, that.brightResStatus) && Objects.equals(areaName, that.areaName) && Objects.equals(algType, that.algType) && Objects.equals(objectId, that.objectId) && Objects.equals(imageNormalUrlPath, that.imageNormalUrlPath) && Objects.equals(suggestion, that.suggestion); + return Objects.equals(deviceName, that.deviceName) && Objects.equals(channelName, that.channelName) && Objects.equals(deviceSource, that.deviceSource) && Objects.equals(pointName, that.pointName) && Objects.equals(pointId, that.pointId) && Objects.equals(warnStatus, that.warnStatus) && Objects.equals(algName, that.algName) && Objects.equals(resValue, that.resValue) && Objects.equals(img, that.img) && Objects.equals(filterDesc, that.filterDesc) && Objects.equals(brightDesc, that.brightDesc) && Objects.equals(imgAnalyse, that.imgAnalyse) && Objects.equals(brightImgAnalyse, that.brightImgAnalyse) && Objects.equals(desc, that.desc) && Objects.equals(lineId, that.lineId) && Objects.equals(patrolTime, that.patrolTime) && Objects.equals(pointStatus, that.pointStatus) && Objects.equals(imgType, that.imgType) && Objects.equals(dataType, that.dataType) && Objects.equals(filter, that.filter) && Objects.equals(requestId, that.requestId) && Objects.equals(resStatus, that.resStatus) && Objects.equals(brightResStatus, that.brightResStatus) && Objects.equals(areaName, that.areaName) && Objects.equals(algType, that.algType) && Objects.equals(objectId, that.objectId) && Objects.equals(imageNormalUrlPath, that.imageNormalUrlPath) && Objects.equals(suggestion, that.suggestion) && Objects.equals(filePath, that.filePath); } @Override public int hashCode() { - return Objects.hash(deviceName, channelName, deviceSource, pointName, pointId, warnStatus, algName, resValue, img, filterDesc, brightDesc, imgAnalyse, brightImgAnalyse, desc, lineId, patrolTime, pointStatus, imgType, dataType, filter, requestId, resStatus, brightResStatus, areaName, algType, objectId, imageNormalUrlPath, suggestion); + return Objects.hash(deviceName, channelName, deviceSource, pointName, pointId, warnStatus, algName, resValue, img, filterDesc, brightDesc, imgAnalyse, brightImgAnalyse, desc, lineId, patrolTime, pointStatus, imgType, dataType, filter, requestId, resStatus, brightResStatus, areaName, algType, objectId, imageNormalUrlPath, suggestion, filePath); } @Override @@ -395,6 +405,7 @@ public class PatrolData implements Comparable { ", algType='" + algType + '\'' + ", objectId='" + objectId + '\'' + ", imageNormalUrlPath='" + imageNormalUrlPath + '\'' + + ", filePath='" + filePath + '\'' + ", suggestion='" + suggestion + '\'' + '}'; } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 4464044..48c0306 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -182,6 +182,7 @@ +