From 6df4074c59d1933cb7a1b36a25b00f67c7159ebb Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 21 Mar 2025 14:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E5=8A=9F=E8=83=BDbug?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majornetwork/impl/MonitorServiceImpl.java | 52 ++++++++++++------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 4a61f016f..e4e601138 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -263,7 +263,9 @@ public class MonitorServiceImpl extends ServiceImpl impl List generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId, busIds)); Map mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId, Function.identity())); - + List powerIds = temList.stream().map(Monitor::getPowerrId).distinct().collect(Collectors.toList()); + List statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper().in(StatationStat::getPowerId,powerIds)); + Map 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 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 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 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 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 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 impl continue; } - } else { + }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 impl } else { if (Objects.isNull(lineBak)) { + + lineBakMapper.delete(new LambdaQueryWrapper().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);