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

修复后台设备检索

This commit is contained in:
zy 2025-11-27 19:51:21 +08:00
parent 7a941f92da
commit d42701c6ed
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -440,6 +440,7 @@ public class BigScreenController {
List<CommonDataTrans> tpList = new ArrayList<>(); List<CommonDataTrans> tpList = new ArrayList<>();
List<CommonDataTrans> tnList = new ArrayList<>(); List<CommonDataTrans> tnList = new ArrayList<>();
List<CommonDataTrans> noList = new ArrayList<>(); List<CommonDataTrans> noList = new ArrayList<>();
List<CommonDataTrans> codList = new ArrayList<>();
// for (SurvHisdataOrientwater survHisdataOrientwater : oriDataList) { // for (SurvHisdataOrientwater survHisdataOrientwater : oriDataList) {
CommonDataTrans tpent = new CommonDataTrans(); CommonDataTrans tpent = new CommonDataTrans();
@ -462,15 +463,27 @@ public class BigScreenController {
tnent.setStationCode(survStationInfo.getStationCode()); tnent.setStationCode(survStationInfo.getStationCode());
tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode()); tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode());
CommonDataTrans noent = new CommonDataTrans(); // CommonDataTrans noent = new CommonDataTrans();
noent.setName(PollutionEnum.dataWaterNo.getDescription()); // noent.setName(PollutionEnum.dataWaterNo.getDescription());
noent.setUnit(PollutionEnum.dataWaterNo.getUnit()); // noent.setUnit(PollutionEnum.dataWaterNo.getUnit());
noent.setColor(PollutionEnum.dataWaterNo.getColor()); // noent.setColor(PollutionEnum.dataWaterNo.getColor());
noent.setStationName(survStationInfo.getStationName()); // noent.setStationName(survStationInfo.getStationName());
noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); // noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
noent.setStationType(survStationInfo.getStationType()); // noent.setStationType(survStationInfo.getStationType());
noent.setStationCode(survStationInfo.getStationCode()); // noent.setStationCode(survStationInfo.getStationCode());
noent.setSurvItem(PollutionEnum.dataWaterNo.getCode()); // noent.setSurvItem(PollutionEnum.dataWaterNo.getCode());
CommonDataTrans codent = new CommonDataTrans();
codent.setName(PollutionEnum.dataWaterCod.getDescription());
codent.setUnit(PollutionEnum.dataWaterCod.getUnit());
codent.setColor(PollutionEnum.dataWaterCod.getColor());
codent.setStationName(survStationInfo.getStationName());
codent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
codent.setStationType(survStationInfo.getStationType());
codent.setStationCode(survStationInfo.getStationCode());
codent.setSurvItem(PollutionEnum.dataWaterCod.getCode());
String deployId = deployMap.get(transdataOrientwaterVo.getDeployCode()).getId(); String deployId = deployMap.get(transdataOrientwaterVo.getDeployCode()).getId();
@ -478,16 +491,21 @@ public class BigScreenController {
tpent.setDeployId(deployId); tpent.setDeployId(deployId);
tnent.setValue(transdataOrientwaterVo.getDataWaterTn()); tnent.setValue(transdataOrientwaterVo.getDataWaterTn());
tnent.setDeployId(deployId); tnent.setDeployId(deployId);
noent.setValue(transdataOrientwaterVo.getDataWaterNo()); // noent.setValue(transdataOrientwaterVo.getDataWaterNo());
noent.setDeployId(deployId); // noent.setDeployId(deployId);
codent.setValue(transdataOrientwaterVo.getDataWaterCod());
codent.setDeployId(deployId);
tpList.add(tpent); tpList.add(tpent);
tnList.add(tnent); tnList.add(tnent);
noList.add(noent); // noList.add(noent);
codList.add(codent);
// } // }
listFinal.addAll(tnList); listFinal.addAll(tnList);
listFinal.addAll(tpList); listFinal.addAll(tpList);
listFinal.addAll(noList); // listFinal.addAll(noList);
listFinal.addAll(codList);
// returnArrs.add(JSONObject.parseObject(JSON.toJSONString(transdataOrientwaterVo))); // returnArrs.add(JSONObject.parseObject(JSON.toJSONString(transdataOrientwaterVo)));

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

@ -48,6 +48,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
survTransdataOrientwaterVo.setDataWaterNo("3.7629"); survTransdataOrientwaterVo.setDataWaterNo("3.7629");
survTransdataOrientwaterVo.setDataWaterTp("1.0061"); survTransdataOrientwaterVo.setDataWaterTp("1.0061");
survTransdataOrientwaterVo.setDataWaterTn("2.0000"); survTransdataOrientwaterVo.setDataWaterTn("2.0000");
survTransdataOrientwaterVo.setDataWaterCod("501.5000");
survTransdataOrientwaterVo.setDataDateTime(LocalDateTime.now()); survTransdataOrientwaterVo.setDataDateTime(LocalDateTime.now());
survTransdataOrientwaterVo.setDeployCode(orientList.get(0)); survTransdataOrientwaterVo.setDeployCode(orientList.get(0));
} }

6
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java
View File

@ -46,9 +46,9 @@ public class SurvTransdataOrientwaterVo implements Serializable {
// @ApiModelProperty(value = "氨氮") // @ApiModelProperty(value = "氨氮")
// private String dataWaterNh; // private String dataWaterNh;
// /**化学需氧量*/ // /**化学需氧量*/
// @Excel(name = "化学需氧量", width = 15) @Excel(name = "化学需氧量", width = 15)
// @ApiModelProperty(value = "化学需氧量") @ApiModelProperty(value = "化学需氧量")
// private String dataWaterCod; private String dataWaterCod;
/**硝态氮*/ /**硝态氮*/
@Excel(name = "硝态氮", width = 15) @Excel(name = "硝态氮", width = 15)
@ApiModelProperty(value = "硝态氮") @ApiModelProperty(value = "硝态氮")