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:
雨木c
2023-05-16 11:11:54 +08:00
parent a8d0a6a89c b1eab1086a
commit 3ef1a93dc1
2 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
View File

@@ -42,10 +42,6 @@ public class PmsMonitorBaseDTO implements Serializable {
*/ */
private String terminalId; private String terminalId;
/***
* 母线ID
*/
private String generatrixId;
/*** /***
* 监测线路名称 * 监测线路名称

13
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
View File

@@ -192,6 +192,7 @@
</select> </select>
<select id="statisticMonitor" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO"> <select id="statisticMonitor" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
SELECT SELECT
pm.Id,
COUNT(pm.Id) AS statistics, COUNT(pm.Id) AS statistics,
pm.Voltage_Level AS name pm.Voltage_Level AS name
FROM pms_monitor pm FROM pms_monitor pm
@@ -199,17 +200,21 @@
<foreach item="item" collection="list" separator="," open="(" close=")"> <foreach item="item" collection="list" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
GROUP BY pm.Voltage_Level GROUP BY
pm.Id,
pm.Voltage_Level
</select> </select>
<select id="statisticTerminal" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO"> <select id="statisticTerminal" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
SELECT SELECT
COUNT(t.Terminal_Id) as statistics, COUNT(t.Terminal_Id) statistics,
t.Voltage_Level as name t.Voltage_Level name
FROM FROM
( SELECT ( SELECT
DISTINCT pm.Terminal_Id, DISTINCT pm.Terminal_Id,
pm.Voltage_Level pss.Voltage_Level
FROM pms_monitor pm FROM pms_monitor pm
INNER JOIN pms_terminal pt on pt.Id=pm.Terminal_Id
INNER JOIN pms_statation_stat pss on pss.Power_Id=pt.Power_Station_Id
WHERE pm.Terminal_Id IN WHERE pm.Terminal_Id IN
<foreach item="item" collection="list" separator="," open="(" close=")"> <foreach item="item" collection="list" separator="," open="(" close=")">
#{item} #{item}