From cfebca28157857805a36608a3f67ffe9c9d115b9 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 11 Nov 2024 11:22:54 +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=20=E2=80=94=E2=80=94=E3=80=8B=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataGenderTaskServiceImpl.java | 159 +++++++----------- 1 file changed, 59 insertions(+), 100 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 0a97b35..278a28c 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 @@ -288,28 +288,19 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 拉力传感器数据--拉力、设备电量 String laliDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"createTime\":1730967555000,\"dataTime\":" + timestampInMilliseconds +"," + "\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\",\"updateTime\":1730967555000,\"id\":3323," + - "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"},{\"createTime\":1730967586000," + - "\"dataTime\":"+ timestampInMilliseconds +",\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\"," + - "\"updateTime\":1730967586000,\"id\":3324,\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"152\"," + - "\"capacity\":\"88\"}],\"type\":\"pull\"}"; + "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"}],\"type\":\"pull\"}"; // 倾角传感器--X轴、Y轴、Z轴、设备电量 String qjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"angleX\":\"88\",\"angleY\":\"2\",\"angleZ\":\"6\"," + "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967554000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + "\"capacity\":\"0.8\",\"createTime\":1730967554000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"},{\"angleX\":\"89\",\"angleY\":\"6\",\"angleZ\":\"7\"," + - "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967586000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + - "\"capacity\":\"0.8\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3339,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 String outDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + - "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + - "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + - "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + - "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + "\"type\":\"environmental\"}"; // 智能手环 @@ -327,18 +318,21 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 有限空间 String yxkjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + - "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + - "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + - "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" + + "],\"type\":\"limited\"}"; + +// String yxkjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + +// "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + +// "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + +// "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; // 基础沉降 String jccjDataString = "{\"edgeId\":\"UN2394845JH\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + - "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + - "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + - "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + - "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; + "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}" + + "],\"type\":\"settle\"}"; String deviceListDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"deviceAlarmState\":\"0\",\"deviceType\":\"settle\"," + "\"deviceFailureState\":\"0\",\"bangdingState\":\"1\",\"deviceOnlineState\":\"0\",\"remark\":\"请注意:此设备由成都挖掘机制造厂生成,其质量NO.1\"," + @@ -510,28 +504,19 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 拉力传感器数据--拉力、设备电量 String laliDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"createTime\":1730967555000,\"dataTime\":" + timestampInMilliseconds +"," + "\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\",\"updateTime\":1730967555000,\"id\":3323," + - "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"},{\"createTime\":1730967586000," + - "\"dataTime\":"+ timestampInMilliseconds +",\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\"," + - "\"updateTime\":1730967586000,\"id\":3324,\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"152\"," + - "\"capacity\":\"88\"}],\"type\":\"pull\"}"; + "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"}],\"type\":\"pull\"}"; // 倾角传感器--X轴、Y轴、Z轴、设备电量 String qjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"angleX\":\"88\",\"angleY\":\"2\",\"angleZ\":\"6\"," + "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967554000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + "\"capacity\":\"0.8\",\"createTime\":1730967554000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"},{\"angleX\":\"89\",\"angleY\":\"6\",\"angleZ\":\"7\"," + - "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967586000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + - "\"capacity\":\"0.8\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3339,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 String outDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + - "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + - "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + - "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + - "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + "\"type\":\"environmental\"}"; // 智能手环 @@ -549,18 +534,14 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 有限空间 String yxkjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + - "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + - "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + - "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" + + "],\"type\":\"limited\"}"; // 基础沉降 String jccjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + - "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + - "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + - "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + - "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; + "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}" + + "],\"type\":\"settle\"}"; // 设备集合数据JSON字符串 String deviceListDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"deviceAlarmState\":\"0\",\"deviceType\":\"settle\"," + @@ -733,28 +714,19 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 拉力传感器数据--拉力、设备电量 String laliDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"createTime\":1730967555000,\"dataTime\":" + timestampInMilliseconds +"," + "\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\",\"updateTime\":1730967555000,\"id\":3323," + - "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"},{\"createTime\":1730967586000," + - "\"dataTime\":"+ timestampInMilliseconds +",\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\"," + - "\"updateTime\":1730967586000,\"id\":3324,\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"152\"," + - "\"capacity\":\"88\"}],\"type\":\"pull\"}"; + "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"}],\"type\":\"pull\"}"; // 倾角传感器--X轴、Y轴、Z轴、设备电量 String qjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"angleX\":\"88\",\"angleY\":\"2\",\"angleZ\":\"6\"," + "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967554000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + "\"capacity\":\"0.8\",\"createTime\":1730967554000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"},{\"angleX\":\"89\",\"angleY\":\"6\",\"angleZ\":\"7\"," + - "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967586000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + - "\"capacity\":\"0.8\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3339,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 String outDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + - "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + - "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + - "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + - "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + "\"type\":\"environmental\"}"; // 智能手环 @@ -772,18 +744,21 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 有限空间 String yxkjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + - "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + - "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + - "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" + + "],\"type\":\"limited\"}"; // 基础沉降 String jccjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + - "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + - "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + - "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + - "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; + "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}" + + "],\"type\":\"settle\"}"; + +// String jccjDataStringV3 = "{\"edgeId\":\"UN2394845JHV3\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + +// "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + +// "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + +// "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + +// "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + +// "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; // 设备集合数据JSON字符串 String deviceListDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"deviceAlarmState\":\"0\",\"deviceType\":\"settle\"," + @@ -956,28 +931,19 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 拉力传感器数据--拉力、设备电量 String laliDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"createTime\":1730967555000,\"dataTime\":" + timestampInMilliseconds +"," + "\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\",\"updateTime\":1730967555000,\"id\":3323," + - "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"},{\"createTime\":1730967586000," + - "\"dataTime\":"+ timestampInMilliseconds +",\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\"," + - "\"updateTime\":1730967586000,\"id\":3324,\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"152\"," + - "\"capacity\":\"88\"}],\"type\":\"pull\"}"; + "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"}],\"type\":\"pull\"}"; // 倾角传感器--X轴、Y轴、Z轴、设备电量 String qjDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"angleX\":\"88\",\"angleY\":\"2\",\"angleZ\":\"6\"," + "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967554000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + "\"capacity\":\"0.8\",\"createTime\":1730967554000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"},{\"angleX\":\"89\",\"angleY\":\"6\",\"angleZ\":\"7\"," + - "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967586000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + - "\"capacity\":\"0.8\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3339,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 String outDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + - "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + - "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + - "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + - "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + "\"type\":\"environmental\"}"; // 智能手环 @@ -995,18 +961,14 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 有限空间 String yxkjDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + - "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + - "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + - "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" + + "],\"type\":\"limited\"}"; // 基础沉降 String jccjDataStringV4 = "{\"edgeId\":\"UN2394845JHV4\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + - "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + - "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + - "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + - "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; + "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}" + + "],\"type\":\"settle\"}"; // 设备集合数据JSON字符串 @@ -1180,28 +1142,29 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 拉力传感器数据--拉力、设备电量 String laliDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"createTime\":1730967555000,\"dataTime\":" + timestampInMilliseconds +"," + "\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\",\"updateTime\":1730967555000,\"id\":3323," + - "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"},{\"createTime\":1730967586000," + - "\"dataTime\":"+ timestampInMilliseconds +",\"alarmThreshold\":\"10\",\"model\":\"pull_monitoringpull_monitoring\"," + - "\"updateTime\":1730967586000,\"id\":3324,\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"152\"," + - "\"capacity\":\"88\"}],\"type\":\"pull\"}"; + "\"delFlag\":\"0\",\"deviceId\":\"21\",\"tractionData\":\"123\",\"capacity\":\"88\"}],\"type\":\"pull\"}"; // 倾角传感器--X轴、Y轴、Z轴、设备电量 String qjDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"angleX\":\"88\",\"angleY\":\"2\",\"angleZ\":\"6\"," + "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967554000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + "\"capacity\":\"0.8\",\"createTime\":1730967554000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"},{\"angleX\":\"89\",\"angleY\":\"6\",\"angleZ\":\"7\"," + - "\"data\":\"0\",\"alarmThreshold\":\"0.2\",\"updateTime\":1730967586000,\"delFlag\":\"0\",\"deviceId\":\"18\"," + - "\"capacity\":\"0.8\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"model\":\"angle_monitoring\"," + - "\"id\":3339,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + "\"id\":3338,\"serviceId\":\"a121\",\"nodeId\":\"111\"}],\"type\":\"angles\"}"; + + // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 +// String outDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + +// "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + +// "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + +// "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + +// "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + +// "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + +// "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + +// "\"type\":\"environmental\"}"; // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 String outDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"grain50\":\"611\",\"pm10\":\"35\",\"windForce\":\"0.5\"," + "\"updateTime\":1730967555000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\",\"airTemperature\":\"25\"," + "\"pm25\":\"13\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"29\",\"humidity\":\"62\"," + - "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"},{\"grain50\":\"799\",\"pm10\":\"33\"," + - "\"windForce\":\"0.5\",\"updateTime\":1730967586000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"4\"," + - "\"airTemperature\":\"28\",\"pm25\":\"15\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\"38\"," + - "\"humidity\":\"70\",\"model\":\"environmental_monitoring\",\"id\":3336,\"windDirection\":\"西北风\"}]," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + "\"type\":\"environmental\"}"; // 智能手环 @@ -1219,18 +1182,14 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { // 有限空间 String yxkjDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"hydrothion\":\"0\",\"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\"}," + - "{\"hydrothion\":\"0\",\"mid\":\"1\",\"updateTime\":1730967586000,\"carbonMonoxide\":\"0\",\"delFlag\":\"0\"," + - "\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"7\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +"," + - "\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3328,\"oxygen\":\"21\"}],\"type\":\"limited\"}"; + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\"0\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\"24\"}" + + "],\"type\":\"limited\"}"; // 基础沉降 String jccjDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + - "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}," + - "{\"isConcrete\":\"0\",\"createTime\":1730967586000,\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\"," + - "\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\",\"updateTime\":1730967586000,\"id\":3338,\"delFlag\":\"0\"," + - "\"realSubsideData\":\"2\",\"deviceId\":\"1\"}],\"type\":\"settle\"}"; + "\"updateTime\":1730967555000,\"id\":3337,\"delFlag\":\"0\",\"realSubsideData\":\"2\",\"deviceId\":\"1\"}" + + "],\"type\":\"settle\"}"; try { System.out.println("当前时间:" + System.currentTimeMillis() + " 定时任务执行开始");