整合数据统计、最新数据查询接口

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

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
         <where>

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;
 
+
+
 }

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;
+
 
 }