From e8b14dcd5e46d7fc4781b5739cf1f5616f895b40 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 21 Nov 2024 10:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E4=BB=A3=E5=86=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEV3.0s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DataGenderTaskServiceImpl.java       | 20 +++++++++----------
 .../base/screen/TbDeviceDataRecordMapper.xml  | 14 +++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/DataGenderTaskServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/DataGenderTaskServiceImpl.java
index bffff8a..6c6f546 100644
--- a/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/DataGenderTaskServiceImpl.java
+++ b/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/DataGenderTaskServiceImpl.java
@@ -318,9 +318,9 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner {
                 "\"longitude\":\"122.22\"}],\"type\":\"heartrate\"}";
 
         // 有限空间
-        String yxkjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
+        String yxkjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," +
                 "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967555000," +
-                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" +
+                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" +
                 "],\"type\":\"limited\"}";
 
 //        String yxkjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
@@ -534,9 +534,9 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner {
                 "\"longitude\":\"122.22\"}],\"type\":\"heartrate\"}";
 
         // 有限空间
-        String yxkjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
+        String yxkjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," +
                 "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967555000," +
-                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" +
+                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" +
                 "],\"type\":\"limited\"}";
 
         // 基础沉降
@@ -744,9 +744,9 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner {
                 "\"longitude\":\"122.22\"}],\"type\":\"heartrate\"}";
 
         // 有限空间
-        String yxkjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
+        String yxkjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," +
                 "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967555000," +
-                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" +
+                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" +
                 "],\"type\":\"limited\"}";
 
         // 基础沉降
@@ -961,9 +961,9 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner {
                 "\"longitude\":\"122.22\"}],\"type\":\"heartrate\"}";
 
         // 有限空间
-        String yxkjDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
+        String yxkjDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," +
                 "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967555000," +
-                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" +
+                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" +
                 "],\"type\":\"limited\"}";
 
         // 基础沉降
@@ -1182,9 +1182,9 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner {
                 "\"longitude\":\"122.22\"}],\"type\":\"heartrate\"}";
 
         // 有限空间
-        String yxkjDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967555000," +
+        String yxkjDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," +
                 "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967555000," +
-                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" +
+                "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" +
                 "],\"type\":\"limited\"}";
 
         // 基础沉降
diff --git a/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml
index 01c3178..649e882 100644
--- a/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml
+++ b/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml
@@ -82,6 +82,7 @@
             and tp.id = #{proId}
         </if>
         GROUP BY tddr.id
+        limit 13
     </select>
 
     <!--    根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息  -->
@@ -167,8 +168,8 @@
 
     <select id="getTowerDevAttributeRecordByDay" resultType="com.bonus.base.basic.entity.DevAttributeVo">
         SELECT
-        tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,tddr.attribute_val as jcValue,
-        tddr.is_warn as isWarn,tddr.create_time as jcTime
+            tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,
+            tddr.attribute_val as jcValue,tddr.is_warn as isWarn,tddr.create_time as jcTime
         FROM tb_dev_data_record AS tddr
         LEFT JOIN tb_device device ON device.id = tddr.dev_id
         LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
@@ -178,12 +179,13 @@
         AND tbdr.pro_id = #{proId} AND tddr.dev_type IN (117, 118)
         ORDER BY
         tddr.create_time DESC
+        LIMIT 1000
     </select>
 
     <select id="getTowerDevAttributeWarnRecord" resultType="com.bonus.base.basic.entity.DevAttributeVo">
         SELECT
-        tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,tddr.attribute_val as jcValue,
-        tddr.is_warn as isWarn,tddr.create_time as jcTime
+            tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,
+            tddr.attribute_val as jcValue,tddr.is_warn as isWarn,tddr.create_time as jcTime
         FROM
         tb_dev_data_record AS tddr
         LEFT JOIN tb_device device ON device.id = tddr.dev_id
@@ -260,7 +262,7 @@
         AND tddr.create_time &lt; CURDATE() + INTERVAL 1 DAY
         AND tbdr.pro_id = #{proId} AND tddr.dev_type = 119
         ORDER BY
-        tddr.create_time DESC
+        tddr.create_time DESC limit 200
     </select>
 
     <select id="getTowerDevAttributeRecordByDeviceId" resultType="com.bonus.base.basic.entity.DevAttributeVo">
@@ -279,7 +281,7 @@
                 AND sub.create_time >= tddr.create_time
             ) &lt;= 10
         ORDER BY
-            tddr.attribute_name, tddr.create_time DESC;
+            tddr.attribute_name, tddr.create_time DESC limit 200;
     </select>
 </mapper>