From f1116fb28169e0a4b8b77ae5c00309f124859683 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Fri, 25 Apr 2025 14:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=82=B9=E4=BD=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=97=E6=B3=95=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BasedataPatrolPointController.java    |  1 +
 .../patrolpointmnt/domain/BasedataPatrolPoint.java   | 12 +++++++++++-
 .../service/impl/BasedataPatrolPointServiceImpl.java |  3 ++-
 .../patrolpointmnt/BasedataPatrolPointMapper.xml     |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java
index 3db5be6..8c82a4e 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java
@@ -112,6 +112,7 @@ public class BasedataPatrolPointController extends BaseController {
                 basedataPatrolPoint2.setDeviceTypeId(basedataPatrolPoint.getDeviceTypeId());
                 basedataPatrolPoint2.setPatrolTypeId(basedataPatrolPoint.getPatrolTypeId());
                 basedataPatrolPoint2.setPointImptLevel(basedataPatrolPoint.getPointImptLevel());
+                basedataPatrolPoint2.setAlgSubtypeName(basedataPatrolPoint.getAlgSubtypeName());
                 listEx.add(basedataPatrolPoint2);
             }
             return getDataTable(listEx);
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java
index ee6f107..ea2b6ba 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java
@@ -8,6 +8,7 @@ import com.inspect.base.core.web.domain.BaseEntity;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -105,7 +106,7 @@ public class BasedataPatrolPoint extends BaseEntity {
     private List<BasedataThresholdModification> subTypeDOList;
     private BasedataThresholdModification subTypeDO;
 
-    public void loadAlgSubtypeName(Map<String, String> algSubtypeMap) {
+    public void loadAlgSubtypeName1(Map<String, String> algSubtypeMap) {
         StringBuffer sb = new StringBuffer();
         if (!StringUtils.isEmpty(this.algSubtypeIds)) {
             String[] var3 = this.algSubtypeIds.split(",");
@@ -121,6 +122,15 @@ public class BasedataPatrolPoint extends BaseEntity {
 
     }
 
+    public void loadAlgSubtypeName(Map<String, String> algSubtypeMap) {
+        if (!StringUtils.isEmpty(this.algSubtypeIds)) {
+            String[] ids = this.algSubtypeIds.split(",");
+            this.algSubtypeName = java.util.Arrays.stream(ids)
+                    .map(algSubtypeMap::get)
+                    .collect(Collectors.joining(","));
+        }
+    }
+
     @Override
     public String toString() {
         return "BasedataPatrolPoint{" +
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
index bca4a59..52f3a58 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
@@ -79,7 +79,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
 
     public List<BasedataPatrolPoint> selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) {
         List<BasedataPatrolPoint> pointList = basedataPatrolpointMapper.selectBasedataMonitorList(basedataPatrolpoint);
-        logger.info("[META] pointList cnt: {}", pointList.size());
+        logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
         if (null != basedataPatrolpoint.getDeviceId()) {
             BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId());
             if(basedataDevice != null) {
@@ -108,6 +108,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
         });
         logger.info("[META] algSubtypeMap: {}", algSubtypeMap);
         pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
+        logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
         return pointList;
     }
 
diff --git a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml
index eeedeaf..3df98d7 100644
--- a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointMapper">
 
-    <resultMap type="BasedataPatrolPoint" id="BasedataPatrolPointResult">
+    <resultMap type="com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPoint" id="BasedataPatrolPointResult">
         <result property="patrolPointId" column="patrol_point_id"/>
         <result property="patrolPointCode" column="patrol_point_code"/>
         <result property="patrolPointName" column="patrol_point_name"/>