Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.解决变电站经纬度问题

Browse Source 
2.优化全景地图电压展示
This commit is contained in:
wr
2025-05-07 16:16:58 +08:00
parent df1f744a7d
commit 6b9026d427
5 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
View File

@@ -70,9 +70,16 @@ public class GridDiagramServiceImpl implements GridDiagramService {
public GridDiagramVO getGridDiagramMonitor(GridDiagramParam param) { public GridDiagramVO getGridDiagramMonitor(GridDiagramParam param) {
//获取电压等级 //获取电压等级
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
List<String> voltageIds;
//获取电压等级550 220 110 35 //获取电压等级550 220 110 35
List<String> voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); if(CollUtil.isNotEmpty(v)){
List<String> vName = v.stream().map(DictData::getName).collect(Collectors.toList());
voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
}else{
voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
}
GridDiagramVO gridDiagramVO = new GridDiagramVO(); GridDiagramVO gridDiagramVO = new GridDiagramVO();
@@ -236,9 +243,16 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//获取电压等级 //获取电压等级
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
List<String> voltageIds;
//获取电压等级550 220 110 35 //获取电压等级550 220 110 35
List<String> voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList()); if(CollUtil.isNotEmpty(v)){
List<String> vName = v.stream().map(DictData::getName).collect(Collectors.toList());
voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
}else{
voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
}
GridDiagramVO gridDiagramVO = new GridDiagramVO(); GridDiagramVO gridDiagramVO = new GridDiagramVO();
List<GridDiagramVO.LineStatistics> info = new ArrayList<>(); List<GridDiagramVO.LineStatistics> info = new ArrayList<>();

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -890,7 +890,29 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
@Override @Override
public List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex, String searchValue, Integer comFlag) { public List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex, String searchValue, Integer comFlag) {
return this.baseMapper.getBaseLineAreaInfo(lineIndex, searchValue, comFlag); List<AreaLineInfoVO> resList = this.baseMapper.getBaseLineAreaInfo(lineIndex, searchValue, comFlag);
List<String> userIds = resList.stream().filter(x -> StrUtil.isNotBlank(x.getObjId())).map(AreaLineInfoVO::getObjId).collect(Collectors.toList());
Map<String, NewUserReportVO> userReportVOMap = new HashMap<>();
if (CollUtil.isNotEmpty(userIds)) {
List<NewUserReportVO> data = userLedgerFeignClient.getUserReportByIds(userIds).getData();
if (CollUtil.isNotEmpty(data)) {
userReportVOMap = data.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity()));
}
}
NewUserReportVO newUserReportVO;
for (AreaLineInfoVO areaLineInfoVO : resList) {
if(StrUtil.isNotBlank(areaLineInfoVO.getObjId())){
if(userReportVOMap.containsKey(areaLineInfoVO.getObjId())){
newUserReportVO = userReportVOMap.get(areaLineInfoVO.getObjId());
areaLineInfoVO.setSubId(newUserReportVO.getId());
areaLineInfoVO.setSubName(newUserReportVO.getProjectName());
areaLineInfoVO.setLat(newUserReportVO.getLatitude());
areaLineInfoVO.setLng(newUserReportVO.getLongitude());
}
}
}
return resList;
} }
@Override @Override

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
View File

@@ -39,9 +39,7 @@ import java.util.stream.Stream;
public class AreaInfoServiceImpl implements AreaInfoService { public class AreaInfoServiceImpl implements AreaInfoService {
private final GeneralDeviceInfoClient generalDeviceInfoClient; private final GeneralDeviceInfoClient generalDeviceInfoClient;
private final LineFeignClient lineFeignClient; private final LineFeignClient lineFeignClient;
private final EventDetailService eventDetailService; private final EventDetailService eventDetailService;
@Override @Override

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
View File

@@ -53,13 +53,16 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
//获取电压等级 //获取电压等级
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
List<String> voltageIds;
//获取电压等级550 220 110 35 //获取电压等级550 220 110 35
List<String> voltageIds = dictDataList.stream().filter(item -> if(CollUtil.isNotEmpty(v)){
Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || List<String> vName = v.stream().map(DictData::getName).collect(Collectors.toList());
Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || }else{
Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode()) voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
}
GridDiagramVO gridDiagramVO = new GridDiagramVO(); GridDiagramVO gridDiagramVO = new GridDiagramVO();

1
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
View File

@@ -31,6 +31,7 @@ public enum DicDataTypeEnum {
DEV_VOLTAGE("电压等级","Dev_Voltage"), DEV_VOLTAGE("电压等级","Dev_Voltage"),
//标准电压等级用于pq不区分交直流 //标准电压等级用于pq不区分交直流
DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"), DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"),
PANORAMIC_VOLTAGE("全景电压等级","Panoramic_voltage"),
EVENT_REASON("暂降原因","Event_Reason"), EVENT_REASON("暂降原因","Event_Reason"),
EVENT_TYPE("暂降类型","Event_Type"), EVENT_TYPE("暂降类型","Event_Type"),
BUSINESS_TYPE("行业类型","Business_Type"), BUSINESS_TYPE("行业类型","Business_Type"),