From 5ba93f799e7f123c50c20b22cb0bf351a45893f3 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Sat, 6 May 2023 16:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java | 2 +-
 .../device/pq/controller/OperationContrController.java     | 2 +-
 .../com/njcn/device/pq/mapper/mapping/TopMagMapper.xml     | 7 ++++---
 3 files changed, 6 insertions(+), 5 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 45db2c2e6..595b0d588 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
@@ -49,7 +49,7 @@ public class TopMsgPO extends BaseEntity {
     /**
      * 数据完整性
      */
-    private Integer integrityValue;
+    private Float integrityValue;
 
     /**
      * 告警次数
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
index edaf1d204..fc63dcac4 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
@@ -152,7 +152,7 @@ public class OperationContrController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getDailyDeviceAbnormal")
-    @ApiOperation("获取终端异常")
+    @ApiOperation("获取终端异常详情列表")
     @ApiImplicitParam(name = "conditionBusinessParam", value = "实体", required = true)
     public HttpResult<List<TopMsgPO>> dailyDeviceAbnormal(@RequestBody DeviceInfoParam.BusinessParam conditionBusinessParam) {
         String methodDescribe = getMethodDescribe("dailyDeviceAbnormal");
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 0bd118339..b79cdc13a 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
@@ -19,6 +19,7 @@
             AND pld.Line_Grade=#{lineGrade}
         </if>
         GROUP BY ptm.Time_Id
+        ORDER BY ptm.Time_Id DESC
     </select>
 
     <select id="dailyDeviceAbnormal" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
@@ -27,15 +28,15 @@
             city.Name AS cityName,
             sub.Name AS subName,
             device.Name AS deviceName,
-            ptm.Integrity_Value AS integrityValue,
+            CAST(ptm.Integrity_Value as DECIMAL(13,2)) AS integrityValue,
             ptm.Integrity_Flag AS integrityFlag,
             ptm.Comout_Count AS comOutCount,
             ptm.Comout_Desc AS comOutDesc,
             ptm.Alarm_Count AS alarmCount,
             ptm.Alarm_Desc AS alarmDesc,
-            ptm.Flow_Value AS flowValue,
+            CAST(ptm.Flow_Value as DECIMAL(13,2)) AS flowValue,
             ptm.OnlineRate_Flag AS onlineRateFlag,
-            ptm.OnlineRate_Value AS onlineRateValue
+            CAST(ptm.OnlineRate_Value as DECIMAL(13,2)) 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