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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chendaofei
2025-03-26 08:39:41 +08:00
parent f8e88b87d0 6ee4da4422
commit a5be610a6a
7 changed files with 196 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1802,7 +1802,7 @@
line.Name name,
pq_line_detail.Num lineNo,
s1.Name voltageLevel,
pq_line_detail.PT_Phase_Type ptType,
pq_line_detail.PT_Type ptType,
pq_line_detail.Run_Flag status
FROM
pq_line_detail

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

@@ -17,8 +17,8 @@
pq_device_process.process_no processNo,
pq_device.Dev_Key devKey
FROM
pq_node
LEFT JOIN pq_device ON pq_node.Id = pq_device.Node_Id
pq_device
LEFT JOIN pq_node ON pq_node.Id = pq_device.Node_Id
LEFT JOIN pq_line on pq_device.id = pq_line.id
LEFT JOIN pq_device_process on pq_device_process.id = pq_device.id
LEFT JOIN sys_dict_data s1 ON pq_device.Dev_Type = s1.id