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 42973c2..9d2fd26 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.appmana.controller; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -263,7 +264,7 @@ public class BigScreenController { for (SurvStationInfo survStationInfo : stationList) { //设备数量 int counts = survStationInfo.getDeviceList()!=null?survStationInfo.getDeviceList().size():0; - JSONObject jsonObject = new JSONObject(); + List dataTransList = new ArrayList<>(); survStationInfo.setName(count.toString()); List deployList = new ArrayList<>(); List orientIds = new ArrayList<>(); @@ -279,72 +280,38 @@ public class BigScreenController { for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) { deployList.add(survDeviceDeploy.getId()); if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType()) || PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())){//土壤水质设备 - SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode()); - if(transdataSoil!=null) { - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataSoil))); - }else{ - transdataSoil= new SurvTransdataSoilVo(); - transdataSoil.setDataSoilTemp("0"); - transdataSoil.setDataSoilWet("0"); - transdataSoil.setDataSoilTemp2("0"); - transdataSoil.setDataSoilTemp3("0"); - transdataSoil.setDataSoilWet2("0"); - transdataSoil.setDataSoilWet3("0"); - transdataSoil.setDataSoilDdl("0"); - transdataSoil.setDataSoilDdl2("0"); - transdataSoil.setDataSoilDdl3("0"); - transdataSoil.setDataSoilPh("0"); - transdataSoil.setDataWaterDo("0"); - transdataSoil.setDataWaterNtu("0"); - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataSoil))); + SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode()); + if(transdataSoil==null) { + transdataSoil = transdataSoilService.initData(zhibiaoMap.get(survDeviceDeploy.getId())); } + List trans = CommonUtils.constructSoil(transdataSoil); + dataTransList.addAll(trans); }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备 - SurvTransdataAirVo transdataAir= transdataAirService.getNewestData(survDeviceDeploy.getDeployCode()); - if(transdataAir!=null) { - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir))); - }else{ - transdataAir= new SurvTransdataAirVo(); - transdataAir.setDataAirTemp("0"); - transdataAir.setDataAirWet("0"); - transdataAir.setDataAirPress("0"); - transdataAir.setDataRainFall("0"); - transdataAir.setDataWindSpeed("0"); - transdataAir.setDataWindDirection("0"); - transdataAir.setDataRainTotal("0"); - transdataAir.setDataSunTotal("0"); - transdataAir.setDataSunFallout("0"); - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir))); + SurvTransdataAir transdataAir= transdataAirService.getOneByDeviceCode(survDeviceDeploy.getDeployCode()); + if(transdataAir==null) { + transdataAir= transdataAirService.initData(zhibiaoMap.get(survDeviceDeploy.getId())); } - + List trans = CommonUtils.constructAir(transdataAir); + dataTransList.addAll(trans); }else if(PollutionConstants.CAMERA.equals(survDeviceDeploy.getDeployType())) {//摄像头 //只保留摄像头的数据 remainList.add(survDeviceDeploy); }else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源 orientIds.add(survDeviceDeploy.getId()); - SurvTransdataOrientwaterVo transdataVo= transdataOrientwaterService.getNewestData(survDeviceDeploy.getDeployCode()); - if(transdataVo!=null) { - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataVo))); - }else{ - transdataVo = new SurvTransdataOrientwaterVo(); - transdataVo.setDataWaterTp("0"); - transdataVo.setDataWaterTn("0"); - transdataVo.setDataWaterNo("0"); - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataVo))); - } - + SurvTransdataOrientwaterVo transdataVo= transdataOrientwaterService.getNewestData(survDeviceDeploy.getDeployCode()); + if(transdataVo==null) { + transdataVo = transdataOrientwaterService.initData(zhibiaoMap.get(survDeviceDeploy.getId())); + } + List orientData = commonP3Service.constructOrient(transdataVo,survStationInfo,survDeviceDeploy); + dataTransList.addAll(orientData); }else if(PollutionConstants.WATER_LIVE.equals(survDeviceDeploy.getDeployType())) {//畜禽 orientIds.add(survDeviceDeploy.getId()); - SurvTransdataLivestockwaterVo transdataAir= transdataLivestockwaterService.getNewestData(survDeviceDeploy.getDeployCode()); - if(transdataAir!=null) { - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir))); - }else{ - transdataAir= new SurvTransdataLivestockwaterVo(); - transdataAir.setDataWaterCod("0"); - transdataAir.setDataWaterTp("0"); - transdataAir.setDataWaterNh("0"); - transdataAir.setDataWaterTn("0"); - jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir))); + SurvTransdataLivestockwaterVo transdataVo= transdataLivestockwaterService.getNewestData(survDeviceDeploy.getDeployCode()); + if(transdataVo==null) { + transdataVo = transdataLivestockwaterService.initData(zhibiaoMap.get(survDeviceDeploy.getId())); } + List liveData = commonP3Service.constructLive(transdataVo,survStationInfo,survDeviceDeploy); + dataTransList.addAll(liveData); } } @@ -352,7 +319,7 @@ public class BigScreenController { survStationInfo.getDeviceList().retainAll(remainList); } - survStationInfo.setNewestData(jsonObject); + survStationInfo.setNewestData(dataTransList); //补充指标 List equList = zhibiaoService.getAllChemical(deployList); List allSurv = new ArrayList<>(); @@ -832,10 +799,10 @@ public class BigScreenController { List stationList = survStationInfoService.getAllStationAndDevice(stationCode,"",token); //补充最新数据进入 JSONArray returnArrs= new JSONArray(); - JSONArray returnSoilArrs= new JSONArray(); - JSONArray returnWaterArrs= new JSONArray(); - JSONArray returnAirArrs= new JSONArray(); - JSONArray returnStinkArrs= new JSONArray(); + List returnSoilArrs= new ArrayList<>(); + List returnWaterArrs = new ArrayList<>(); + List returnAirArrs= new ArrayList(); + List returnStinkArrs= new ArrayList(); if(stationList!=null&&stationList.size()>0){ SurvStationInfo survStationInfo = stationList.get(0); List deviceList = new ArrayList<>(); @@ -858,27 +825,30 @@ public class BigScreenController { if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())){//土壤设备 - SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode()); + SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode()); if(transdataSoil!=null) { transdataSoil.setStationName(survStationInfo.getStationName()); - returnSoilArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataSoil))); + List trans = CommonUtils.constructSoil(transdataSoil); + returnSoilArrs.addAll(trans); } }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备 - SurvTransdataAirVo transdataAir= transdataAirService.getNewestData(survDeviceDeploy.getDeployCode()); + SurvTransdataAir transdataAir= transdataAirService.getOneByDeviceCode(survDeviceDeploy.getDeployCode()); if(transdataAir!=null) { transdataAir.setStationName(survStationInfo.getStationName()); - returnAirArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataAir))); + List trans = CommonUtils.constructAir(transdataAir); + returnAirArrs.addAll(trans); } - }else if(PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())){//水质设备 - SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode()); + SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode()); if(transdataSoil!=null) { transdataSoil.setStationName(survStationInfo.getStationName()); - returnWaterArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataSoil))); + List trans = CommonUtils.constructSoil(transdataSoil); + returnSoilArrs.addAll(trans); } }else if(PollutionConstants.STINK.equals(survDeviceDeploy.getDeployType())) {//恶臭 SurvTransdataStinkVo survTransdataAirVo = transdataVocsService.getNewestData(survDeviceDeploy.getDeployCode()); - returnStinkArrs.add(JSONObject.parseObject(JSONObject.toJSONString(survTransdataAirVo))); + List trans = CommonUtils.constructStink(survTransdataAirVo); + returnStinkArrs.addAll(trans); } else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源 SurvTransdataOrientwaterVo transdataOrientwaterVo=transdataOrientwaterService.getNewestData(survDeviceDeploy.getDeployCode()); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml index ca5867e..d2e4ec5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml @@ -10,6 +10,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -28,60 +48,57 @@ - - - - - - - + ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,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, + STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD, + DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD, FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS @@ -96,10 +113,15 @@ - SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM ( + SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCod,0) as avgCod FROM ( SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12 ) t1 LEFT JOIN ( - SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP <> '0.0000' - - and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - - - and DEPLOY_CODE IN - - #{id} - - - and t.DATA_WATER_TP <> '0.0000' + SELECT ROUND(AVG(t.DATA_WATER_TP_SY),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO_SY),4) AS avgNO,ROUND(AVG(t.DATA_WATER_NH_SY),4) AS avgNH,ROUND(AVG(t.DATA_WATER_COD_SY),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t + + + and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} + + + and DEPLOY_CODE IN + + #{id} + + + GROUP BY MONTH(t.DATA_DATE_TIME) ) t2 ON t1.index = t2.month ORDER BY t1.index asc - 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,THIRD_VALVE_STATUS + 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,THIRD_VALVE_STATUS, + DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD @@ -111,10 +125,15 @@ - 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_livestockwater 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 DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d') - - - and DEPLOY_CODE = #{query.deployCode} - - - and DEPLOY_CODE IN - - #{id} - - + select from surv_transdata_livestockwater + + + and DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d') + + + and DEPLOY_CODE = #{query.deployCode} + + + and DEPLOY_CODE IN + + #{id} + + + order by DATA_DATE_TIME desc \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml index ad545a2..a18095e 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml @@ -11,10 +11,17 @@ + + + + + + + @@ -44,26 +51,27 @@ - - - - + + + + - - + + 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,THIRD_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID, + DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD, DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml index ad3ef08..9141a6f 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml @@ -120,8 +120,8 @@ DATA_WATER_NTU,DATA_WATER_DO,DATA_WATER_TEMP,DATA_WATER_PH,DATA_WATER_DDL - + select from surv_transdata_soil where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 - SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCOD,0) as avgCOD FROM ( + SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCOD,0) as avgCOD FROM ( SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12 ) t1 LEFT JOIN ( - SELECT ROUND(AVG(t.DATA_WATER_TP),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH),2) AS avgNH,ROUND(AVG(t.DATA_WATER_COD),2) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t where 1 = 1 + SELECT ROUND(AVG(t.DATA_WATER_TP_SY),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH_SY),2) AS avgNH,ROUND(AVG(t.DATA_WATER_NO_SY),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD_SY),2) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t where 1 = 1 and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} @@ -35,8 +48,28 @@ + + DATA_WATER_TP, + DATA_WATER_TN, + DATA_WATER_NO, + DATA_WATER_NH, + DATA_WATER_COD, + DATA_WATER_TP_SY, + DATA_WATER_TP_LD, + DATA_WATER_TN_SY, + DATA_WATER_TN_LD, + DATA_WATER_NH_SY, + DATA_WATER_NH_LD, + DATA_WATER_COD_SY, + DATA_WATER_COD_LD, + DATA_WATER_NO_SY, + DATA_WATER_NO_LD, + DATA_DATE_TIME, + DEPLOY_CODE + + - SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM ( + SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM ( SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12 ) t1 LEFT JOIN ( - SELECT ROUND(AVG(t.DATA_WATER_TP),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),2) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 + SELECT ROUND(AVG(t.DATA_WATER_TP_SY),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH_SY),2) AS avgNH,ROUND(AVG(t.DATA_WATER_NO_SY),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD_SY),2) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} @@ -34,7 +67,7 @@ - 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_livestockwater where 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 DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select from surv_transdata_orientwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1