pms台账bug提交,台账日志操作
This commit is contained in:
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -63,6 +64,8 @@ public class PwRmpEventDetailServiceImpl implements PwRmpEventDetailService {
|
|||||||
if (CollectionUtil.isEmpty(pwPmsMonitorDTOList)) {
|
if (CollectionUtil.isEmpty(pwPmsMonitorDTOList)) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 获取配网暂态事件明细
|
// 获取配网暂态事件明细
|
||||||
List<RmpEventDetailPO> rmpEventDetailsPO = pwRmpEventDetailMapper.getPwRmpEventDetail(param,
|
List<RmpEventDetailPO> rmpEventDetailsPO = pwRmpEventDetailMapper.getPwRmpEventDetail(param,
|
||||||
pwPmsMonitorDTOList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()));
|
pwPmsMonitorDTOList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()));
|
||||||
@@ -72,7 +75,7 @@ public class PwRmpEventDetailServiceImpl implements PwRmpEventDetailService {
|
|||||||
// 查询检测点类型字典
|
// 查询检测点类型字典
|
||||||
List<DictData> lineSortList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData();
|
List<DictData> lineSortList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData();
|
||||||
// 将单位信息转为map集合 key: 单位id value: 单位实体
|
// 将单位信息转为map集合 key: 单位id value: 单位实体
|
||||||
Map<String, PwPmsMonitorDTO> pwPmsMonitorDTOMap = pwPmsMonitorDTOList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, PwPmsMonitorDTO -> PwPmsMonitorDTO));
|
Map<String, PwPmsMonitorDTO> pwPmsMonitorDTOMap = pwPmsMonitorDTOList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, PwPmsMonitorDTO -> PwPmsMonitorDTO, (oldValue, newValue) -> oldValue));
|
||||||
// 属性赋值
|
// 属性赋值
|
||||||
return rmpEventDetailsPO.stream().map(po -> {
|
return rmpEventDetailsPO.stream().map(po -> {
|
||||||
PwRmpEventDetailVO vo = new PwRmpEventDetailVO();
|
PwRmpEventDetailVO vo = new PwRmpEventDetailVO();
|
||||||
@@ -109,4 +112,4 @@ public class PwRmpEventDetailServiceImpl implements PwRmpEventDetailService {
|
|||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user