From dfa8b6e75133d2ec1d8118a19df1db5b4c1ae1bb Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Fri, 21 Apr 2023 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/mapper/mapping/LineMapper.xml   | 63 +++++++++++--------
 .../pq/service/impl/LineServiceImpl.java      |  7 +--
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index a97da5c46..f6bfce23f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -840,33 +840,44 @@
     </select>
 
     <select id="getNewDeviceFlowStatistics" resultType="LineFlowMealDetailVO">
-        select t.*,
-        (t.statisValue)/t.flowMeal flowProportion
-        from (
         SELECT
-        device.Name name,
-        sub.Name substation,
-        device.Update_Time updateTime,
-        b.run_flag runFlag,
-        b.com_flag comFlag,
-        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 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 device.id in
-        <foreach item="item" collection="devs" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        and
-            m.Time_Id between #{startTime} and #{endTime}
-        and
-            b.Run_Flag != 2
-        ) t ORDER BY flowProportion DESC
+        ANY_VALUE(t.ID) id,
+        ANY_VALUE(t.name) name,
+        ANY_VALUE(t.substation) substation,
+        ANY_VALUE(t.updateTime) updateTime,
+        ANY_VALUE(t.runFlag) runFlag,
+        ANY_VALUE(t.comFlag)  comFlag,
+        ANY_VALUE(t.flowMeal)  flowMeal,
+        SUM(t.statisValue) statisValue,
+        ROUND(SUM(t.statisValue)/flowMeal,2) flowProportion
+        from (
+                SELECT
+                device.id id,
+                device.Name name,
+                sub.Name substation,
+                device.Update_Time updateTime,
+                b.run_flag runFlag,
+                b.com_flag comFlag,
+                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 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 device.id in
+                <foreach item="item" collection="devs" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                and
+                    m.Time_Id between #{startTime} and #{endTime}
+                and
+                    b.Run_Flag != 2
+        ) t
+        GROUP BY t.id
+        ORDER BY flowProportion DESC
     </select>
 
     <select id="getFlowLineInfoByTableList" resultType="LineFlowMealDetailVO">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index 058359af8..189fe22e8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -379,10 +379,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
     @Override
     public Page<LineFlowMealDetailVO> getNewDeviceRunStatistics(PqsParam deviceInfoParam) {
         List<String> deviceIndexes = new ArrayList<>();
-        Page<LineFlowMealDetailVO> page = new Page();
         List<GeneralDeviceDTO> deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList()));
         deviceInfoList.stream().map(GeneralDeviceDTO::getDeviceIndexes).forEach(deviceIndexes::addAll);
-        page = lineMapper.getNewDeviceFlowStatistics(
+        Page<LineFlowMealDetailVO> page = lineMapper.getNewDeviceFlowStatistics(
                 new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
                 deviceIndexes,
                 DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
@@ -392,12 +391,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
     @Override
     public Page<TopMsgPO> dailyDeviceAbnormalStatistics(PqsParam param) {
-        long start = System.currentTimeMillis();
         Page topMsg = topMsgMapper.getTopMsg(new Page(param.getPageNum(), param.getPageSize()), param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
-        long end = System.currentTimeMillis();
-        System.out.println("====================================");
-        System.out.println(end-start);
         return topMsg;
     }