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

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

This commit is contained in:
zy 2025-11-28 17:29:20 +08:00
parent efab01a4e7
commit a992a2efdb
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@
select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates, 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_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_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_NH as decimal(10,1))), 2),'0') as dataWaterNh,
ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
from surv_hisdata_livestockwater t from surv_hisdata_livestockwater t

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

@ -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_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_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_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 ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
from surv_hisdata_orientwater t from surv_hisdata_orientwater t
<where> <where>

9
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java
View File

@ -23,6 +23,13 @@ public class VOSurvIntegrateLiveDetail {
@ApiModelProperty(value = "大气湿度(mg/L)") @ApiModelProperty(value = "大气湿度(mg/L)")
private String dataWaterTn; 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)") @ApiModelProperty(value = "化学需氧量(mg/L)")
private String dataWaterCod; private String dataWaterCod;
} }

14
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java
View File

@ -30,5 +30,19 @@ public class VOSurvIntegrateOrientDetail {
@ApiModelProperty(value = "硝态氮(mg/L)") @ApiModelProperty(value = "硝态氮(mg/L)")
private String dataWaterNo; 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;
} }