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 badc0d8..62ea886 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 @@ -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()); 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 78923fa..5d4c100 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 @@ -107,6 +107,8 @@ public class BasedataPatrolPoint extends BaseEntity { private List 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 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 + '\'' + '}'; } } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointMapper.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointMapper.java index 5765ec8..62bc0e2 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointMapper.java +++ b/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 patrolPointIds); + + List selectDictDataByType(String point_device_type); } \ No newline at end of file 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 9f9782e..e7c99fd 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 @@ -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 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 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 getDeviceTypeDictMap() { + Map dictMap = new HashMap<>(); + try { + List 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); diff --git a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml index bdc58ec..b25cc7d 100644 --- a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml @@ -38,6 +38,22 @@ + + + + + + + + + + + + + + + + select patrol_point_id, patrol_point_code, @@ -542,5 +558,21 @@ and bec.channel_code = #{patroldeviceCode} + \ No newline at end of file