From 4fcc635394da574fbdcc2ba99c5a2b0dffac6368 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Wed, 9 Jul 2025 18:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=BF=9B=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 13 ++++++++++++- .../partrolresult/mapper/PatrolResultMapper.java | 2 ++ .../resources/mapper/task/PatrolResultMapper.xml | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) 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 7f79b53..70a02d6 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 @@ -1514,7 +1514,18 @@ public class PatrolResultController extends BaseController { if (!resultList.isEmpty()) { logger.info(Color.CYAN + "+++++++ callAlgorithm start +++++++" + Color.END); if (jsonRootBean.getTotalNumber() == null) { - jsonRootBean.setTotalNumber(jsonRootBean.getItems().size()); + logger.info("jsonRootBean.getTotalNumber() == null"); + String taskId = String.valueOf(tasks.get(0).getTaskId()); + logger.info("taskId: {}", taskId); + List algList = patrolResultMapper.selectAlgList(taskId); + logger.info("algList: {}", algList.toString()); + int algCount = 0; + for (String alg : algList) { + String[] sub = alg.split(","); + algCount += sub.length; + } + logger.info("algCount: {}", algCount); + jsonRootBean.setTotalNumber(algCount); } callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList); logger.info(Color.CYAN + "+++++++ callAlgorithm end +++++++" + Color.END); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java index 3d3147a..3c227c6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java @@ -116,4 +116,6 @@ public interface PatrolResultMapper { Map selectDeviceNameById(BasePointAreaInfo basePointAreaInfo); + List selectAlgList(String taskId); + } 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 366c4cf..c19bfcd 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 @@ -1121,4 +1121,10 @@ a.eqp_book_id = #{eqpbookId} b.channel_id = #{channelId} + +