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 e5fa165ad..a7077fc14 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 @@ -404,7 +404,7 @@ public class MonitorServiceImpl extends ServiceImpl impl //校验同一单位下面不能有同名1类监测点 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Monitor::getName, monitorParam.getName()) - .eq(Monitor::getOrgId, monitorParam.getOrgId()) + .eq(Monitor::getPowerrId, monitorParam.getPowerrId()) .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); if (update) { diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index a554b67f3..02bf9c8e8 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -22,9 +22,9 @@ public enum DicDataTypeEnum { DEV_LEVEL("终端等级","Dev_Level"), DEV_CONNECT("接线方式","Dev_Connect"), DEV_MANUFACTURER("制造厂商","Dev_Manufacturers"), - //电压等级用于pq不区分交直流 + //电压等级用于pms区分交直流 DEV_VOLTAGE("电压等级","Dev_Voltage"), - //标准电压等级用于pms区分交直流 + //标准电压等级用于pq不区分交直流 DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"), EVENT_REASON("暂降原因","Event_Reason"), EVENT_TYPE("暂降类型","Event_Type"),