From 77931584608686cdef1ac1736df30dd7ca187f7a Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Thu, 27 Nov 2025 11:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BigScreenController.java | 4 +- .../mapper/xml/SurvHisdataSoilMapper.xml | 82 +++++++--- .../mapper/xml/SurvTransdataSoilMapper.xml | 68 +++++++- .../service/impl/IotCommonP2ServiceImpl.java | 16 +- .../mapper/xml/SurvHisdataSoilMapper.xml | 85 +++++++--- .../mapper/xml/SurvTransdataSoilMapper.xml | 47 +++++- .../common/constant/enums/PollutionEnum.java | 50 +++++- .../jeecg/common/entity/SurvHisdataSoil.java | 154 +++++++++++++++++- .../common/entity/SurvTransdataSoil.java | 154 +++++++++++++++++- .../iot/common/VOSurvIntegrateSoilDetail.java | 4 +- .../jeecg/common/vo/SurvTransdataSoilVo.java | 154 +++++++++++++++++- 11 files changed, 728 insertions(+), 90 deletions(-) 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 817430a..b70413d 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 @@ -279,8 +279,8 @@ public class BigScreenController { transdataSoil.setDataSoilDdl2("0"); transdataSoil.setDataSoilDdl3("0"); transdataSoil.setDataSoilPh("0"); - transdataSoil.setDataSoilDo("0"); - transdataSoil.setDataSoilNtu("0"); + transdataSoil.setDataWaterDo("0"); + transdataSoil.setDataWaterNtu("0"); jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataSoil))); } }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备 diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml index 829a609..bb3c8f8 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml @@ -15,8 +15,35 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,7 +67,11 @@ - ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,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,DATA_SOIL_PH,DATA_SOIL_NTU,DATA_SOIL_DO + ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,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,DATA_SOIL_PH, + DATA_SOIL_NION,DATA_SOIL_PION,DATA_SOIL_KION,DATA_SOIL_NION2,DATA_SOIL_PION2,DATA_SOIL_KION2,DATA_SOIL_NION3,DATA_SOIL_PION3,DATA_SOIL_KION3,DATA_SOIL_NION4,DATA_SOIL_PION4,DATA_SOIL_KION4, + DATA_SOIL_NHION,DATA_SOIL_NOION,DATA_SOIL_CUION,DATA_SOIL_PBION,DATA_SOIL_CDION, + DATA_WATER_NTU,DATA_WATER_DO,DATA_WATER_TEMP,DATA_WATER_PH,DATA_WATER_DDL @@ -90,27 +121,32 @@ ifnull(ROUND(avg(cast(DATA_SOIL_DDL2 as decimal(10,1))), 2),'0') as dataSoilDdl2, ifnull(ROUND(avg(cast(DATA_SOIL_DDL3 as decimal(10,1))), 2),'0') as dataSoilDdl3, ifnull(ROUND(avg(cast(DATA_SOIL_PH as decimal(10,1))), 2),'0') as dataSoilPh, - ifnull(ROUND(avg(cast(DATA_SOIL_NTU as decimal(10,1))), 2),'0') as dataSoilNtu, - ifnull(ROUND(avg(cast(DATA_SOIL_DO as decimal(10,1))), 2),'0') as dataSoilDo + - - - - - - - - - - - - - - - - - - + ifnull(ROUND(avg(cast(DATA_SOIL_PH as decimal(10,1))), 2),'0') as dataSoilPh, + ifnull(ROUND(avg(cast(DATA_SOIL_NION as decimal(10,1))), 2),'0') as dataSoilNion, + ifnull(ROUND(avg(cast(DATA_SOIL_PION as decimal(10,1))), 2),'0') as dataSoilPion, + ifnull(ROUND(avg(cast(DATA_SOIL_KION as decimal(10,1))), 2),'0') as dataSoilKion, + ifnull(ROUND(avg(cast(DATA_SOIL_NION2 as decimal(10,1))), 2),'0') as dataSoilNion2, + ifnull(ROUND(avg(cast(DATA_SOIL_PION2 as decimal(10,1))), 2),'0') as dataSoilPion2, + ifnull(ROUND(avg(cast(DATA_SOIL_KION2 as decimal(10,1))), 2),'0') as dataSoilKion2, + ifnull(ROUND(avg(cast(DATA_SOIL_NION3 as decimal(10,1))), 2),'0') as dataSoilNion3, + ifnull(ROUND(avg(cast(DATA_SOIL_PION3 as decimal(10,1))), 2),'0') as dataSoilPion3, + ifnull(ROUND(avg(cast(DATA_SOIL_KION3 as decimal(10,1))), 2),'0') as dataSoilKion3, + ifnull(ROUND(avg(cast(DATA_SOIL_NION4 as decimal(10,1))), 2),'0') as dataSoilNion4, + ifnull(ROUND(avg(cast(DATA_SOIL_PION4 as decimal(10,1))), 2),'0') as dataSoilPion4, + ifnull(ROUND(avg(cast(DATA_SOIL_KION4 as decimal(10,1))), 2),'0') as dataSoilKion4, + ifnull(ROUND(avg(cast(DATA_SOIL_NHION as decimal(10,1))), 2),'0') as dataSoilNhion, + ifnull(ROUND(avg(cast(DATA_SOIL_NOION as decimal(10,1))), 2),'0') as dataSoilNoion, + ifnull(ROUND(avg(cast(DATA_SOIL_CUION as decimal(10,1))), 2),'0') as dataSoilCuion, + ifnull(ROUND(avg(cast(DATA_SOIL_PBION as decimal(10,1))), 2),'0') as dataSoilPbion, + ifnull(ROUND(avg(cast(DATA_SOIL_CDION as decimal(10,1))), 2),'0') as dataSoilCdion, + + ifnull(ROUND(avg(cast(DATA_WATER_TEMP as decimal(10,1))), 2),'0') as dataWaterTemp, + ifnull(ROUND(avg(cast(DATA_WATER_PH as decimal(10,1))), 2),'0') as dataWaterPh, + ifnull(ROUND(avg(cast(DATA_WATER_DDL as decimal(10,1))), 2),'0') as dataWaterDdl, + ifnull(ROUND(avg(cast(DATA_WATER_NTU as decimal(10,1))), 2),'0') as dataWaterNtu, + ifnull(ROUND(avg(cast(DATA_WATER_DO as decimal(10,1))), 2),'0') as dataWaterDo from surv_hisdata_soil t 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 8602d74..460b932 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 @@ -16,8 +16,34 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51,19 +77,49 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_DATE_TIME,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEVICE_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DATA_SOIL_PH,DATA_SOIL_NTU,DATA_SOIL_DO + ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_DATE_TIME,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,DATA_GATHER_TYPE,STATION_ID, + DEVICE_ID,STATION_CODE,DEVICE_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DATA_SOIL_PH, + DATA_SOIL_NION,DATA_SOIL_PION,DATA_SOIL_KION,DATA_SOIL_NION2,DATA_SOIL_PION2,DATA_SOIL_KION2,DATA_SOIL_NION3,DATA_SOIL_PION3,DATA_SOIL_KION3,DATA_SOIL_NION4,DATA_SOIL_PION4,DATA_SOIL_KION4, + DATA_SOIL_NHION,DATA_SOIL_NOION,DATA_SOIL_CUION,DATA_SOIL_PBION,DATA_SOIL_CDION, + DATA_WATER_NTU,DATA_WATER_DO,DATA_WATER_TEMP,DATA_WATER_PH,DATA_WATER_DDL SELECT t1.index,IFNULL(t2.dataSoilTemp,0) as dataSoilTemp,IFNULL(t2.dataSoilWet,0) as dataSoilWet,IFNULL(t2.dataSoilSalt,0) as dataSoilSalt,IFNULL(t2.dataSoilTemp2,0) as dataSoilTemp2,IFNULL(t2.dataSoilWet2,0) as dataSoilWet2,IFNULL(t2.dataSoilTemp3,0) as dataSoilTemp3 - ,IFNULL(t2.dataSoilWet3,0) as dataSoilWet3,IFNULL(t2.dataSoilDdl,0) as dataSoilDdl,IFNULL(t2.dataSoilDdl2,0) as dataSoilDdl2,IFNULL(t2.dataSoilDdl3,0) as dataSoilDdl3,IFNULL(t2.dataSoilPh,0) as dataSoilPh,IFNULL(t2.dataSoilNtu,0) as dataSoilNtu,IFNULL(t2.dataSoilDo,0) as dataSoilDo + ,IFNULL(t2.dataSoilWet3,0) as dataSoilWet3,IFNULL(t2.dataSoilDdl,0) as dataSoilDdl,IFNULL(t2.dataSoilDdl2,0) as dataSoilDdl2,IFNULL(t2.dataSoilDdl3,0) as dataSoilDdl3,IFNULL(t2.dataSoilPh,0) as dataSoilPh, + IFNULL(t2.dataSoilNion,0) as dataSoilNion,IFNULL(t2.dataSoilPion,0) as dataSoilPion,IFNULL(t2.dataSoilKion,0) as dataSoilKion,IFNULL(t2.dataSoilNion2,0) as dataSoilNion2,IFNULL(t2.dataSoilPion2,0) as dataSoilPion2,IFNULL(t2.dataSoilKion2,0) as dataSoilKion2, + IFNULL(t2.dataSoilNion3,0) as dataSoilNion3,IFNULL(t2.dataSoilPion3,0) as dataSoilPion3,IFNULL(t2.dataSoilKion3,0) as dataSoilKion3,IFNULL(t2.dataSoilNion4,0) as dataSoilNion4,IFNULL(t2.dataSoilPion4,0) as dataSoilPion4,IFNULL(t2.dataSoilKion4,0) as dataSoilKion4, + IFNULL(t2.dataSoilNhion,0) as dataSoilNhion,IFNULL(t2.dataSoilNoion,0) as dataSoilNoion,IFNULL(t2.dataSoilCuion,0) as dataSoilCuion,IFNULL(t2.dataSoilPbion,0) as dataSoilPbion,IFNULL(t2.dataSoilCdion,0) as dataSoilCdion, + IFNULL(t2.dataWaterNtu,0) as dataWaterNtu,IFNULL(t2.dataWaterDo,0) as dataWaterDo,IFNULL(t2.dataWaterTemp,0) as dataWaterTemp,IFNULL(t2.dataWaterPh,0) as dataWaterPh,IFNULL(t2.dataWaterDdl,0) as dataWaterDdl 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_SOIL_TEMP),2) AS dataSoilTemp,ROUND(AVG(t.DATA_SOIL_WET),2) AS dataSoilWet,ROUND(AVG(t.DATA_SOIL_SALT),2) AS dataSoilSalt,ROUND(AVG(t.DATA_SOIL_TEMP2),2) AS dataSoilTemp2,ROUND(AVG(t.DATA_SOIL_WET2),2) AS dataSoilWet2,ROUND(AVG(t.DATA_SOIL_TEMP3),2) AS dataSoilTemp3 - ,ROUND(AVG(t.DATA_SOIL_WET3),2) AS dataSoilWet3,ROUND(AVG(t.DATA_SOIL_DDL),2) AS dataSoilDdl,ROUND(AVG(t.DATA_SOIL_DDL2),2) AS dataSoilDdl2,ROUND(AVG(t.DATA_SOIL_DDL3),2) AS dataSoilDdl3,ROUND(AVG(t.DATA_SOIL_PH),2) AS dataSoilPh,ROUND(AVG(t.DATA_SOIL_NTU),2) AS dataSoilNtu,ROUND(AVG(t.DATA_SOIL_DO),2) AS dataSoilDo,MONTH(t.DATA_DATE_TIME) AS month - FROM surv_hisdata_soil t where 1 = 1 - - and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} - - - and DEVICE_CODE IN - - #{id} - - - + SELECT ROUND(AVG(t.DATA_SOIL_TEMP),2) AS dataSoilTemp,ROUND(AVG(t.DATA_SOIL_WET),2) AS dataSoilWet,ROUND(AVG(t.DATA_SOIL_SALT),2) AS dataSoilSalt,ROUND(AVG(t.DATA_SOIL_TEMP2),2) AS dataSoilTemp2,ROUND(AVG(t.DATA_SOIL_WET2),2) AS dataSoilWet2,ROUND(AVG(t.DATA_SOIL_TEMP3),2) AS dataSoilTemp3, + ROUND(AVG(t.DATA_SOIL_WET3),2) AS dataSoilWet3,ROUND(AVG(t.DATA_SOIL_DDL),2) AS dataSoilDdl,ROUND(AVG(t.DATA_SOIL_DDL2),2) AS dataSoilDdl2,ROUND(AVG(t.DATA_SOIL_DDL3),2) AS dataSoilDdl3,ROUND(AVG(t.DATA_SOIL_PH),2) AS dataSoilPh, + ROUND(AVG(t.DATA_SOIL_NION),2) AS dataSoilNion,ROUND(AVG(t.DATA_SOIL_PION),2) AS dataSoilPion,ROUND(AVG(t.DATA_SOIL_KION),2) AS dataSoilKion, + ROUND(AVG(t.DATA_SOIL_NION2),2) AS dataSoilNion2,ROUND(AVG(t.DATA_SOIL_PION2),2) AS dataSoilPion2,ROUND(AVG(t.DATA_SOIL_KION2),2) AS dataSoilKion2, + ROUND(AVG(t.DATA_SOIL_NION3),2) AS dataSoilNion3,ROUND(AVG(t.DATA_SOIL_PION3),2) AS dataSoilPion3,ROUND(AVG(t.DATA_SOIL_KION3),2) AS dataSoilKion3, + ROUND(AVG(t.DATA_SOIL_NION4),2) AS dataSoilNion4,ROUND(AVG(t.DATA_SOIL_PION4),2) AS dataSoilPion4,ROUND(AVG(t.DATA_SOIL_KION4),2) AS dataSoilKion4, + ROUND(AVG(t.DATA_SOIL_NHION),2) AS dataSoilNhion,ROUND(AVG(t.DATA_SOIL_NOION),2) AS DATA_SOIL_NOION,ROUND(AVG(t.DATA_SOIL_CUION),2) AS dataSoilCuion,ROUND(AVG(t.DATA_SOIL_PBION),2) AS dataSoilPbion,ROUND(AVG(t.DATA_SOIL_CDION),2) AS dataSoilCdion, + ROUND(AVG(t.DATA_WATER_NTU),2) AS dataWaterNtu,ROUND(AVG(t.DATA_WATER_DO),2) AS dataWaterDo,ROUND(AVG(t.DATA_WATER_TEMP),2) AS dataWaterTemp,ROUND(AVG(t.DATA_WATER_PH),2) AS dataWaterPh,ROUND(AVG(t.DATA_WATER_DDL),2) AS dataWaterDdl, + MONTH(t.DATA_DATE_TIME) AS month + FROM surv_hisdata_soil t + + + and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} + + + and DEVICE_CODE IN + + #{id} + + + GROUP BY MONTH(t.DATA_DATE_TIME) ) t2 ON t1.index = t2.month ORDER BY t1.index asc - select * from surv_transdata_soil where DEVICE_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