From 99eff7d3d2bee1332ab18d7e2d7bb5d71032800c Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 14 Mar 2025 16:02:38 +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 --- .../com/njcn/device/pms/pojo/po/Monitor.java | 8 +- .../majornetwork/impl/MonitorServiceImpl.java | 475 +++++++++--------- .../impl/PwRMpBenchmarkLevelMServiceImpl.java | 11 + .../impl/RStatPwPermeabilityMServiceImpl.java | 4 + .../impl/RStatOrgMServiceImpl.java | 4 +- .../src/main/resources/bootstrap.yml | 4 + .../com/njcn/prepare/ExecutionCenter.java | 2 +- .../mysql/Impl/line/IntegrityServiceImpl.java | 7 - .../hbPushGw/UploadGwMainMonitorRunner.java | 2 +- 9 files changed, 256 insertions(+), 261 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 3811c28ce..12528b1bd 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -72,10 +72,15 @@ public class Monitor extends BaseEntity { private String lineName; /** - * 监测线路ID + * 监测母线 */ private String lineId; + /** + * 监测线路号 + */ + private Integer lineNum; + /** * 中台母线ID */ @@ -190,7 +195,6 @@ public class Monitor extends BaseEntity { * 监测终端接线方式(字典) */ private String terminalWiringMethod; - /** * 是否是上送国网监测点,0-否 1-是 */ 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 881101bc9..4a61f016f 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 @@ -1309,37 +1309,38 @@ public class MonitorServiceImpl extends ServiceImpl impl } + // 初始化字典数据的通用方法 + private Map initDictData(DicDataTypeEnum type) { + return dicDataFeignClient.getDicDataByTypeCode(type.getCode()).getData() + .stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + } + + private String dealData(List oracleTerminalExcelList) { List oracleTerminalExcelMsg = new ArrayList<>(); List allDept = deptFeignClient.getDeptDescendantIndexes(deptFeignClient.getRootDept().getData().getId(), Stream.of(0, 1, 2).collect(Collectors.toList())).getData(); Map mapDept = allDept.stream().collect(Collectors.toMap(DeptDTO::getName, Function.identity())); - List voltageLevelDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); - Map voltageLevelMap = voltageLevelDic.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + Map voltageLevelMap = initDictData(DicDataTypeEnum.DEV_VOLTAGE); //装置型号 - List devTypelDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_TYPE.getCode()).getData(); - Map devTypelDicMap = devTypelDic.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); - - //装置类别 - DictData devCategoryDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_CATEGORY.getName(), DicDataEnum.Monitor_Terminals.getName()).getData(); + Map devTypelDicMap = initDictData(DicDataTypeEnum.DEV_TYPE); //装置状态 - List devStatelDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_STATUS.getCode()).getData(); - Map devStateDicMap = devStatelDic.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + Map devStateDicMap = initDictData(DicDataTypeEnum.DEV_STATUS); //监测点状态 - List monitorStatelDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map monitorStateDicMap = monitorStatelDic.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + Map monitorStateDicMap = initDictData(DicDataTypeEnum.LINE_STATE); //监测点标签 - List objTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.MONITORING_LABELS.getCode()).getData(); - Map objTypeDicMap = objTypeList.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + Map objTypeDicMap = initDictData(DicDataTypeEnum.MONITORING_LABELS); //装置厂家 - List manList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_MANUFACTURER.getCode()).getData(); - Map manDicMap = manList.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); + Map manDicMap = initDictData(DicDataTypeEnum.DEV_MANUFACTURER); + + //接线方式 + Map wireListMap = initDictData(DicDataTypeEnum.DEV_CONNECT); //装作等级 DictData devGrade = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_GRADE.getName(), DicDataEnum.MOST_IMPORMENT.getName()).getData(); @@ -1350,30 +1351,27 @@ public class MonitorServiceImpl extends ServiceImpl impl //监测点类型 DictData monitorType = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_TYPE.getName(), DicDataEnum.Power_Supply_Point.getName()).getData(); - //接线方式 - List wireList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_CONNECT.getCode()).getData(); - Map wireListMap = wireList.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); - DictData potentialDic = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.Cap_V.getCode(),DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData(); DictData neutralDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.Neutral_Point.getName(), DicDataEnum.Ground_Res.getName()).getData(); + //装置类别 + DictData devCategoryDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_CATEGORY.getName(), DicDataEnum.Monitor_Terminals.getName()).getData(); - List businessType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BUSINESS_TYPE.getCode()).getData(); - Map businessDicMap = businessType.stream().collect(Collectors.toMap(DictData::getName, Function.identity())); - - - //TODO 零时处理 + //对象类型 List dicTree = dictTreeFeignClient.queryAll().getData(); dicTree = dicTree.stream().filter(item->item.getCode()!="Device_Unit" && !item.getCode().contains("@")).collect(Collectors.toList()); Map objTypeMap = dicTree.stream().collect(Collectors.toMap(SysDicTreePO::getName,Function.identity())); + + for (OracleTerminalExcel oracleTerminalExcel : oracleTerminalExcelList) { + //单位 - if(oracleTerminalExcel.getGdName().equals("省检修")){ + if (oracleTerminalExcel.getGdName().equals("省检修")) { oracleTerminalExcel.setGdName("国网河北超高压公司本部"); - }else { - oracleTerminalExcel.setGdName("国网"+oracleTerminalExcel.getGdName()+"本部"); + } else { + oracleTerminalExcel.setGdName("国网" + oracleTerminalExcel.getGdName() + "本部"); } if (!mapDept.containsKey(oracleTerminalExcel.getGdName())) { @@ -1383,7 +1381,6 @@ public class MonitorServiceImpl extends ServiceImpl impl //判断是否操作过该条记录 LineBak lineBak = lineBakMapper.selectOne(new LambdaQueryWrapper().eq(LineBak::getLineId, oracleTerminalExcel.getId())); - DeviceBak deviceBak = deviceBakMapper.selectOne(new LambdaQueryWrapper().eq(DeviceBak::getDevId, oracleTerminalExcel.getDeviceId())); @@ -1452,14 +1449,6 @@ public class MonitorServiceImpl extends ServiceImpl impl continue; } - - /* if (devTypelDicMap.containsKey(oracleTerminalExcel.getDevType())) { - pmsTerminalPO.setTerminalState(devTypelDicMap.get(oracleTerminalExcel.getDevType()).getId()); - } else { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典终端状态不存在，请确认后重试")); - continue; - }*/ - //终端状态 String devState = null; switch (oracleTerminalExcel.getRunFlag()) { @@ -1530,8 +1519,6 @@ public class MonitorServiceImpl extends ServiceImpl impl GeneratrixWire generatrixWire = generatrixWireMapper.selectOne(generatrixWireLambdaQueryWrapper); String lineId = null, lineName = null, genScale = null; - - GeneratrixWire generatrixWirePO = new GeneratrixWire(); generatrixWirePO.setGeneratrixName(oracleTerminalExcel.getSubvName()); generatrixWirePO.setStatus(DataStateEnum.ENABLE.getCode()); @@ -1557,7 +1544,7 @@ public class MonitorServiceImpl extends ServiceImpl impl } else { generatrixWirePO.setId(generatrixWire.getId()); generatrixWireMapper.updateById(generatrixWirePO); - lineId = generatrixWire.getId(); + lineId = generatrixWirePO.getId(); lineName = generatrixWirePO.getName(); genScale = generatrixWirePO.getScale(); } @@ -1566,224 +1553,217 @@ public class MonitorServiceImpl extends ServiceImpl impl LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); monitorLambdaQueryWrapper.eq(Monitor::getLineId, lineId) .eq(Monitor::getName, oracleTerminalExcel.getLineName()); - List monitorList = monitorMapper.selectList(monitorLambdaQueryWrapper); - - if(CollUtil.isNotEmpty(monitorList)) { - - for (Monitor monitor : monitorList) { - - //当前电站下面没有监测点，可以新增 - Monitor monitorPO = new Monitor(); - - String monitorId = "04"; - String one = ""; - if (deptDTO.getName().contains("石家庄")) { - one = "01"; - } else if (deptDTO.getName().contains("邯郸")) { - one = "02"; - } else if (deptDTO.getName().contains("保定")) { - one = "03"; - } else if (deptDTO.getName().contains("沧州")) { - one = "04"; - } else if (deptDTO.getName().contains("邢台")) { - one = "05"; - } else if (deptDTO.getName().contains("衡水")) { - one = "06"; - } else if (deptDTO.getName().contains("超高压")) { - one = "07"; - } else { - one = "3.14159"; - } - - String last = String.format("M%05d", oracleTerminalExcel.getId()); - - monitorPO.setMonitorId(monitorId + one + last); + Monitor monitor = monitorMapper.selectOne(monitorLambdaQueryWrapper); - monitorPO.setName(oracleTerminalExcel.getLineName()); - monitorPO.setPowerrName(stationName); - monitorPO.setPowerrId(stationId); - monitorPO.setOperationName(deptDTO.getName()); - monitorPO.setOperationId(deptDTO.getCode()); - monitorPO.setOrgName(deptDTO.getName()); - monitorPO.setOrgId(deptDTO.getCode()); - monitorPO.setLineName(lineName); - monitorPO.setLineId(lineId); - monitorPO.setVoltageLevel(genScale); - monitorPO.setIsUploadHead(0); - monitorPO.setMonitorOverlimitStatus(0); - monitorPO.setMonitorOverlimitStatus(0); + //当前电站下面没有监测点，可以新增 + Monitor monitorPO = new Monitor(); - String monitorState = null; - switch (oracleTerminalExcel.getRunFlag()) { - case 0: - monitorState = DicDataEnum.RUN.getName(); - break; - case 1: - monitorState = DicDataEnum.DEBUGGING.getName(); - break; - case 2: - monitorState = DicDataEnum.DECOMMISSIONING.getName(); - break; - default: - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测点状态不存在，请确认后重试")); - break; - - } - if (monitorStateDicMap.containsKey(monitorState)) { - monitorPO.setMonitorState(monitorStateDicMap.get(monitorState).getId()); - } else { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测点运行状态不存在，请确认后重试")); - continue; - } - - monitorPO.setMonitorType(monitorType.getId()); - monitorPO.setStandShortCapacity(oracleTerminalExcel.getStandardCapacity()); - monitorPO.setMinShortCircuitCapacity(oracleTerminalExcel.getShortCapacity()); - monitorPO.setUserAgreementCapacity(oracleTerminalExcel.getDealCapacity()); - monitorPO.setPowerSupplyEqCapacity(oracleTerminalExcel.getDevCapacity()); - DictData scale = dicDataFeignClient.getDicDataById(monitorPO.getVoltageLevel()).getData(); - Overlimit overlimitTem = new Overlimit(); - COverlimitUtil.voltageDeviation(overlimitTem, Float.parseFloat(scale.getValue())); - monitorPO.setVoltageDeviationLowerLimit(overlimitTem.getUvoltageDev()); - monitorPO.setVoltageDeviationUpperLimit(overlimitTem.getVoltageDev()); - monitorPO.setPotentialTransFormerType(potentialDic.getId()); - monitorPO.setNeutralGroundingMode(neutralDic.getId()); - monitorPO.setStatisticalInterval(oracleTerminalExcel.getTimeInterval()); - monitorPO.setTerminalId(devId); - monitorPO.setIsSpecialSupplyElectricity(0); - - monitorPO.setMonitorObjectName(oracleTerminalExcel.getObjName()); - - - if (oracleTerminalExcel.getLoadType().equals("电加热负荷") ||oracleTerminalExcel.getLoadType().equals("轧机") || 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 (oracleTerminalExcel.getLoadType().equals("半导体制造") || 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("二类变电站") || oracleTerminalExcel.getLoadType().equals("三类变电站") || 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(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, "字典监测标签不存在，请确认后重试")); - continue; - } - } - - - //监测点对象类型 - - if (objTypeMap.containsKey(oracleTerminalExcel.getLoadType())) { - String objTypeId = objTypeMap.get(oracleTerminalExcel.getLoadType()).getId(); - monitorPO.setObjType(objTypeId); - }else if(oracleTerminalExcel.getLoadType().equals("电加热负荷")){ - String objTypeId = objTypeMap.get("电加热负荷（含电弧炉、中频炉、电热炉、单/多晶硅生产设备）").getId(); - monitorPO.setObjType(objTypeId); - } else { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getLoadType() + "字典监测点对象类型不存在，请确认后重试")); - continue; - } - - //行业类型 - /* if (businessDicMap.containsKey(oracleTerminalExcel.getBusinessType())) { - String busTypeId = businessDicMap.get(oracleTerminalExcel.getBusinessType()).getId(); - monitorPO.setTradeCode(busTypeId); + String monitorId = "04"; + String one = ""; + if (deptDTO.getName().contains("石家庄")) { + one = "01"; + } else if (deptDTO.getName().contains("邯郸")) { + one = "02"; + } else if (deptDTO.getName().contains("保定")) { + one = "03"; + } else if (deptDTO.getName().contains("沧州")) { + one = "04"; + } else if (deptDTO.getName().contains("邢台")) { + one = "05"; + } else if (deptDTO.getName().contains("衡水")) { + one = "06"; + } else if (deptDTO.getName().contains("超高压")) { + one = "07"; + } else if (deptDTO.getName().contains("雄安")) { + one = "08"; } else { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getBusinessType()+"字典行业类型不存在，请确认后重试")); + one = "3.14159"; + } + + String last = String.format("M%05d", oracleTerminalExcel.getId()); + + monitorPO.setMonitorId(monitorId + one + last); + + monitorPO.setLineNum(oracleTerminalExcel.getLineNum()); + monitorPO.setName(oracleTerminalExcel.getLineName()); + monitorPO.setPowerrName(stationName); + monitorPO.setPowerrId(stationId); + monitorPO.setOperationName(deptDTO.getName()); + monitorPO.setOperationId(deptDTO.getCode()); + monitorPO.setOrgName(deptDTO.getName()); + monitorPO.setOrgId(deptDTO.getCode()); + monitorPO.setLineName(lineName); + monitorPO.setLineId(lineId); + monitorPO.setVoltageLevel(genScale); + monitorPO.setIsUploadHead(0); + monitorPO.setMonitorOverlimitStatus(0); + monitorPO.setMonitorOverlimitStatus(0); + + String monitorState = null; + switch (oracleTerminalExcel.getRunFlag()) { + case 0: + monitorState = DicDataEnum.RUN.getName(); + break; + case 1: + monitorState = DicDataEnum.DEBUGGING.getName(); + break; + case 2: + monitorState = DicDataEnum.DECOMMISSIONING.getName(); + break; + default: + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测点状态不存在，请确认后重试")); + break; + + } + if (monitorStateDicMap.containsKey(monitorState)) { + monitorPO.setMonitorState(monitorStateDicMap.get(monitorState).getId()); + } else { + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典监测点运行状态不存在，请确认后重试")); continue; - }*/ + } - //TODO 监测点对象名称 + monitorPO.setMonitorType(monitorType.getId()); + monitorPO.setStandShortCapacity(oracleTerminalExcel.getStandardCapacity()); + monitorPO.setMinShortCircuitCapacity(oracleTerminalExcel.getShortCapacity()); + monitorPO.setUserAgreementCapacity(oracleTerminalExcel.getDealCapacity()); + monitorPO.setPowerSupplyEqCapacity(oracleTerminalExcel.getDevCapacity()); + DictData scale = dicDataFeignClient.getDicDataById(monitorPO.getVoltageLevel()).getData(); + Overlimit overlimitTem = new Overlimit(); + COverlimitUtil.voltageDeviation(overlimitTem, Float.parseFloat(scale.getValue())); + monitorPO.setVoltageDeviationLowerLimit(overlimitTem.getUvoltageDev()); + monitorPO.setVoltageDeviationUpperLimit(overlimitTem.getVoltageDev()); + monitorPO.setPotentialTransFormerType(potentialDic.getId()); + monitorPO.setNeutralGroundingMode(neutralDic.getId()); + monitorPO.setStatisticalInterval(oracleTerminalExcel.getTimeInterval()); + monitorPO.setTerminalId(devId); + monitorPO.setIsSpecialSupplyElectricity(0); + + monitorPO.setMonitorObjectName(oracleTerminalExcel.getObjName()); - String wireMethod = ""; - switch (oracleTerminalExcel.getPtType()) { - case 0: - wireMethod = DicDataEnum.STAR.getName(); - break; - case 1: - wireMethod = DicDataEnum.STAR_TRIANGLE.getName(); - break; - case 2: - wireMethod = DicDataEnum.OPEN_DELTA.getName(); - break; - default: - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试")); - break; - } - if (wireListMap.containsKey(wireMethod)) { - monitorPO.setTerminalWiringMethod(wireListMap.get(wireMethod).getId()); - } else { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试")); - continue; - } + if (oracleTerminalExcel.getLoadType().equals("电加热负荷") || oracleTerminalExcel.getLoadType().equals("轧机") || oracleTerminalExcel.getLoadType().equals("其他非线性负荷")|| 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; + } - monitorPO.setStatus(DataStateEnum.ENABLE.getCode()); - monitorPO.setIsSpecialMonitor(0); - monitorPO.setPt1(oracleTerminalExcel.getPt1()); - monitorPO.setPt2(oracleTerminalExcel.getPt2()); - monitorPO.setCt1(oracleTerminalExcel.getCt1()); - monitorPO.setCt2(oracleTerminalExcel.getCt2()); + } else if (oracleTerminalExcel.getLoadType().equals("半导体制造") || oracleTerminalExcel.getLoadType().equals("精密加工") || oracleTerminalExcel.getLoadType().equals("党政机关")||"敏感/重要/高危用户".equals(oracleTerminalExcel.getLoadType())) { + if (objTypeDicMap.containsKey("敏感用户")) { + String objTypeId = objTypeDicMap.get("敏感用户").getId(); + monitorPO.setMonitorTag(objTypeId); + } else { + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "敏感用户字典监测标签不存在，请确认后重试")); + continue; + } + + } else if (oracleTerminalExcel.getLoadType().equals("二类变电站") || oracleTerminalExcel.getLoadType().equals("三类变电站") || 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 (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, "字典监测标签不存在，请确认后重试")); + continue; + } + } - if (oracleTerminalExcel.getLoadType().equals("光伏电站") || oracleTerminalExcel.getLoadType().equals("风电场")) { - monitorPO.setFieldStation("01"); - } + //监测点对象类型 + if (objTypeMap.containsKey(oracleTerminalExcel.getLoadType())) { + String objTypeId = objTypeMap.get(oracleTerminalExcel.getLoadType()).getId(); + monitorPO.setObjType(objTypeId); + } else if (oracleTerminalExcel.getLoadType().equals("电加热负荷")) { + String objTypeId = objTypeMap.get("电加热负荷（含电弧炉、中频炉、电热炉、单/多晶硅生产设备）").getId(); + monitorPO.setObjType(objTypeId); + } else if (oracleTerminalExcel.getLoadType().equals("变频调速负荷")) { + String objTypeId = objTypeMap.get("变频调速负荷（变频电机、变频水泵等）").getId(); + monitorPO.setObjType(objTypeId); + } else if (oracleTerminalExcel.getLoadType().equals("敏感/重要/高危用户")) { + String objTypeId = objTypeMap.get("敏感/重要/高危用户").getId(); + monitorPO.setObjType(objTypeId); + } else { + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getLoadType() + "字典监测点对象类型不存在，请确认后重试")); + continue; + } - if (oracleTerminalExcel.getPowerFlag() == 0) { - monitorPO.setPowerFlag("101"); - } else if (oracleTerminalExcel.getPowerFlag() == 1) { - monitorPO.setPowerFlag("102"); - } + //TODO 监测点对象名称 + String wireMethod = ""; + switch (oracleTerminalExcel.getPtType()) { + case 0: + wireMethod = DicDataEnum.STAR.getName(); + break; + case 1: + wireMethod = DicDataEnum.STAR_TRIANGLE.getName(); + break; + case 2: + wireMethod = DicDataEnum.OPEN_DELTA.getName(); + break; + default: + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试")); + break; + } + if (wireListMap.containsKey(wireMethod)) { + monitorPO.setTerminalWiringMethod(wireListMap.get(wireMethod).getId()); + } else { + oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试")); + continue; + } + + monitorPO.setStatus(DataStateEnum.ENABLE.getCode()); + monitorPO.setIsSpecialMonitor(0); + monitorPO.setPt1(oracleTerminalExcel.getPt1()); + monitorPO.setPt2(oracleTerminalExcel.getPt2()); + monitorPO.setCt1(oracleTerminalExcel.getCt1()); + monitorPO.setCt2(oracleTerminalExcel.getCt2()); + + + if (oracleTerminalExcel.getLoadType().equals("光伏电站") || oracleTerminalExcel.getLoadType().equals("风电场")) { + monitorPO.setFieldStation("01"); + } + + if (oracleTerminalExcel.getPowerFlag() == 0) { + monitorPO.setPowerFlag("101"); + } else if (oracleTerminalExcel.getPowerFlag() == 1) { + monitorPO.setPowerFlag("102"); + } if (Objects.isNull(lineBak) && Objects.isNull(monitor)) { monitorPO.setIsUpToGrid(0); @@ -1801,6 +1781,7 @@ public class MonitorServiceImpl extends ServiceImpl impl lineBakPO.setId(monitorPO.getId()); lineBakPO.setLineId(oracleTerminalExcel.getId()); lineBakMapper.insert(lineBakPO); + } else { if (Objects.isNull(lineBak)) { LineBak lineBakPO = new LineBak(); @@ -1818,6 +1799,7 @@ public class MonitorServiceImpl extends ServiceImpl impl monitorMapper.updateById(monitorPO); } + Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0); overlimit.setId(monitorPO.getId()); Overlimit overlimitRes = overlimitMapper.selectById(monitorPO.getId()); @@ -1828,13 +1810,10 @@ public class MonitorServiceImpl extends ServiceImpl impl } } - } - - } - } + if (CollectionUtil.isNotEmpty(oracleTerminalExcelMsg)) { ExcelUtil.exportExcel("失败列表.xlsx", OracleTerminalExcel.OracleTerminalExcelMsg.class, oracleTerminalExcelMsg); return null; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java index 3d74a22b2..90574a0c2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java @@ -16,6 +16,10 @@ import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; import com.njcn.harmonic.service.distribution.PwRMpBenchmarkLevelMService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -26,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author jianghf @@ -43,6 +48,8 @@ public class PwRMpBenchmarkLevelMServiceImpl extends ServiceImpl monitorIds = pmsGeneralDeviceInfoClient.getPwPmsMonitorIds(pwPmsMonitorParam).getData(); if (CollUtil.isEmpty(monitorIds)) { return new Page<>(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java index 336875c8d..d612ee10b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java @@ -15,6 +15,7 @@ import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM; import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; import com.njcn.harmonic.service.distribution.RStatPwPermeabilityMService; import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; @@ -24,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 各渗透率光伏台区基准水平 @@ -68,6 +70,8 @@ public class RStatPwPermeabilityMServiceImpl extends ServiceImpl monitorIds = pmsGeneralDeviceInfoClient.getPwPmsMonitorIds(pwPmsMonitorParam).getData(); if (CollUtil.isEmpty(monitorIds)) { return new Page<>(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java index d868a5f83..980a45173 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java @@ -93,7 +93,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl calculatedParam = judgeExecuteParam(baseParam); // 测点索引 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index aa308ec0b..6abd35481 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -86,13 +86,6 @@ public class IntegrityServiceImpl extends MppServiceImpl Objects.equals(item.getPointId(), item2.getLineId())) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java index ab57f8ce4..ab3c820b0 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java @@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; /** - * 用于pms往国网推送公共连接点数据定时任务 + * 主配网监测点 */ @Component @RequiredArgsConstructor