From 274707181b70133e6745e3bcaa95a16c21ef1a87 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 30 Apr 2025 14:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E5=9C=BA=E7=AB=99=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java | 6 ++++++ .../com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml | 1 + .../java/com/njcn/device/pq/mapper/mapping/LineMapper.xml | 1 + .../device/pq/service/impl/CommTerminalServiceImpl.java | 5 +++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java index 229312f60..daa0ebecc 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java @@ -21,6 +21,12 @@ public class TerminalGetBase { */ private String ledgerId; + /** + * 新能源场站id（用户id） + */ + private String objId; + + private String lineId; @Data 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 8cdcd92df..155c2fab1 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 @@ -80,6 +80,7 @@ DISTINCT pq_dept_line.id unitId, substation.id ledgerId, + lineDetail.OBJ_ID objId, point.id lineId from pq_dept_line pq_dept_line inner join pq_line point on pq_dept_line.line_id = point.id diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 045511c84..99bce1a9e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1163,6 +1163,7 @@ SELECT pq_line.id pointId, lineDetail.Time_Interval timeInterval, + lineDetail.obj_Id objId, dev.id devId, device.com_flag FROM diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index 5fd51d5a1..7b906b0c5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java @@ -146,8 +146,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { List lineList = new ArrayList<>(); deptIds.forEach(i -> { if (map.containsKey(i)) { - subList.addAll(map.get(i).stream().map(TerminalGetBase::getLedgerId).collect(Collectors.toList())); - lineList.addAll(map.get(i).stream().map(TerminalGetBase::getLineId).collect(Collectors.toList())); + subList.addAll(map.get(i).stream().map(TerminalGetBase::getLedgerId).distinct().collect(Collectors.toList())); + subList.addAll(map.get(i).stream().map(TerminalGetBase::getObjId).distinct().collect(Collectors.toList())); + lineList.addAll(map.get(i).stream().map(TerminalGetBase::getLineId).distinct().collect(Collectors.toList())); } }); deptGetSubStationDTO.setStationIds(subList);