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 subTypeDOList; private BasedataThresholdModification subTypeDO; - public void loadAlgSubtypeName(Map algSubtypeMap) { + public void loadAlgSubtypeName1(Map 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 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 selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) { List 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"> - +