区域报告接口

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

@@ -844,24 +844,21 @@
         (t.statisValue)/t.flowMeal flowProportion
         from (
         SELECT
-        a.id,
-        a.Name name,
+        device.Name name,
         sub.Name substation,
-        a.level,
         m.Time_Id updateTime,
         b.run_flag runFlag,
         b.com_flag comFlag,
-        b.id deviceId,
         ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
         ROUND(ifnull(m.Actual_Value,0)/1024/1024,2) statisValue
-        FROM pq_line a
-        INNER JOIN pq_line sub ON sub.id = a.pid
-        INNER JOIN pq_device b ON a.id = b.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
+        FROM cld_month_flow m
+        INNER JOIN pq_line device ON device.id=m.Dev_Id
+        INNER JOIN pq_device b ON device.id=b.id
+        INNER JOIN pq_line sub ON device.pid = sub.id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        where a.id in
+        where device.id in
         <foreach item="item" collection="devs" separator="," open="(" close=")">
             #{item}
         </foreach>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml

@@ -6,11 +6,11 @@
         SELECT
                 ptm.Time_Id AS time,
                 IFNULL(COUNT(ptm.Dev_Id),3.14159)AS deviceAbnormalNum
-        FROM pq_line line
-        INNER JOIN pq_line vol ON line.pid=vol.id
-        INNER JOIN pq_line device ON vol.pid=device.id
-        LEFT JOIN pqs_top_msg ptm ON ptm.Dev_Id = device.Id
-        LEFT JOIN pq_line_detail pld ON pld.Id=line.Id
+        FROM pqs_top_msg ptm
+        INNER JOIN pq_line device ON ptm.Dev_Id = device.Id
+        INNER JOIN pq_line vol ON vol.pid = device.Id
+        INNER JOIN pq_line line ON line.pid = vol.id
+        INNER JOIN pq_line_detail pld ON pld.Id=line.Id
         WHERE
             ptm.State=1
         AND
@@ -19,7 +19,6 @@
             AND pld.Line_Grade=#{lineGrade}
         </if>
         GROUP BY ptm.Time_Id
-
     </select>
 
     <select id="getTopMsgDetail" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">