From a992a2efdb9ea3ab7db2260570513913ddacb242 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Fri, 28 Nov 2025 17:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E6=9C=80=E6=96=B0=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/SurvHisdataLivestockwaterMapper.xml | 1 + .../mapper/xml/SurvHisdataOrientwaterMapper.xml | 1 + .../iot/common/VOSurvIntegrateLiveDetail.java | 9 +++++++++ .../iot/common/VOSurvIntegrateOrientDetail.java | 14 ++++++++++++++ 4 files changed, 25 insertions(+) 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 e49de9d..472b00e 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 @@ -86,6 +86,7 @@ select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates, ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp, ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn, + ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo, ifnull(ROUND(avg(cast(DATA_WATER_NH as decimal(10,1))), 2),'0') as dataWaterNh, ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod from surv_hisdata_livestockwater t diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml index 9d7f494..85309f3 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml @@ -112,6 +112,7 @@ ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp, ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn, ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo, + ifnull(ROUND(avg(cast(DATA_WATER_NH as decimal(10,1))), 2),'0') as dataWaterNh, ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod from surv_hisdata_orientwater t diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java index 0739500..ede7b8d 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java @@ -23,6 +23,13 @@ public class VOSurvIntegrateLiveDetail { @ApiModelProperty(value = "大气湿度(mg/L)") private String dataWaterTn; + /** + * 硝态氮 + */ + @Excel(name = "硝态氮(mg/L)", width = 15) + @ApiModelProperty(value = "硝态氮(mg/L)") + private String dataWaterNo; + /** * 氨氮 */ @@ -38,4 +45,6 @@ public class VOSurvIntegrateLiveDetail { @ApiModelProperty(value = "化学需氧量(mg/L)") private String dataWaterCod; + + } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java index 49753ee..7a0321f 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java @@ -30,5 +30,19 @@ public class VOSurvIntegrateOrientDetail { @ApiModelProperty(value = "硝态氮(mg/L)") private String dataWaterNo; + /** + * 氨氮 + */ + @Excel(name = "氨氮(mg/L)", width = 15) + @ApiModelProperty(value = "氨氮(mg/L)") + private String dataWaterNh; + + /** + * 化学需氧量 + */ + @Excel(name = "化学需氧量(mg/L)", width = 15) + @ApiModelProperty(value = "化学需氧量(mg/L)") + private String dataWaterCod; + }