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

pms pq代码调整

Browse Source
This commit is contained in:
雨木c
2023-06-07 13:27:15 +08:00
parent 22c09b7cfe
commit 0a0cd748d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
//校验同一单位下面不能有同名1类监测点 //校验同一单位下面不能有同名1类监测点
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Monitor::getName, monitorParam.getName()) lambdaQueryWrapper.eq(Monitor::getName, monitorParam.getName())
.eq(Monitor::getOrgId, monitorParam.getOrgId()) .eq(Monitor::getPowerrId, monitorParam.getPowerrId())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
if (update) { if (update) {

4
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
View File

@@ -22,9 +22,9 @@ public enum DicDataTypeEnum {
DEV_LEVEL("终端等级","Dev_Level"), DEV_LEVEL("终端等级","Dev_Level"),
DEV_CONNECT("接线方式","Dev_Connect"), DEV_CONNECT("接线方式","Dev_Connect"),
DEV_MANUFACTURER("制造厂商","Dev_Manufacturers"), DEV_MANUFACTURER("制造厂商","Dev_Manufacturers"),
//电压等级用于pq不区分交直流 //电压等级用于pms区分交直流
DEV_VOLTAGE("电压等级","Dev_Voltage"), DEV_VOLTAGE("电压等级","Dev_Voltage"),
//标准电压等级用于pms区分交直流 //标准电压等级用于pq不区分交直流
DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"), DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"),
EVENT_REASON("暂降原因","Event_Reason"), EVENT_REASON("暂降原因","Event_Reason"),
EVENT_TYPE("暂降类型","Event_Type"), EVENT_TYPE("暂降类型","Event_Type"),