From 669e843d16cb702973db423302decc1c9946310e Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Sat, 6 May 2023 11:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=BC=82=E5=B8=B8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/pojo/po/TopMsgPO.java  |  4 +++
 .../device/pq/mapper/mapping/TopMagMapper.xml |  3 +-
 .../mapping/DeviceAbnormaStatisticsMapper.xml | 35 ++++++++++---------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java
index 9def5ce2f..e1494b59c 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java
@@ -71,6 +71,10 @@ public class TopMsgPO extends BaseEntity {
      */
     private float flowValue;
 
+    private Integer onlineRateFlag;
+
+    private float onlineRateValue;
+
     /**
      * 状态 0.删除 1.正常
      */
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
index 6b6460956..aa9c6ff88 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
@@ -33,7 +33,8 @@
             ptm.Comout_Desc AS comOutDesc,
             ptm.Alarm_Count AS alarmCount,
             ptm.Alarm_Desc AS alarmDesc,
-            ptm.Flow_Value AS flowValue
+            ptm.Flow_Value AS flowValue,
+            ptm.OnlineRate_Value AS onlineRateValue
         FROM pq_line line
         INNER JOIN pq_line vol ON line.pid=vol.id
         INNER JOIN pq_line device ON vol.pid=device.id
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
index e11681d08..c66b9e489 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
@@ -75,25 +75,26 @@
     </select>
 
     <select id="getFlowByDevice" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
-        SELECT t.*,
-        (t.actualValue)/(t.flowMeal) flowProportion
+        SELECT
+            t.*,
+            CONVERT((t.actualValue)/(t.flowMeal)*100,DECIMAL(15,2)) flowProportion
 		FROM
             (
-            SELECT
-                    cmf.Dev_Id deviceId,
-                    DATE_FORMAT(cmf.Time_Id,'%Y-%m') updateTime,
-                    IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) +  IFNULL(d1.flow, 0) flowMeal,
-                    IFNULL(cmf.Actual_Value/1024/1024,0) actualValue
-            FROM  cld_month_flow cmf
-            LEFT JOIN cld_dev_meal c ON cmf.Dev_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 cmf.Dev_Id IN
-                <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            AND
-                DATE_FORMAT(cmf.Time_Id,'%Y-%m') = #{time}
+                SELECT
+                        cmf.Dev_Id deviceId,
+                        DATE_FORMAT(cmf.Time_Id,'%Y-%m') updateTime,
+                        IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) +  IFNULL(d1.flow, 0) flowMeal,
+                        IFNULL(cmf.Actual_Value/1024/1024,0) actualValue
+                FROM  cld_month_flow cmf
+                LEFT JOIN cld_dev_meal c ON cmf.Dev_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 cmf.Dev_Id IN
+                    <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                AND
+                    DATE_FORMAT(cmf.Time_Id,'%Y-%m') = #{time}
             ) t
         ORDER BY flowProportion DESC
     </select>