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} GROUP BY tddr.id + limit 13 @@ -167,8 +168,8 @@