From ab8b70cd714b1b2528e47f5601ed738a882de680 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 20 Nov 2023 14:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=8E=8B=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ledgerManger/impl/CommTerminalServiceImpl.java | 3 ++- .../com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 91cfa0c49..9ca8a7bb1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -153,7 +153,8 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineDevGetDTO.setType(1); lineDevGetDTO.setLineType(1); lineDevGetDTO.setLineTag(it.getMonitorTag()); - lineDevGetDTO.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue()); + //预处理模块需要的id修改value为id + lineDevGetDTO.setVoltageLevel(it.getVoltageLevel()); lineList.add(lineDevGetDTO); }); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index d95d38eca..39cfe3436 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -26,7 +26,7 @@ point.id pointId, lineDetail.Time_Interval as `interval`, lineDetail.load_type lineTag, - dic.value voltageLevel, + dic.id voltageLevel, dev.id devId, device.com_flag comFlag, 1 as lineType, @@ -36,7 +36,7 @@ DISTINCT pq_dept_line.id unitId, - dic.value voltageLevel, + dic.id voltageLevel, voltage.id pointId, point.id devId @@ -45,7 +45,7 @@ DISTINCT pq_dept_line.id unitId, dev.id devId, - dic.value voltageLevel, + dic.id voltageLevel, 1 as type , device.update_time, device.Com_Flag as comFlag