fix:点位管理详情新增点位类型pointTypeName

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java

@@ -105,6 +105,7 @@ public class BasedataPatrolPointController extends BaseController {
                 basedataPatrolPoint2.setDeviceId(basedataPatrolPoint.getDeviceId());
                 basedataPatrolPoint2.setMainDeviceId(basedataPatrolPoint.getMainDeviceId());
                 basedataPatrolPoint2.setPatrolPointCode(basedataPatrolPoint.getPatrolPointCode());
+                basedataPatrolPoint2.setPointTypeName(basedataPatrolPoint.getPointTypeName());
                 basedataPatrolPoint2.setPatrolPointName(basedataPatrolPoint.getPatrolPointName());
                 basedataPatrolPoint2.setDeviceName(basedataPatrolPoint.getDeviceName());
                 basedataPatrolPoint2.setAlgSubtypeId(basedataPatrolPoint.getAlgSubtypeId());
@@ -147,6 +148,7 @@ public class BasedataPatrolPointController extends BaseController {
                 basedataPatrolPoint2.setDeviceId(basedataPatrolPoint.getDeviceId());
                 basedataPatrolPoint2.setMainDeviceId(basedataPatrolPoint.getMainDeviceId());
                 basedataPatrolPoint2.setPatrolPointCode(basedataPatrolPoint.getPatrolPointCode());
+                basedataPatrolPoint2.setPointTypeName(basedataPatrolPoint.getPointTypeName());
                 basedataPatrolPoint2.setPatrolPointName(basedataPatrolPoint.getPatrolPointName());
                 basedataPatrolPoint2.setDeviceName(basedataPatrolPoint.getDeviceName());
                 basedataPatrolPoint2.setAlgSubtypeId(basedataPatrolPoint.getAlgSubtypeId());

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java

@@ -107,6 +107,8 @@ public class BasedataPatrolPoint extends BaseEntity {
     private List<BasedataThresholdModification> subTypeDOList;
     private BasedataThresholdModification subTypeDO;
 
+    private String pointTypeName;
+
     public void setPatrolpointName(String patrolpointName) {
         this.patrolpointName = patrolpointName;
         this.patrolPointName = patrolpointName;
@@ -117,6 +119,14 @@ public class BasedataPatrolPoint extends BaseEntity {
         this.patrolpointName = patrolPointName;
     }
 
+    public String getPointTypeName() {
+        return pointTypeName;
+    }
+
+    public void setPointTypeName(String pointTypeName) {
+        this.pointTypeName = pointTypeName;
+    }
+
     public void loadAlgSubtypeName1(Map<String, String> algSubtypeMap) {
         StringBuffer sb = new StringBuffer();
         if (!StringUtils.isEmpty(this.algSubtypeIds)) {
@@ -176,6 +186,7 @@ public class BasedataPatrolPoint extends BaseEntity {
                 ", meterType='" + meterType + '\'' +
                 ", subTypeDOList=" + subTypeDOList +
                 ", subTypeDO=" + subTypeDO +
+                ", pointTypeName='" + pointTypeName + '\'' +
                 '}';
     }
 }

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointMapper.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.patrolpointmnt.mapper;
 import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPoint;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointLatestResultVo;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointStatsVo;
+import com.inspect.system.base.domain.SysDictData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -48,4 +49,6 @@ public interface BasedataPatrolPointMapper {
     void updateBasedataPatrolPointRelation(@Param("toAreaId") Long toAreaId, @Param("deviceId") Long deviceId);
 
     void batchUpdateBasedataPatrolPointRelation(@Param("toAreaId") Long toAreaId,@Param("toParentId") Long toParentId,@Param("toDeviceId") Long toDeviceId,@Param("patrolPointIds") List<Long> patrolPointIds);
+
+    List<SysDictData> selectDictDataByType(String point_device_type);
 }

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -40,9 +40,11 @@ import com.inspect.base.core.utils.xml.GenXmlByBean;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
 
+import com.inspect.system.base.domain.SysDictData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
@@ -114,7 +116,18 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
             algSubtypeMap.put(item.getAlgSubtypeId() + "", item.getAlgSubtypeName());
         });
         logger.info("[META] algSubtypeMap: {}", algSubtypeMap);
-        pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
+//        pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
+        Map<String, String> deviceTypeDictMap = getDeviceTypeDictMap();
+        for (BasedataPatrolPoint basedataPatrolPoint : pointList) {
+            basedataPatrolPoint.loadAlgSubtypeName(algSubtypeMap);
+            String patrolPointCode = basedataPatrolPoint.getPatrolPointCode();
+            basedataPatrolPoint.setPointTypeName("摄像机");
+            if(StringUtils.isNotEmpty(patrolPointCode) && patrolPointCode.contains("|")) {
+                patrolPointCode = patrolPointCode.substring(0, patrolPointCode.indexOf("|"));
+                String pointTypeName = deviceTypeDictMap.getOrDefault(patrolPointCode, "未知设备类型");
+                basedataPatrolPoint.setPointTypeName(pointTypeName);
+            }
+        }
         logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
         return pointList;
     }
@@ -149,11 +162,40 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
             algSubtypeMap.put(item.getAlgSubtypeId() + "", item.getAlgSubtypeName());
         });
         logger.info("[META] algSubtypeMap: {}", algSubtypeMap);
-        pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
+//        pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
+        Map<String, String> deviceTypeDictMap = getDeviceTypeDictMap();
+        for (BasedataPatrolPoint basedataPatrolPoint : pointList) {
+            basedataPatrolPoint.loadAlgSubtypeName(algSubtypeMap);
+            String patrolPointCode = basedataPatrolPoint.getPatrolPointCode();
+            basedataPatrolPoint.setPointTypeName("摄像机");
+            if(StringUtils.isNotEmpty(patrolPointCode) && patrolPointCode.contains("|")) {
+                patrolPointCode = patrolPointCode.substring(0, patrolPointCode.indexOf("|"));
+                String pointTypeName = deviceTypeDictMap.getOrDefault(patrolPointCode, "未知设备类型");
+                basedataPatrolPoint.setPointTypeName(pointTypeName);
+            }
+        }
         logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
         return pointList;
     }
 
+    /**
+     * 查询设备类型字典（point_device_type）并转换为 Map
+     */
+    private Map<String, String> getDeviceTypeDictMap() {
+        Map<String, String> dictMap = new HashMap<>();
+        try {
+            List<SysDictData> dictDatas = basedataPatrolpointMapper.selectDictDataByType("point_device_type");
+            if (dictDatas != null) {
+                dictMap = dictDatas.stream()
+                        .collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
+            }
+        } catch (Exception e) {
+            logger.error("查询字典 point_device_type 失败", e);
+        }
+        return dictMap;
+    }
+
+
     public BasedataPatrolPoint insertBasedataPatrolPoint(BasedataPatrolPoint basedataPatrolpoint) {
         basedataPatrolpoint.setCreateTime(DateUtils.getNowDate());
         int resId = basedataPatrolpointMapper.insertBasedataPatrolPoint(basedataPatrolpoint);

inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml

@@ -38,6 +38,22 @@
         <result property="meterType" column="meter_type"/>
     </resultMap>
 
+    <resultMap type="com.inspect.system.base.domain.SysDictData" id="SysDictDataResult">
+        <id property="dictCode" column="dict_code"/>
+        <result property="dictSort" column="dict_sort"/>
+        <result property="dictLabel" column="dict_label"/>
+        <result property="dictValue" column="dict_value"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="cssClass" column="css_class"/>
+        <result property="listClass" column="list_class"/>
+        <result property="isDefault" column="is_default"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
     <sql id="selectBasedataPatrolPointVo">
         select patrol_point_id,
                patrol_point_code,
@@ -542,5 +558,21 @@
             <if test="patroldeviceCode != null ">and bec.channel_code   = #{patroldeviceCode}</if>
         </where>
     </select>
+    <select id="selectDictDataByType" resultMap="SysDictDataResult">
+        select dict_code,
+               dict_sort,
+               dict_label,
+               dict_value,
+               dict_type,
+               css_class,
+               list_class,
+               is_default,
+               status,
+               create_by,
+               create_time,
+               remark
+        from sys_dict_data
+        where status = '0' and dict_type = #{dictType} order by dict_sort asc
+    </select>
 
 </mapper>