diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index 0074684..a261156 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -472,7 +472,7 @@ public class BigScreenController { noent.setStationCode(survStationInfo.getStationCode()); noent.setSurvItem(PollutionEnum.dataWaterNo.getCode()); - String deployId = deployMap.get(transdataOrientwaterVo.getDeviceCode()).getId(); + String deployId = deployMap.get(transdataOrientwaterVo.getDeployCode()).getId(); tpent.setValue(transdataOrientwaterVo.getDataWaterTp()); tpent.setDeployId(deployId); @@ -540,7 +540,7 @@ public class BigScreenController { codent.setStationCode(survStationInfo.getStationCode()); codent.setSurvItem(PollutionEnum.dataWaterCod.getCode()); - String deployId = deployMap.get(transdataLivestockwaterVo.getDeviceCode()).getId(); + String deployId = deployMap.get(transdataLivestockwaterVo.getDeployCode()).getId(); tpent.setValue(transdataLivestockwaterVo.getDataWaterTp()); tpent.setDeployId(deployId); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java index 598d2ef..7fe7265 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java @@ -76,12 +76,11 @@ public class BigScreenControllerP2 { .like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType()) .last("limit 1")); } - Assert.notNull(deploy, "无效的设备"); - + voBigScreenSurvQ.setDeployId(deploy.getId()); VOHisResult voHisResult = iotCommonP3Service.iotSurvSummary(voBigScreenSurvQ); List voHisFormResults = new ArrayList<>(); - if(!voHisResult.getDataList().isEmpty()){ + if(voHisResult.getDataList()!=null && !voHisResult.getDataList().isEmpty()){ for (int i=0;i - + @@ -30,11 +30,11 @@ - + - ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEVICE_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID + ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID - select from surv_hisdata_air where DEVICE_CODE = #{deployCode} AND DATA_DATE_TIME >= #{startDateTime} AND DATA_DATE_TIME <= #{endDateTime} order by DATA_DATE_TIME DESC + select from surv_hisdata_air where DEPLOY_CODE = #{deployCode} AND DATA_DATE_TIME >= #{startDateTime} AND DATA_DATE_TIME <= #{endDateTime} order by DATA_DATE_TIME DESC @@ -46,7 +46,7 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - and DEVICE_CODE IN + and DEPLOY_CODE IN #{id} @@ -62,11 +62,11 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d') - - and DEVICE_CODE = #{query.deviceCode} + + and DEPLOY_CODE = #{query.deployCode} - and DEVICE_CODE IN + and DEPLOY_CODE IN #{id} @@ -75,11 +75,11 @@ @@ -51,7 +51,7 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - and DEVICE_CODE IN + and DEPLOY_CODE IN #{id} @@ -63,7 +63,7 @@ - ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEVICE_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME + ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME @@ -154,7 +154,7 @@ AND TENANT_ID = #{tenantId} - AND DEVICE_CODE IN + AND DEPLOY_CODE IN #{id} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml index 48f48ae..789d024 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml @@ -43,7 +43,7 @@ - select * from surv_transdata_air where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_air where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND length(DATA_WATER_NH) < 10 AND DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND length(DATA_WATER_NH) < 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select from surv_transdata_soil where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 @@ -24,7 +24,7 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - and DEVICE_CODE IN + and DEPLOY_CODE IN #{id} @@ -36,7 +36,7 @@ @@ -22,7 +22,7 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - and DEVICE_CODE IN + and DEPLOY_CODE IN #{id} @@ -33,7 +33,7 @@ - select * from surv_transdata_air where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_air where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND length(DATA_WATER_NH) < 10 AND DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND length(DATA_WATER_NH) < 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) < 10 AND length(DATA_WATER_TN) < 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - select from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select from surv_transdata_soil where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1