From 313f36430ed5c7b78a89e70fd9d26291a4f39ee4 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Sat, 23 Nov 2024 16:59:26 +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.5s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataGenderTaskServiceImpl.java | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 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 47ff3db..16aa94a 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 @@ -60,6 +60,33 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { .setAuditUser(1L).setAuditUserName("王义").setAuditTime(now).setDevStatus(0).setStatusTime(now); tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecord); + TbBdRecord tbBdRecordV8 = new TbBdRecord(); + tbBdRecordV8.setId(8L).setDepartId(1L).setDepartName("安徽淮北项目部").setProId(25L).setProName("淮北220kv线路工程") + .setRelUser("王义").setRelPhone("15555146892").setDelFlag(0).setAuditStatus(1) + .setRemarks("黄山市").setCreateTime(now).setCreateUser(2L).setAuditUser(3L).setAuditTime(now); + tbBdRecordMapper.replaceInto(tbBdRecordV8); + + TbBdDeviceRecord tbBdDeviceRecordV8 = new TbBdDeviceRecord(); + tbBdDeviceRecordV8.setId(1L).setRecordId(1L).setDevName("大源物联感知边代捌设备").setDevCode("UN2394845JHV8").setUnitName("安徽淮北项目部") + .setAreaName("安徽省").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(25L) + .setAuditUser(3L).setAuditUserName("肖杰").setAuditTime(now).setDevStatus(1).setStatusTime(now); + tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecordV8); + + TbBdRecord tbBdRecordV9 = new TbBdRecord(); + tbBdRecordV9.setId(9L).setDepartId(1L).setDepartName("安徽淮北项目部").setProId(25L).setProName("淮北220kv线路工程") + .setRelUser("王义").setRelPhone("15555146892").setDelFlag(0).setAuditStatus(1) + .setRemarks("黄山市").setCreateTime(now).setCreateUser(2L).setAuditUser(3L).setAuditTime(now); + tbBdRecordMapper.replaceInto(tbBdRecordV9); + + TbBdDeviceRecord tbBdDeviceRecordV9 = new TbBdDeviceRecord(); + tbBdDeviceRecordV9.setId(9L).setRecordId(9L).setDevName("大源物联感知边代玖号设备").setDevCode("UN2394845JHV9").setUnitName("安徽淮北项目部") + .setAreaName("安徽省").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(25L) + .setAuditUser(3L).setAuditUserName("肖杰").setAuditTime(now).setDevStatus(1).setStatusTime(now); + tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecordV9); + + + // ------------------------------------------------------------------------------ + TbBdRecord tbBdRecordV2 = new TbBdRecord(); tbBdRecordV2.setId(2L).setDepartId(2L).setDepartName("金上湖北线路项目部").setProId(26L).setProName("金上湖北线路工程") .setRelUser("刘强").setRelPhone("15555146123").setDelFlag(0).setAuditStatus(1) @@ -108,29 +135,31 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { .setAuditUser(1L).setAuditUserName("王义").setAuditTime(now).setDevStatus(0).setStatusTime(now); tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecordV5); + TbBdRecord tbBdRecordV6 = new TbBdRecord(); - tbBdRecordV6.setId(6L).setDepartId(6L).setDepartName("陕西省公司变电项目部").setProId(30L).setProName("西安雁塔220kv变电工程") + tbBdRecordV6.setId(6L).setDepartId(6L).setDepartName("陕西省公司变电项目部").setProId(25L).setProName("西安雁塔220kv变电工程") .setRelUser("王义").setRelPhone("15555146892").setDelFlag(0).setAuditStatus(1) .setRemarks("黄山市").setCreateTime(now).setCreateUser(2L).setAuditUser(3L).setAuditTime(now); tbBdRecordMapper.replaceInto(tbBdRecordV6); TbBdDeviceRecord tbBdDeviceRecordV6 = new TbBdDeviceRecord(); tbBdDeviceRecordV6.setId(6L).setRecordId(6L).setDevName("XIAN物联感知边代陆设备").setDevCode("UN2394845JHV6").setUnitName("陕西省公司变电项目部") - .setAreaName("西安市").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(30L) + .setAreaName("西安市").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(25L) .setAuditUser(3L).setAuditUserName("肖杰").setAuditTime(now).setDevStatus(1).setStatusTime(now); tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecordV6); TbBdRecord tbBdRecordV7 = new TbBdRecord(); - tbBdRecordV7.setId(7L).setDepartId(7L).setDepartName("陕西省公司变电项目部").setProId(30L).setProName("西安雁塔220kv变电工程") + tbBdRecordV7.setId(7L).setDepartId(7L).setDepartName("陕西省公司变电项目部").setProId(25L).setProName("西安雁塔220kv变电工程") .setRelUser("王义").setRelPhone("15555146892").setDelFlag(0).setAuditStatus(1) .setRemarks("黄山市").setCreateTime(now).setCreateUser(2L).setAuditUser(3L).setAuditTime(now); tbBdRecordMapper.replaceInto(tbBdRecordV7); TbBdDeviceRecord tbBdDeviceRecordV7 = new TbBdDeviceRecord(); tbBdDeviceRecordV7.setId(7L).setRecordId(7L).setDevName("西安物联感知边代柒号设备").setDevCode("UN2394845JHV7").setUnitName("陕西省公司变电项目部") - .setAreaName("西安市").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(30L) + .setAreaName("西安市").setDevUser("肖杰").setDevUserPhone("18855526623").setProId(25L) .setAuditUser(3L).setAuditUserName("肖杰").setAuditTime(now).setDevStatus(1).setStatusTime(now); tbBdDeviceRecordMapper.replaceInto(tbBdDeviceRecordV7); + } catch (Exception e) { System.err.println("初始化保底数据任务执行异常！" + e.getMessage()); throw new RuntimeException(e); @@ -563,6 +592,18 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" + "],\"type\":\"limited\"}"; + // 有限空间 + String yxkjDataStringV8 = "{\"edgeId\":\"UN2394845JHV8\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," + + "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"8\",\"createTime\":1730967555000," + + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" + + "],\"type\":\"limited\"}"; + + // 有限空间 + String yxkjDataStringV9 = "{\"edgeId\":\"UN2394845JHV9\",\"list\":[{\"hydrothion\":\""+ RandomUtil.randomInt(10,20) +"\",\"mid\":\"1\",\"updateTime\":1730967555000," + + "\"carbonMonoxide\":\"1\",\"delFlag\":\"0\",\"type\":\"CMD_REPORTDAT\",\"deviceId\":\"9\",\"createTime\":1730967555000," + + "\"dataTime\":"+ timestampInMilliseconds +",\"combustibleGas\":\""+ RandomUtil.randomInt(10,20) +"\",\"model\":\"limited_monitoring\",\"id\":3327,\"oxygen\":\""+ RandomUtil.randomInt(10,50) +"\"}" + + "],\"type\":\"limited\"}"; + // 基础沉降 String jccjDataStringV2 = "{\"edgeId\":\"UN2394845JHV2\",\"list\":[{\"isConcrete\":\"0\",\"createTime\":1730967555000," + "\"dataTime\":"+ timestampInMilliseconds +",\"subsideData\":\"871\",\"accSubsideData\":\"871\",\"model\":\"settle_monitoring\"," + @@ -1193,6 +1234,20 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西南风\"}]," + "\"type\":\"environmental\"}"; + // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 + String outDataStringV8 = "{\"edgeId\":\"UN2394845JHV8\",\"list\":[{\"grain50\":\"611\",\"pm10\":\""+ RandomUtil.randomInt(10,50) + "\",\"windForce\":\""+ RandomUtil.randomDouble(0.1,0.9, 1, RoundingMode.UP) +"\"," + + "\"updateTime\":1730967585000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"8\",\"airTemperature\":\""+ RandomUtil.randomInt(11,28) +"\"," + + "\"pm25\":\""+ RandomUtil.randomInt(10,50) +"\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\""+ RandomUtil.randomInt(10,50) +"\",\"humidity\":\""+ RandomUtil.randomInt(20,95) +"\"," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"东南风\"}]," + + "\"type\":\"environmental\"}"; + + // 室外环境监测--温度、湿度、风速、风向、设备电量、PM2.5、PM10 + String outDataStringV9 = "{\"edgeId\":\"UN2394845JHV9\",\"list\":[{\"grain50\":\"852\",\"pm10\":\""+ RandomUtil.randomInt(10,50) + "\",\"windForce\":\""+ RandomUtil.randomDouble(0.1,0.9, 1, RoundingMode.UP) +"\"," + + "\"updateTime\":1730567585000,\"pressure\":\"89\",\"delFlag\":\"0\",\"deviceId\":\"9\",\"airTemperature\":\""+ RandomUtil.randomInt(11,28) +"\"," + + "\"pm25\":\""+ RandomUtil.randomInt(10,50) +"\",\"createTime\":1730967555000,\"dataTime\":"+ timestampInMilliseconds +",\"noise\":\""+ RandomUtil.randomInt(10,50) +"\",\"humidity\":\""+ RandomUtil.randomInt(20,95) +"\"," + + "\"model\":\"environmental_monitoring\",\"id\":3335,\"windDirection\":\"西北风\"}]," + + "\"type\":\"environmental\"}"; + // 智能手环 String znshDataStringV5 = "{\"edgeId\":\"UN2394845JHV5\",\"list\":[{\"altitude\":\"200\",\"heartRateValue\":\"90\",\"idCard\":\"1\"," + "\"latitude\":\"111.11\",\"mid\":\"1\",\"updateTime\":1730967554000,\"pressure\":\"980\",\"bloodPressureValue\":\"120/70\"," + @@ -1238,6 +1293,8 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { remoteDataService.uploadYxkjData(yxkjDataStringV3, SecurityConstants.INNER); remoteDataService.uploadYxkjData(yxkjDataStringV4, SecurityConstants.INNER); remoteDataService.uploadYxkjData(yxkjDataStringV5, SecurityConstants.INNER); + remoteDataService.uploadYxkjData(yxkjDataStringV8, SecurityConstants.INNER); + remoteDataService.uploadYxkjData(yxkjDataStringV9, SecurityConstants.INNER); remoteDataService.uploadZnshData(znshDataString, SecurityConstants.INNER); remoteDataService.uploadZnshData(znshDataStringV2, SecurityConstants.INNER); @@ -1250,6 +1307,8 @@ public class DataGenderTaskServiceImpl implements CommandLineRunner { remoteDataService.uploadSwHjData(outDataStringV3, SecurityConstants.INNER); remoteDataService.uploadSwHjData(outDataStringV4, SecurityConstants.INNER); remoteDataService.uploadSwHjData(outDataStringV5, SecurityConstants.INNER); + remoteDataService.uploadSwHjData(outDataStringV8, SecurityConstants.INNER); + remoteDataService.uploadSwHjData(outDataStringV9, SecurityConstants.INNER); remoteDataService.uploadLlCgqData(laliDataString, SecurityConstants.INNER); remoteDataService.uploadLlCgqData(laliDataStringV2, SecurityConstants.INNER);