Browse Source

fix:点位配置算法回显问题

master
wangguangyuan 8 months ago
parent
commit
f1116fb281
4 changed files with 15 additions and 3 deletions
  1. +1
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java
  2. +11
    -1
      inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java
  3. +2
    -1
      inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java
  4. +1
    -1
      inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml

+ 1
- 0
inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java View File

@ -112,6 +112,7 @@ public class BasedataPatrolPointController extends BaseController {
basedataPatrolPoint2.setDeviceTypeId(basedataPatrolPoint.getDeviceTypeId()); basedataPatrolPoint2.setDeviceTypeId(basedataPatrolPoint.getDeviceTypeId());
basedataPatrolPoint2.setPatrolTypeId(basedataPatrolPoint.getPatrolTypeId()); basedataPatrolPoint2.setPatrolTypeId(basedataPatrolPoint.getPatrolTypeId());
basedataPatrolPoint2.setPointImptLevel(basedataPatrolPoint.getPointImptLevel()); basedataPatrolPoint2.setPointImptLevel(basedataPatrolPoint.getPointImptLevel());
basedataPatrolPoint2.setAlgSubtypeName(basedataPatrolPoint.getAlgSubtypeName());
listEx.add(basedataPatrolPoint2); listEx.add(basedataPatrolPoint2);
} }
return getDataTable(listEx); return getDataTable(listEx);


+ 11
- 1
inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java View File

@ -8,6 +8,7 @@ import com.inspect.base.core.web.domain.BaseEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -105,7 +106,7 @@ public class BasedataPatrolPoint extends BaseEntity {
private List<BasedataThresholdModification> subTypeDOList; private List<BasedataThresholdModification> subTypeDOList;
private BasedataThresholdModification subTypeDO; private BasedataThresholdModification subTypeDO;
public void loadAlgSubtypeName(Map<String, String> algSubtypeMap) {
public void loadAlgSubtypeName1(Map<String, String> algSubtypeMap) {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if (!StringUtils.isEmpty(this.algSubtypeIds)) { if (!StringUtils.isEmpty(this.algSubtypeIds)) {
String[] var3 = this.algSubtypeIds.split(","); 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 @Override
public String toString() { public String toString() {
return "BasedataPatrolPoint{" + return "BasedataPatrolPoint{" +


+ 2
- 1
inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java View File

@ -79,7 +79,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
public List<BasedataPatrolPoint> selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) { public List<BasedataPatrolPoint> selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) {
List<BasedataPatrolPoint> pointList = basedataPatrolpointMapper.selectBasedataMonitorList(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()) { if (null != basedataPatrolpoint.getDeviceId()) {
BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId()); BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId());
if(basedataDevice != null) { if(basedataDevice != null) {
@ -108,6 +108,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
}); });
logger.info("[META] algSubtypeMap: {}", algSubtypeMap); logger.info("[META] algSubtypeMap: {}", algSubtypeMap);
pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap)); pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
return pointList; return pointList;
} }


+ 1
- 1
inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointMapper"> <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="patrolPointId" column="patrol_point_id"/>
<result property="patrolPointCode" column="patrol_point_code"/> <result property="patrolPointCode" column="patrol_point_code"/>
<result property="patrolPointName" column="patrol_point_name"/> <result property="patrolPointName" column="patrol_point_name"/>


Loading…
Cancel
Save