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

统计bug

This commit is contained in:
zy 2025-12-06 15:40:22 +08:00
parent 648c95f93d
commit 692e34d4db
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -843,7 +843,7 @@ public class BigScreenController {
if(transdataSoil!=null) { if(transdataSoil!=null) {
transdataSoil.setStationName(survStationInfo.getStationName()); transdataSoil.setStationName(survStationInfo.getStationName());
List<CommonDataTrans> trans = CommonUtils.constructSoil(transdataSoil); List<CommonDataTrans> trans = CommonUtils.constructSoil(transdataSoil);
returnSoilArrs.addAll(trans); returnWaterArrs.addAll(trans);
} }
}else if(PollutionConstants.STINK.equals(survDeviceDeploy.getDeployType())) {//恶臭 }else if(PollutionConstants.STINK.equals(survDeviceDeploy.getDeployType())) {//恶臭
SurvTransdataStinkVo survTransdataAirVo = transdataVocsService.getNewestData(survDeviceDeploy.getDeployCode()); SurvTransdataStinkVo survTransdataAirVo = transdataVocsService.getNewestData(survDeviceDeploy.getDeployCode());

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

@ -44,6 +44,14 @@ public class VOSurvIntegrateLiveDetail {
@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 dataWaterNoSy;
/** /**
* 氨氮 * 氨氮
*/ */
@ -51,6 +59,13 @@ public class VOSurvIntegrateLiveDetail {
@ApiModelProperty(value = "氨氮(mg/L)") @ApiModelProperty(value = "氨氮(mg/L)")
private String dataWaterNh; private String dataWaterNh;
/**
* 氨氮
*/
@Excel(name = "氨氮水样(mg/L)", width = 15)
@ApiModelProperty(value = "氨氮水样(mg/L)")
private String dataWaterNhSy;
/** /**
* 化学需氧量 * 化学需氧量
@ -59,6 +74,13 @@ public class VOSurvIntegrateLiveDetail {
@ApiModelProperty(value = "化学需氧量(mg/L)") @ApiModelProperty(value = "化学需氧量(mg/L)")
private String dataWaterCod; private String dataWaterCod;
/**
* 总氮
*/
@Excel(name = "化学需氧量水样(mg/L)", width = 15)
@ApiModelProperty(value = "化学需氧量水样(mg/L)")
private String dataWaterCodSy;
} }

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

@ -44,6 +44,13 @@ 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 dataWaterNoSy;
/** /**
* 氨氮 * 氨氮
*/ */
@ -51,6 +58,13 @@ public class VOSurvIntegrateOrientDetail {
@ApiModelProperty(value = "氨氮(mg/L)") @ApiModelProperty(value = "氨氮(mg/L)")
private String dataWaterNh; private String dataWaterNh;
/**
* 氨氮
*/
@Excel(name = "氨氮水样(mg/L)", width = 15)
@ApiModelProperty(value = "氨氮水样(mg/L)")
private String dataWaterNhSy;
/** /**
* 化学需氧量 * 化学需氧量
*/ */
@ -58,5 +72,12 @@ public class VOSurvIntegrateOrientDetail {
@ApiModelProperty(value = "化学需氧量(mg/L)") @ApiModelProperty(value = "化学需氧量(mg/L)")
private String dataWaterCod; private String dataWaterCod;
/**
* 总氮
*/
@Excel(name = "化学需氧量水样(mg/L)", width = 15)
@ApiModelProperty(value = "化学需氧量水样(mg/L)")
private String dataWaterCodSy;
} }