diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java index 864f48e9a..c8d662af2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -148,20 +148,22 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl idList = other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); + pqTypicalSourceCreatePO.setIndustryType("05"); } if(CollectionUtils.isEmpty(tempList)){ return; - }else { - //不需要赋值电站等级 - if (mapVoltage.containsKey(tempList.get(0).getVoltageLevel())) { -// pqTypicalSourceCreatePO.setVoltageLevel(String.format("%02d", mapVoltage.get(tempList.get(0).getVoltageLevel()).getAlgoDescribe())); - //默认给05 - pqTypicalSourceCreatePO.setIndustryType("05"); - } - } +// else { +// //不需要赋值电站等级 +// if (mapVoltage.containsKey(tempList.get(0).getVoltageLevel())) { +// pqTypicalSourceCreatePO.setVoltageLevel(String.format("%02d", mapVoltage.get(tempList.get(0).getVoltageLevel()).getAlgoDescribe())); +// //默认给05 +// pqTypicalSourceCreatePO.setIndustryType("05"); +// } +// +// } List monitorIds = tempList.stream().map(Monitor::getId).collect(Collectors.toList()); //站内有效监测点数量 Integer effectiveMonitorNum;