重新提交

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

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

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

@@ -188,10 +188,11 @@
         ) temp
         WHERE
         a.Monitor_Id = temp.id
-)
-</select>
+        )
+    </select>
     <select id="statisticMonitor" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
         SELECT
+        pm.Id,
         COUNT(pm.Id) AS statistics,
         pm.Voltage_Level AS name
         FROM pms_monitor pm
@@ -199,17 +200,21 @@
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>
-        GROUP BY pm.Voltage_Level
+        GROUP BY
+        pm.Id,
+        pm.Voltage_Level
     </select>
     <select id="statisticTerminal" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
         SELECT
-            COUNT(t.Terminal_Id) as statistics,
-            t.Voltage_Level as name
+        COUNT(t.Terminal_Id) statistics,
+        t.Voltage_Level name
         FROM
         (   SELECT
         DISTINCT pm.Terminal_Id,
-                    pm.Voltage_Level
+        pss.Voltage_Level
         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
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}