Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加监测项

This commit is contained in:
zy 2025-11-27 11:28:13 +08:00
parent ab64c802fc
commit 7793158460
11 changed files with 728 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
View File

@ -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())){//气象设备

82
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml
View File

@ -15,8 +15,35 @@
<result property="dataSoilDdl3" column="DATA_SOIL_DDL3" jdbcType="VARCHAR"/>
<result property="dataSoilPh" column="DATA_SOIL_PH" jdbcType="VARCHAR"/>
<result property="dataSoilNtu" column="DATA_SOIL_NTU" jdbcType="VARCHAR"/>
<result property="dataSoilDo" column="DATA_SOIL_DO" jdbcType="VARCHAR"/>
<result property="dataSoilNion" column="DATA_SOIL_NION" jdbcType="VARCHAR"/>
<result property="dataSoilPion" column="DATA_SOIL_PION" jdbcType="VARCHAR"/>
<result property="dataSoilKion" column="DATA_SOIL_KION" jdbcType="VARCHAR"/>
<result property="dataSoilNion2" column="DATA_SOIL_NION2" jdbcType="VARCHAR"/>
<result property="dataSoilPion2" column="DATA_SOIL_PION2" jdbcType="VARCHAR"/>
<result property="dataSoilKion2" column="DATA_SOIL_KION2" jdbcType="VARCHAR"/>
<result property="dataSoilNion3" column="DATA_SOIL_NION3" jdbcType="VARCHAR"/>
<result property="dataSoilPion3" column="DATA_SOIL_PION3" jdbcType="VARCHAR"/>
<result property="dataSoilKion3" column="DATA_SOIL_KION3" jdbcType="VARCHAR"/>
<result property="dataSoilNion4" column="DATA_SOIL_NION4" jdbcType="VARCHAR"/>
<result property="dataSoilPion4" column="DATA_SOIL_PION4" jdbcType="VARCHAR"/>
<result property="dataSoilKion4" column="DATA_SOIL_KION4" jdbcType="VARCHAR"/>
<result property="dataSoilNhion" column="DATA_SOIL_NHION" jdbcType="VARCHAR"/>
<result property="dataSoilNoion" column="DATA_SOIL_NOION" jdbcType="VARCHAR"/>
<result property="dataSoilCuion" column="DATA_SOIL_CUION" jdbcType="VARCHAR"/>
<result property="dataSoilPbion" column="DATA_SOIL_PBION" jdbcType="VARCHAR"/>
<result property="dataSoilCdion" column="DATA_SOIL_CDION" jdbcType="VARCHAR"/>
<!--water-->
<result property="dataWaterTemp" column="DATA_WATER_TEMP" jdbcType="VARCHAR"/>
<result property="dataWaterPh" column="DATA_WATER_PH" jdbcType="VARCHAR"/>
<result property="dataWaterDdl" column="DATA_WATER_DDL" jdbcType="VARCHAR"/>
<result property="dataWaterNtu" column="DATA_WATER_NTU" jdbcType="VARCHAR"/>
<result property="dataWaterDo" column="DATA_WATER_DO" jdbcType="VARCHAR"/>
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="dataGatherType" column="DATA_GATHER_TYPE" jdbcType="VARCHAR"/>
@ -40,7 +67,11 @@
</resultMap>
<sql id="baseSql">
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
</sql>
@ -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_DDL4 as decimal(10,1))), 2),'0') as dataSoilDdl4,-->
<!-- 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_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
<!-- ifnull(ROUND(avg(cast(DATA_LEAF_TEMP as decimal(10,1))), 2),'0') as dataLeafTemp,-->
<!-- ifnull(ROUND(avg(cast(DATA_LEAF_WET as decimal(10,1))), 2),'0') as dataLeafWet-->
from surv_hisdata_soil t

68
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml
View File

@ -16,8 +16,34 @@
<result property="dataSoilDdl3" column="DATA_SOIL_DDL3" jdbcType="VARCHAR"/>
<result property="dataSoilPh" column="DATA_SOIL_PH" jdbcType="VARCHAR"/>
<result property="dataSoilNtu" column="DATA_SOIL_NTU" jdbcType="VARCHAR"/>
<result property="dataSoilDo" column="DATA_SOIL_DO" jdbcType="VARCHAR"/>
<result property="dataSoilNion" column="DATA_SOIL_NION" jdbcType="VARCHAR"/>
<result property="dataSoilPion" column="DATA_SOIL_PION" jdbcType="VARCHAR"/>
<result property="dataSoilKion" column="DATA_SOIL_KION" jdbcType="VARCHAR"/>
<result property="dataSoilNion2" column="DATA_SOIL_NION2" jdbcType="VARCHAR"/>
<result property="dataSoilPion2" column="DATA_SOIL_PION2" jdbcType="VARCHAR"/>
<result property="dataSoilKion2" column="DATA_SOIL_KION2" jdbcType="VARCHAR"/>
<result property="dataSoilNion3" column="DATA_SOIL_NION3" jdbcType="VARCHAR"/>
<result property="dataSoilPion3" column="DATA_SOIL_PION3" jdbcType="VARCHAR"/>
<result property="dataSoilKion3" column="DATA_SOIL_KION3" jdbcType="VARCHAR"/>
<result property="dataSoilNion4" column="DATA_SOIL_NION4" jdbcType="VARCHAR"/>
<result property="dataSoilPion4" column="DATA_SOIL_PION4" jdbcType="VARCHAR"/>
<result property="dataSoilKion4" column="DATA_SOIL_KION4" jdbcType="VARCHAR"/>
<result property="dataSoilNhion" column="DATA_SOIL_NHION" jdbcType="VARCHAR"/>
<result property="dataSoilNoion" column="DATA_SOIL_NOION" jdbcType="VARCHAR"/>
<result property="dataSoilCuion" column="DATA_SOIL_CUION" jdbcType="VARCHAR"/>
<result property="dataSoilPbion" column="DATA_SOIL_PBION" jdbcType="VARCHAR"/>
<result property="dataSoilCdion" column="DATA_SOIL_CDION" jdbcType="VARCHAR"/>
<!--water-->
<result property="dataWaterTemp" column="DATA_WATER_TEMP" jdbcType="VARCHAR"/>
<result property="dataWaterPh" column="DATA_WATER_PH" jdbcType="VARCHAR"/>
<result property="dataWaterDdl" column="DATA_WATER_DDL" jdbcType="VARCHAR"/>
<result property="dataWaterNtu" column="DATA_WATER_NTU" jdbcType="VARCHAR"/>
<result property="dataWaterDo" column="DATA_WATER_DO" jdbcType="VARCHAR"/>
<result property="dataGatherType" column="DATA_GATHER_TYPE" jdbcType="VARCHAR"/>
<result property="stationId" column="STATION_ID" jdbcType="VARCHAR"/>
@ -51,19 +77,49 @@
<result property="dataSoilDdl3" column="DATA_SOIL_DDL3" jdbcType="VARCHAR"/>
<result property="dataSoilPh" column="DATA_SOIL_PH" jdbcType="VARCHAR"/>
<result property="dataSoilNtu" column="DATA_SOIL_NTU" jdbcType="VARCHAR"/>
<result property="dataSoilDo" column="DATA_SOIL_DO" jdbcType="VARCHAR"/>
<result property="dataSoilNion" column="DATA_SOIL_NION" jdbcType="VARCHAR"/>
<result property="dataSoilPion" column="DATA_SOIL_PION" jdbcType="VARCHAR"/>
<result property="dataSoilKion" column="DATA_SOIL_KION" jdbcType="VARCHAR"/>
<result property="dataSoilNion2" column="DATA_SOIL_NION2" jdbcType="VARCHAR"/>
<result property="dataSoilPion2" column="DATA_SOIL_PION2" jdbcType="VARCHAR"/>
<result property="dataSoilKion2" column="DATA_SOIL_KION2" jdbcType="VARCHAR"/>
<result property="dataSoilNion3" column="DATA_SOIL_NION3" jdbcType="VARCHAR"/>
<result property="dataSoilPion3" column="DATA_SOIL_PION3" jdbcType="VARCHAR"/>
<result property="dataSoilKion3" column="DATA_SOIL_KION3" jdbcType="VARCHAR"/>
<result property="dataSoilNion4" column="DATA_SOIL_NION4" jdbcType="VARCHAR"/>
<result property="dataSoilPion4" column="DATA_SOIL_PION4" jdbcType="VARCHAR"/>
<result property="dataSoilKion4" column="DATA_SOIL_KION4" jdbcType="VARCHAR"/>
<result property="dataSoilNhion" column="DATA_SOIL_NHION" jdbcType="VARCHAR"/>
<result property="dataSoilNoion" column="DATA_SOIL_NOION" jdbcType="VARCHAR"/>
<result property="dataSoilCuion" column="DATA_SOIL_CUION" jdbcType="VARCHAR"/>
<result property="dataSoilPbion" column="DATA_SOIL_PBION" jdbcType="VARCHAR"/>
<result property="dataSoilCdion" column="DATA_SOIL_CDION" jdbcType="VARCHAR"/>
<!--water-->
<result property="dataWaterTemp" column="DATA_WATER_TEMP" jdbcType="VARCHAR"/>
<result property="dataWaterPh" column="DATA_WATER_PH" jdbcType="VARCHAR"/>
<result property="dataWaterDdl" column="DATA_WATER_DDL" jdbcType="VARCHAR"/>
<result property="dataWaterNtu" column="DATA_WATER_NTU" jdbcType="VARCHAR"/>
<result property="dataWaterDo" column="DATA_WATER_DO" jdbcType="VARCHAR"/>
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="deployId" column="DEPLOY_ID"/>
</resultMap>
<sql id="baseSql">
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
</sql>
<select id="getNewestData" resultMap="simpleResultMap">
select * from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
select <include refid="baseSql"/> from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
</select>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.DataTrans">

16
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
View File

@ -157,11 +157,11 @@ public class IotCommonP2ServiceImpl {
if(y3!=null){
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
List<String> y4 = yesterResult.get(PollutionEnum.dataSoilNtu.getCode());
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
if(y4!=null) {
ntuDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
}
List<String> y5 = yesterResult.get(PollutionEnum.dataSoilDo.getCode());
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode());
if(y5!=null){
doDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
}
@ -190,11 +190,11 @@ public class IotCommonP2ServiceImpl {
if(y3!=null){
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
List<String> y4 = yesterResult.get(PollutionEnum.dataSoilNtu.getCode());
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
if(y4!=null) {
ntuDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
}
List<String> y5 = yesterResult.get(PollutionEnum.dataSoilDo.getCode());
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode());
if(y5!=null){
doDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
}
@ -223,11 +223,11 @@ public class IotCommonP2ServiceImpl {
if(y3!=null){
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
List<String> y4 = yesterResult.get(PollutionEnum.dataSoilNtu.getCode());
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
if(y4!=null) {
ntuDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
}
List<String> y5 = yesterResult.get(PollutionEnum.dataSoilDo.getCode());
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode());
if(y5!=null){
doDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
}
@ -248,11 +248,11 @@ public class IotCommonP2ServiceImpl {
if(t3!=null){
ddlDatas.addAll(t3.subList(0,todayDataCounts));
}
List<String> t4 = survResult.get(PollutionEnum.dataSoilNtu.getCode());
List<String> t4 = survResult.get(PollutionEnum.dataWaterNtu.getCode());
if(t4!=null) {
ntuDatas.addAll(t4.subList(0,todayDataCounts));
}
List<String> t5 = survResult.get(PollutionEnum.dataSoilDo.getCode());
List<String> t5 = survResult.get(PollutionEnum.dataWaterDo.getCode());
if(t5!=null){
doDatas.addAll(t5.subList(0,todayDataCounts));
}

85
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataSoilMapper.xml
View File

@ -16,40 +16,87 @@
<result property="dataSoilDdl3" column="DATA_SOIL_DDL3" jdbcType="VARCHAR"/>
<result property="dataSoilPh" column="DATA_SOIL_PH" jdbcType="VARCHAR"/>
<result property="dataSoilNtu" column="DATA_SOIL_NTU" jdbcType="VARCHAR"/>
<result property="dataSoilDo" column="DATA_SOIL_DO" jdbcType="VARCHAR"/>
<result property="dataSoilNion" column="DATA_SOIL_NION" jdbcType="VARCHAR"/>
<result property="dataSoilPion" column="DATA_SOIL_PION" jdbcType="VARCHAR"/>
<result property="dataSoilKion" column="DATA_SOIL_KION" jdbcType="VARCHAR"/>
<result property="dataSoilNion2" column="DATA_SOIL_NION2" jdbcType="VARCHAR"/>
<result property="dataSoilPion2" column="DATA_SOIL_PION2" jdbcType="VARCHAR"/>
<result property="dataSoilKion2" column="DATA_SOIL_KION2" jdbcType="VARCHAR"/>
<result property="dataSoilNion3" column="DATA_SOIL_NION3" jdbcType="VARCHAR"/>
<result property="dataSoilPion3" column="DATA_SOIL_PION3" jdbcType="VARCHAR"/>
<result property="dataSoilKion3" column="DATA_SOIL_KION3" jdbcType="VARCHAR"/>
<result property="dataSoilNion4" column="DATA_SOIL_NION4" jdbcType="VARCHAR"/>
<result property="dataSoilPion4" column="DATA_SOIL_PION4" jdbcType="VARCHAR"/>
<result property="dataSoilKion4" column="DATA_SOIL_KION4" jdbcType="VARCHAR"/>
<result property="dataSoilNhion" column="DATA_SOIL_NHION" jdbcType="VARCHAR"/>
<result property="dataSoilNoion" column="DATA_SOIL_NOION" jdbcType="VARCHAR"/>
<result property="dataSoilCuion" column="DATA_SOIL_CUION" jdbcType="VARCHAR"/>
<result property="dataSoilPbion" column="DATA_SOIL_PBION" jdbcType="VARCHAR"/>
<result property="dataSoilCdion" column="DATA_SOIL_CDION" jdbcType="VARCHAR"/>
<!--water-->
<result property="dataWaterTemp" column="DATA_WATER_TEMP" jdbcType="VARCHAR"/>
<result property="dataWaterPh" column="DATA_WATER_PH" jdbcType="VARCHAR"/>
<result property="dataWaterDdl" column="DATA_WATER_DDL" jdbcType="VARCHAR"/>
<result property="dataWaterNtu" column="DATA_WATER_NTU" jdbcType="VARCHAR"/>
<result property="dataWaterDo" column="DATA_WATER_DO" jdbcType="VARCHAR"/>
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="deviceCode" column="DEVICE_CODE" jdbcType="VARCHAR"/>
<result property="deployId" column="DEPLOY_ID"/>
</resultMap>
<sql id="baseSql">
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
</sql>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.SoilDataTrans">
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
<if test="yearStr!=null and yearStr!=''">
and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
</if>
<if test="soilList!=null">
and DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
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
<where>
<if test="yearStr!=null and yearStr!=''">
and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
</if>
<if test="soilList!=null">
and DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where>
GROUP BY MONTH(t.DATA_DATE_TIME)
) t2 ON t1.index = t2.month ORDER BY t1.index asc
</select>
<select id="getAllNewestData" resultMap="baseResultVoMap">
select * from surv_hisdata_soil where DEVICE_CODE IN
select <include refid="baseSql"/> from surv_hisdata_soil where DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
@ -57,7 +104,7 @@
</select>
<select id="getResentData" resultMap="baseResultVoMap">
select * from surv_hisdata_soil where DEVICE_CODE IN
select <include refid="baseSql"/> from surv_hisdata_soil where DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
@ -72,7 +119,7 @@
</select>
<select id="getPageResentData" resultMap="baseResultVoMap">
select * from surv_hisdata_soil where DEVICE_CODE IN
select <include refid="baseSql"/> from surv_hisdata_soil where DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>

47
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataSoilMapper.xml
View File

@ -13,16 +13,53 @@
<result property="dataSoilDdl" column="DATA_SOIL_DDL" jdbcType="VARCHAR"/>
<result property="dataSoilDdl2" column="DATA_SOIL_DDL2" jdbcType="VARCHAR"/>
<result property="dataSoilDdl3" column="DATA_SOIL_DDL3" jdbcType="VARCHAR"/>
<result property="dataSoilPh" column="DATA_SOIL_PH" jdbcType="VARCHAR"/>
<result property="dataSoilNtu" column="DATA_SOIL_NTU" jdbcType="VARCHAR"/>
<result property="dataSoilDo" column="DATA_SOIL_DO" jdbcType="VARCHAR"/>
<result property="dataSoilNion" column="DATA_SOIL_NION" jdbcType="VARCHAR"/>
<result property="dataSoilPion" column="DATA_SOIL_PION" jdbcType="VARCHAR"/>
<result property="dataSoilKion" column="DATA_SOIL_KION" jdbcType="VARCHAR"/>
<result property="dataSoilNion2" column="DATA_SOIL_NION2" jdbcType="VARCHAR"/>
<result property="dataSoilPion2" column="DATA_SOIL_PION2" jdbcType="VARCHAR"/>
<result property="dataSoilKion2" column="DATA_SOIL_KION2" jdbcType="VARCHAR"/>
<result property="dataSoilNion3" column="DATA_SOIL_NION3" jdbcType="VARCHAR"/>
<result property="dataSoilPion3" column="DATA_SOIL_PION3" jdbcType="VARCHAR"/>
<result property="dataSoilKion3" column="DATA_SOIL_KION3" jdbcType="VARCHAR"/>
<result property="dataSoilNion4" column="DATA_SOIL_NION4" jdbcType="VARCHAR"/>
<result property="dataSoilPion4" column="DATA_SOIL_PION4" jdbcType="VARCHAR"/>
<result property="dataSoilKion4" column="DATA_SOIL_KION4" jdbcType="VARCHAR"/>
<result property="dataSoilNhion" column="DATA_SOIL_NHION" jdbcType="VARCHAR"/>
<result property="dataSoilNoion" column="DATA_SOIL_NOION" jdbcType="VARCHAR"/>
<result property="dataSoilCuion" column="DATA_SOIL_CUION" jdbcType="VARCHAR"/>
<result property="dataSoilPbion" column="DATA_SOIL_PBION" jdbcType="VARCHAR"/>
<result property="dataSoilCdion" column="DATA_SOIL_CDION" jdbcType="VARCHAR"/>
<!--water-->
<result property="dataWaterTemp" column="DATA_WATER_TEMP" jdbcType="VARCHAR"/>
<result property="dataWaterPh" column="DATA_WATER_PH" jdbcType="VARCHAR"/>
<result property="dataWaterDdl" column="DATA_WATER_DDL" jdbcType="VARCHAR"/>
<result property="dataWaterNtu" column="DATA_WATER_NTU" jdbcType="VARCHAR"/>
<result property="dataWaterDo" column="DATA_WATER_DO" jdbcType="VARCHAR"/>
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="deviceCode" column="DEVICE_CODE"/>
<result property="deployId" column="DEPLOY_ID"/>
</resultMap>
<sql id="baseSql">
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
</sql>
<select id="getNewestData" resultMap="simpleResultMap">
select * from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
select <include refid="baseSql"/> from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
</select>
<select id="getNewestDataWithStation" resultMap="simpleResultMap">
@ -34,11 +71,11 @@
</select>
<select id="getRecentDataByCode" resultMap="simpleResultMap">
select * from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
select <include refid="baseSql"/> from surv_transdata_soil where DEVICE_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
</select>
<select id="getAllNewestData" resultMap="simpleResultMap">
select * from surv_transdata_soil where DEVICE_CODE IN
select <include refid="baseSql"/> from surv_transdata_soil where DEVICE_CODE IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>

50
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java
View File

@ -2,6 +2,8 @@ package org.jeecg.common.constant.enums;
import com.alibaba.fastjson.JSONObject;
import java.util.Random;
public enum PollutionEnum {
dataAirTemp("dataAirTemp", "大气温度", "℃", "sys/icon/shebei_icon_qixiang.png", "air", "#22BB8A", "sys/mobile/icon/shebei_icon_qixiang.png", "sys/bs/icon/shebei_icon_qixiang.png", "shebei_icon_qixiang.png"),
dataAirWet("dataAirWet", "大气湿度", "%RH", "sys/icon/zhandian_icon_kongqishidu.png", "air", "#EE701C", "sys/mobile/icon/zhandian_icon_kongqishidu.png", "sys/bs/icon/zhandian_icon_kongqishidu.png", "zhandian_icon_kongqishidu.png"),
@ -80,12 +82,14 @@ public enum PollutionEnum {
dataSoilPbion("dataSoilPbion", "土壤铅离子", "ppm", "sys/icon/zhandian_icon_pb-.png", "soil", "#92D1F3", "sys/mobile/icon/zhandian_icon_pb-.png", "sys/bs/icon/zhandian_icon_pb-.png", "zhandian_icon_pb-.png"),
dataSoilCdion("dataSoilCdion", "土壤镉离子", "ppm", "sys/icon/zhandian_icon_cd-.png", "soil", "#92D1F5", "sys/mobile/icon/zhandian_icon_cd-.png", "sys/bs/icon/zhandian_icon_cd-.png", "zhandian_icon_cd-.png"),
//20251122 新增五常二项，三项已有
dataSoilNtu("dataSoilNtu", "浊度", "ntu", "sys/icon/shebei_icon_ntu.png", "soil", "#92D0F3", "sys/mobile/icon/shebei_icon_ntu.png", "sys/bs/icon/shebei_icon_nto.png", "shebei_icon_nto.png"),
dataSoilDo("dataSoilDo", "溶解氧", "mg/L", "sys/icon/shebei_icon_do.png", "soil", "#92D0F5", "sys/mobile/icon/shebei_icon_do.png", "sys/bs/icon/shebei_icon_do.png", "shebei_icon_do.png"),
//20251122 新增五常
dataWaterNtu("dataWaterNtu", "浊度", "ntu", "sys/icon/shebei_icon_ntu.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_ntu.png", "sys/bs/icon/shebei_icon_nto.png", "shebei_icon_nto.png"),
dataWaterDo("dataWaterDo", "溶解氧", "mg/L", "sys/icon/shebei_icon_do.png", "waterq", "#92D0F5", "sys/mobile/icon/shebei_icon_do.png", "sys/bs/icon/shebei_icon_do.png", "shebei_icon_do.png"),
dataWaterPh("dataWaterPh", "pH", "℃", "sys/icon/shebei_icon_waterph.png", "waterq", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"),
dataWaterTemp("dataWaterTemp", "水温", "℃", "sys/icon/shebei_icon_watertemp.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_watertemp.png", "sys/bs/icon/shebei_icon_watertemp.png", "shebei_icon_watertemp.png"),
dataWaterDdl("dataWaterDdl", "水温", "℃", "sys/icon/shebei_icon_waterddl.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_waterddl.png", "sys/bs/icon/shebei_icon_waterddl.png", "shebei_icon_waterddl.png"),
dataWaterTemp("dataWaterTemp", "水温", "℃", "sys/icon/shebei_icon_watertemp.png", "water", "#92D0F3", "sys/mobile/icon/shebei_icon_watertemp.png", "sys/bs/icon/shebei_icon_watertemp.png", "shebei_icon_watertemp.png"),
dataWaterPh("dataWaterPh", "pH", "℃", "sys/icon/shebei_icon_waterph.png", "water", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"),
dataWaterTp("dataWaterTp", "总磷", "mg/L", "sys/icon/shebei_icon_tp.png", "water", "#C8CC00", "sys/mobile/icon/shebei_icon_tp.png", "sys/bs/icon/shebei_icon_tp.png", "shebei_icon_tp.png"),
dataWaterTn("dataWaterTn", "总氮", "mg/L", "sys/icon/shebei_icon_tn.png", "water", "#009DB2", "sys/mobile/icon/shebei_icon_tn.png", "sys/bs/icon/shebei_icon_tn.png", "shebei_icon_tn.png"),
dataWaterNo("dataWaterNo", "硝态氮", "mg/L", "sys/icon/shebei_icon_no3n.png", "water_orient", "#72BAA7", "sys/mobile/icon/shebei_icon_no3n.png", "sys/bs/icon/shebei_icon_no3n.png", "shebei_icon_no3n.png"),
@ -146,13 +150,44 @@ public enum PollutionEnum {
*/
private String iconName;
private static final Random RANDOM = new Random();
private static int colorIndex = 0;
private static class PaletteData {
static final String[] COLORS = {
"#FF6B6B", "#4ECDC4", "#FFE66D", "#6A0572", "#1A535C",
"#FF9A8B", "#A3586D", "#556270", "#4A90A4", "#F7DB4F",
"#FF6B9D", "#67D5B5", "#C89EC4", "#FFBC42", "#4B3B47",
"#118AB2", "#06D6A0", "#EF476F", "#073B4C", "#7209B7",
"#3A86FF", "#FB5607", "#FF006E", "#8338EC", "#264653",
"#2A9D8F", "#E9C46A", "#F4A261", "#E76F51", "#9B5DE5",
"#F15BB5", "#FEE440", "#00BBF9", "#00F5D4", "#FF99C8",
"#E4C1F9", "#FCF6BD", "#D0F4DE", "#A9DEF9", "#FFAFCC",
"#CDB4DB", "#FFC8DD", "#BDE0FE", "#A2D2FF", "#8AC926",
"#1982C4", "#6A4C93", "#F25F5C", "#50514F", "#247BA0",
"#70C1B3", "#B2DBBF", "#F3FFBD", "#FF1654", "#6929F0",
"#9F1853", "#012749", "#198038", "#FDDC69", "#FA4D56",
"#002D9C", "#A56EFF", "#0F62FE", "#6FDC8C", "#FF7EB6",
"#D4BBFF", "#BAE6FF", "#D0E6BE", "#FFF1C1", "#F4C4C4",
"#7BDCB5", "#8ED1FC", "#80DEEA", "#B39DDB", "#F48FB1",
"#90CAF9", "#A5D6A7", "#E6EE9C", "#FFCC80", "#FFAB91",
"#BCAAA4", "#B0BEC5", "#C5E1A5", "#FFE082", "#FFB74D",
"#4DB6AC", "#64B5F6", "#9575CD", "#F06292", "#4FC3F7",
"#4DD0E1", "#81C784", "#FFF176", "#FF8A65", "#A1887F",
"#90A4AE", "#7986CB", "#4DB6AC", "#DCE775", "#FFD54F",
"#FFB74D", "#E57373", "#BA68C8", "#64B5F6", "#81C784"
};
}
PollutionEnum(String code, String description, String unit, String icon, String type, String color, String mobileIcon, String bsIcon, String iconName) {
String[] palette = PaletteData.COLORS;
int randomIndex = (int) (Math.random() * palette.length);
this.code = code;
this.description = description;
this.unit = unit;
this.icon = icon;
this.type = type;
this.color = color;
this.color = palette[randomIndex];
this.mobileIcon = mobileIcon;
this.bsIcon = bsIcon;
this.iconName = iconName;
@ -279,4 +314,7 @@ public enum PollutionEnum {
return job;
}
}

154
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java
View File

@ -114,20 +114,160 @@ public class SurvHisdataSoil implements Serializable {
private String dataSoilDdl3;
/**ph*/
/**dan*/
@Excel(name = "ph", width = 15)
@ApiModelProperty(value = "ph")
private String dataSoilPh;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION")
private String dataSoilNion;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION")
private String dataSoilPion;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION")
private String dataSoilKion;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION2")
private String dataSoilNion2;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION2")
private String dataSoilPion2;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION2")
private String dataSoilKion2;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION3")
private String dataSoilNion3;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION3")
private String dataSoilPion3;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION3")
private String dataSoilKion3;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION4")
private String dataSoilNion4;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION4")
private String dataSoilPion4;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION4")
private String dataSoilKion4;
/**
* 土壤铵离子
*/
@Excel(name = "土壤铵离子", width = 15)
@TableField("DATA_SOIL_NHION")
private String dataSoilNhion;
/**
* 土壤硝酸根离子
*/
@Excel(name = "土壤硝酸根离子", width = 15)
@TableField("DATA_SOIL_NOION")
private String dataSoilNoion;
/**
* 土壤铜离子
*/
@Excel(name = "土壤铜离子", width = 15)
@TableField("DATA_SOIL_CUION")
private String dataSoilCuion;
/**
* 土壤铅离子
*/
@Excel(name = "土壤铅离子", width = 15)
@TableField("DATA_SOIL_PBION")
private String dataSoilPbion;
/**
* 土壤镉离子
*/
@Excel(name = "土壤镉离子", width = 15)
@TableField("DATA_SOIL_CDION")
private String dataSoilCdion;
/**ph*/
@Excel(name = "ph", width = 15)
@TableField(value = "DATA_WATER_PH")
private String dataWaterPh;
/**电导率*/
@TableField(value = "DATA_WATER_DDL")
private String dataWaterDdl;
/**水温*/
@TableField(value = "DATA_WATER_TEMP")
private String dataWaterTemp;
/**浊度*/
@Excel(name = "浊度", width = 15)
@ApiModelProperty(value = "浊度")
private String dataSoilNtu;
@TableField(value = "DATA_WATER_NTU")
private String dataWaterNtu;
/**溶解氧*/
@Excel(name = "溶解氧", width = 15)
@ApiModelProperty(value = "溶解氧")
private String dataSoilDo;
@TableField(value = "DATA_WATER_DO")
private String dataWaterDo;

154
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataSoil.java
View File

@ -119,15 +119,157 @@ public class SurvTransdataSoil implements Serializable {
@ApiModelProperty(value = "ph")
private String dataSoilPh;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION")
private String dataSoilNion;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION")
private String dataSoilPion;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION")
private String dataSoilKion;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION2")
private String dataSoilNion2;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION2")
private String dataSoilPion2;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION2")
private String dataSoilKion2;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION3")
private String dataSoilNion3;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION3")
private String dataSoilPion3;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION3")
private String dataSoilKion3;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION4")
private String dataSoilNion4;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION4")
private String dataSoilPion4;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION4")
private String dataSoilKion4;
/**
* 土壤铵离子
*/
@Excel(name = "土壤铵离子", width = 15)
@TableField("DATA_SOIL_NHION")
private String dataSoilNhion;
/**
* 土壤硝酸根离子
*/
@Excel(name = "土壤硝酸根离子", width = 15)
@TableField("DATA_SOIL_NOION")
private String dataSoilNoion;
/**
* 土壤铜离子
*/
@Excel(name = "土壤铜离子", width = 15)
@TableField("DATA_SOIL_CUION")
private String dataSoilCuion;
/**
* 土壤铅离子
*/
@Excel(name = "土壤铅离子", width = 15)
@TableField("DATA_SOIL_PBION")
private String dataSoilPbion;
/**
* 土壤镉离子
*/
@Excel(name = "土壤镉离子", width = 15)
@TableField("DATA_SOIL_CDION")
private String dataSoilCdion;
/**ph*/
@Excel(name = "ph", width = 15)
@TableField(value = "DATA_WATER_PH")
private String dataWaterPh;
/**电导率*/
@TableField(value = "DATA_WATER_DDL")
private String dataWaterDdl;
/**水温*/
@TableField(value = "DATA_WATER_TEMP")
private String dataWaterTemp;
/**浊度*/
@Excel(name = "浊度", width = 15)
@ApiModelProperty(value = "浊度")
private String dataSoilNtu;
@TableField(value = "DATA_WATER_NTU")
private String dataWaterNtu;
/**溶解氧*/
@Excel(name = "溶解氧", width = 15)
@ApiModelProperty(value = "溶解氧")
private String dataSoilDo;
@TableField(value = "DATA_WATER_DO")
private String dataWaterDo;
/**数据更新时间*/
@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateSoilDetail.java
View File

@ -208,14 +208,14 @@ public class VOSurvIntegrateSoilDetail {
* 浊度
*/
@ApiModelProperty(value = "浊度")
private String dataSoilNtu;
private String dataWaterNtu;
/**
* 溶解氧
*/
@ApiModelProperty(value = "溶解氧")
private String dataSoilDo;
private String dataWaterDo;

154
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataSoilVo.java
View File

@ -92,15 +92,157 @@ public class SurvTransdataSoilVo implements Serializable {
@ApiModelProperty(value = "ph")
private String dataSoilPh;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION")
private String dataSoilNion;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION")
private String dataSoilPion;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION")
private String dataSoilKion;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION2")
private String dataSoilNion2;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION2")
private String dataSoilPion2;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION2")
private String dataSoilKion2;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION3")
private String dataSoilNion3;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION3")
private String dataSoilPion3;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION3")
private String dataSoilKion3;
/**
* 氮离子
*/
@Excel(name = "氮离子", width = 15)
@TableField("DATA_SOIL_NION4")
private String dataSoilNion4;
/**
* 磷离子
*/
@Excel(name = "磷离子", width = 15)
@TableField("DATA_SOIL_PION4")
private String dataSoilPion4;
/**
* 钾离子
*/
@Excel(name = "钾离子", width = 15)
@TableField("DATA_SOIL_KION4")
private String dataSoilKion4;
/**
* 土壤铵离子
*/
@Excel(name = "土壤铵离子", width = 15)
@TableField("DATA_SOIL_NHION")
private String dataSoilNhion;
/**
* 土壤硝酸根离子
*/
@Excel(name = "土壤硝酸根离子", width = 15)
@TableField("DATA_SOIL_NOION")
private String dataSoilNoion;
/**
* 土壤铜离子
*/
@Excel(name = "土壤铜离子", width = 15)
@TableField("DATA_SOIL_CUION")
private String dataSoilCuion;
/**
* 土壤铅离子
*/
@Excel(name = "土壤铅离子", width = 15)
@TableField("DATA_SOIL_PBION")
private String dataSoilPbion;
/**
* 土壤镉离子
*/
@Excel(name = "土壤镉离子", width = 15)
@TableField("DATA_SOIL_CDION")
private String dataSoilCdion;
/**ph*/
@Excel(name = "ph", width = 15)
@TableField(value = "DATA_WATER_PH")
private String dataWaterPh;
/**电导率*/
@TableField(value = "DATA_WATER_DDL")
private String dataWaterDdl;
/**水温*/
@TableField(value = "DATA_WATER_TEMP")
private String dataWaterTemp;
/**浊度*/
@Excel(name = "浊度", width = 15)
@ApiModelProperty(value = "浊度")
private String dataSoilNtu;
@TableField(value = "DATA_WATER_NTU")
private String dataWaterNtu;
/**溶解氧*/
@Excel(name = "溶解氧", width = 15)
@ApiModelProperty(value = "溶解氧")
private String dataSoilDo;
@TableField(value = "DATA_WATER_DO")
private String dataWaterDo;
/**数据更新时间*/
@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")