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

河北功能bug调整

Browse Source
This commit is contained in:
chendaofei
2025-03-21 14:35:37 +08:00
parent 2c3f04fc82
commit 6df4074c59
1 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -263,7 +263,9 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
List<GeneratrixWire> generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper<GeneratrixWire>().in(GeneratrixWire::getId, busIds));
Map<String, GeneratrixWire> mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId, Function.identity()));
List<String> powerIds = temList.stream().map(Monitor::getPowerrId).distinct().collect(Collectors.toList());
List<StatationStat> statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper<StatationStat>().in(StatationStat::getPowerId,powerIds));
Map<String,StatationStat> statMap = statationStatList.stream().collect(Collectors.toMap(StatationStat::getPowerId,Function.identity()));
temList = temList.stream().peek(item -> {
if (mapTerminal.containsKey(item.getTerminalId())) {
@@ -271,7 +273,9 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
item.setDevIp(mapTerminal.get(item.getTerminalId()).getIp());
}
if (statMap.containsKey(item.getPowerrId())) {
item.setMidStation(statMap.get(item.getPowerrId()).getMidStationId());
}
if (mapBus.containsKey(item.getLineId())) {
item.setBusId(mapBus.get(item.getLineId()).getMidBusId());
@@ -1498,16 +1502,10 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
deviceBakMapper.insert(deviceBakPO);
terminalMapper.updateById(pmsTerminalPO);
devId = pmsTerminal.getId();
} else if (Objects.isNull(pmsTerminal)) {
terminalMapper.deleteById(deviceBak.getId());
pmsTerminalPO.setId(deviceBak.getId());
terminalMapper.insert(pmsTerminalPO);
devId = pmsTerminalPO.getId();
} else {
devId = pmsTerminal.getId();
devId = deviceBak.getId();
pmsTerminalPO.setId(devId);
terminalMapper.updateById(pmsTerminalPO);
}
}
@@ -1622,7 +1620,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测点运行状态不存在，请确认后重试"));
continue;
}
monitorPO.setPutDate(oracleTerminalExcel.getLoginTime());
monitorPO.setMonitorType(monitorType.getId());
monitorPO.setStandShortCapacity(oracleTerminalExcel.getStandardCapacity());
monitorPO.setMinShortCircuitCapacity(oracleTerminalExcel.getShortCapacity());
@@ -1650,7 +1648,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "冶炼负荷字典监测标签不存在，请确认后重试"));
continue;
}
} else if (oracleTerminalExcel.getLoadType().equals("商业/市政/民用/电子通讯负荷")) {
} else if (oracleTerminalExcel.getLoadType().equals("商业/市政/民用/电子通讯负荷")|| "电动汽车充电站".equals(oracleTerminalExcel.getLoadType()) ||"轨道交通".equals(oracleTerminalExcel.getLoadType())) {
if (objTypeDicMap.containsKey("城市商业")) {
String objTypeId = objTypeDicMap.get("城市商业").getId();
monitorPO.setMonitorTag(objTypeId);
@@ -1673,7 +1671,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
String objTypeId = objTypeDicMap.get("主变高压侧").getId();
monitorPO.setMonitorTag(objTypeId);
} else {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测标签不存在，请确认后重试"));
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "主变高压侧字典监测标签不存在，请确认后重试"));
continue;
}
} else if (oracleTerminalExcel.getLoadType().equals("跨省计量关口")) {
@@ -1694,12 +1692,30 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
continue;
}
}else if (oracleTerminalExcel.getLoadType().equals("风电场")) {
if (objTypeDicMap.containsKey("陆上风电")) {
String objTypeId = objTypeDicMap.get("陆上风电").getId();
monitorPO.setMonitorTag(objTypeId);
} else {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "风电场字典监测标签不存在，请确认后重试"));
continue;
}
}else if (oracleTerminalExcel.getLoadType().equals("其他发电厂")) {
if (objTypeDicMap.containsKey("其他电源")) {
String objTypeId = objTypeDicMap.get("其他电源").getId();
monitorPO.setMonitorTag(objTypeId);
} else {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "其他电源监测标签不存在，请确认后重试"));
continue;
}
} else {
if (objTypeDicMap.containsKey(oracleTerminalExcel.getLoadType())) {
String objTypeId = objTypeDicMap.get(oracleTerminalExcel.getLoadType()).getId();
monitorPO.setMonitorTag(objTypeId);
} else {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测标签不存在，请确认后重试"));
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getLoadType()+"字典监测标签不存在，请确认后重试"));
continue;
}
}
@@ -1784,16 +1800,14 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
} else {
if (Objects.isNull(lineBak)) {
lineBakMapper.delete(new LambdaQueryWrapper<LineBak>().eq(LineBak::getId,monitor.getId()));
LineBak lineBakPO = new LineBak();
lineBakPO.setId(monitor.getId());
lineBakPO.setLineId(oracleTerminalExcel.getId());
System.out.println(oracleTerminalExcel.getId());
lineBakMapper.insert(lineBakPO);
monitorMapper.updateById(monitorPO);
} else if (Objects.isNull(monitor)) {
monitorPO.setIsUpToGrid(0);
monitorMapper.deleteById(lineBak.getId());
monitorPO.setId(lineBak.getId());
monitorMapper.insert(monitorPO);
} else {
monitorPO.setId(lineBak.getId());
monitorMapper.updateById(monitorPO);