From 1576526ffa3aae433f5117a34d76fc10b6ea5f54 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Tue, 12 Aug 2025 09:56:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BA=A2=E5=A4=96=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=94=B9=E6=88=90=E2=80=9C-=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/analysis/utils/ResultAnalysisUtils.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index 24cf8b8..2718616 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -46,11 +46,24 @@ public class ResultAnalysisUtils { public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) { log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); + + if (algType != null && (algType.equals("infrared") || + algType.equals("infra_1800") || + algType.equals("infra_yu3") || + algType.equals("infra_camera") || + algType.equals("infra_camera_reverse") || + algType.equals("xb"))) { + if (messageUtils.get("分析失败").equals(defaultDesc)) { + defaultDesc = "-"; + } + } + if (value == null) { value = ""; } value = algValue.formatValue(value); + // 这个不知道为什么加上 if ("1".equals(resultAnalysis.getFilter())) { algType = ""; } From 472a8199fd1ceb484e5c5442690b60cabae3564c Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Tue, 12 Aug 2025 13:52:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspect/task/controller/PatrolTaskController.java | 1 + 1 file changed, 1 insertion(+) 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 263758c..bc020d2 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 @@ -140,6 +140,7 @@ public class PatrolTaskController extends BaseController { JSONArray data = jsonObject.getJSONArray("data"); if (data != null && !data.isEmpty()) { List areaNames = data.stream() + .filter(item -> "station_in".equals(((JSONObject) item).getString("areaType"))) .map(item -> ((JSONObject) item).getString("areaName")) .collect(Collectors.toList()); task.setAreaName(StringUtils.join(areaNames, StringUtils.COMMA)); From e751b1f057ad2af6d48532a945d97856e8e3efa9 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Wed, 13 Aug 2025 09:46:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E7=BA=A2=E5=A4=96?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=E6=94=B9=E6=88=90=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/analysis/utils/ResultAnalysisUtils.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index 2718616..64d0c9d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -47,14 +47,19 @@ public class ResultAnalysisUtils { public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) { log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); - if (algType != null && (algType.equals("infrared") || + if ("1".equals(resultAnalysis.getFilter()) && algType != null && (algType.equals("infrared") || algType.equals("infra_1800") || algType.equals("infra_yu3") || algType.equals("infra_camera") || - algType.equals("infra_camera_reverse") || - algType.equals("xb"))) { + algType.equals("infra_camera_reverse"))) { if (messageUtils.get("分析失败").equals(defaultDesc)) { - defaultDesc = "-"; + // 绍兴红外分析失败改成正常 + resultAnalysis.setResultType("1"); + resultAnalysis.setPointStatus("1"); + resultAnalysis.setResStatus("0"); + resultAnalysis.setCreateTime(new Date()); + resultAnalysis.setDescription("-"); + return; } }