From b3df44379ce7d7fdcefff978c552e9db1491342c Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Mon, 28 Jul 2025 13:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=8D=8E=E7=AB=99=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E5=8C=85=E6=96=87=E4=BB=B6=E5=90=8D=E5=B8=A6=E4=B8=8A=E7=82=B9?= =?UTF-8?q?=E4=BD=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partrolresult/mapper/PatrolResultMapper.java | 2 ++ .../partrolresult/service/IPatrolResultService.java | 2 ++ .../service/impl/PatrolResultServiceImpl.java | 4 ++++ .../controller/PatrolTaskResultMainController.java | 5 +++-- .../inspect/task/controller/PatrolTaskController.java | 2 ++ .../main/resources/mapper/task/PatrolResultMapper.xml | 11 +++++++++++ 6 files changed, 24 insertions(+), 2 deletions(-) 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 3c227c6..a62888b 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 @@ -26,6 +26,8 @@ public interface PatrolResultMapper { List selectPatrolResultList(PatrolResult patrolResult); + PatrolResult selectPatrolResultByDeviceName(String deviceName); + List selectPatrolResultListOrderBy(PatrolResult patrolResult); List selectPatrolDataResultByTaskCode(PatrolResult patrolResult); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java index ab80fb3..9e1bad4 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java @@ -19,6 +19,8 @@ public interface IPatrolResultService { List selectPatrolResultList(PatrolResult patrolResult); + PatrolResult selectPatrolResultByDeviceName(String deviceName); + ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis); List selectPatrolResultListOrderBy(PatrolResult patrolResult); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index d3ef7f6..d3ac0cf 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -105,6 +105,10 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return patrolResultMapper.selectPatrolResultList(patrolResult); } + public PatrolResult selectPatrolResultByDeviceName(String deviceName) { + return patrolResultMapper.selectPatrolResultByDeviceName(deviceName); + } + public ResultAnalysis selectTaskAbnormalData(ResultAnalysis patrolResult) { return resultAnalysisMapper.selectTaskAbnormalData(patrolResult); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 39f7c3e..381e635 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -751,7 +751,7 @@ public class PatrolTaskResultMainController extends BaseController { images.add(originalImgSrc); String pointName = reportData.getPointName(); pointName = (pointName != null) ? pointName : "unnamed"; - + PatrolResult patrolResult = patrolResultService.selectPatrolResultByDeviceName(pointName); // 提取文件扩展名 String extension = ""; int dotIndex = originalImgSrc.lastIndexOf('.'); @@ -760,7 +760,8 @@ public class PatrolTaskResultMainController extends BaseController { } // 生成唯一文件名（包含 lineId 防止重复） - String uniqueFileName = String.format("%s_%s_%d%s", + String uniqueFileName = String.format("%s_%s_%s_%d%s", + (patrolResult != null ? patrolResult.getDeviceId() : ""), pointName, reportData.getLineId(), imgIndex, 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 061ce43..9c73418 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 @@ -2995,6 +2995,8 @@ public class PatrolTaskController extends BaseController { item.setAlgName(algInfos.stream().filter( (alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst().get().getAlgSubtypeName() ); + item.setFilterDesc(item.getDesc()); + item.setDesc(""); if (!listPointName.contains(item.getPointName())) { listPointName.add(item.getPointName()); 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 9e4c70b..5c0676b 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 @@ -96,6 +96,17 @@ ORDER BY line_id desc + + +