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

增加新能源场站信息返回

Browse Source
This commit is contained in:
wr
2025-04-30 14:34:39 +08:00
parent bca9e4bf4b
commit 274707181b
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/TerminalGetBase.java
View File

@@ -21,6 +21,12 @@ public class TerminalGetBase {
*/
private String ledgerId;
/**
* 新能源场站id（用户id）
*/
private String objId;
private String lineId;
@Data

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
View File

@@ -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

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -1163,6 +1163,7 @@
SELECT
pq_line.id pointId,
lineDetail.Time_Interval timeInterval,
lineDetail.obj_Id objId,
dev.id devId,
device.com_flag
FROM

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
View File

@@ -146,8 +146,9 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<String> 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);