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

bug修复

This commit is contained in:
zy 2025-12-01 11:44:07 +08:00
parent 21e2d2d788
commit ac20a71ee0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,6 +827,11 @@ public class BigScreenController {
for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) { for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) {
deviceList.add(survDeviceDeploy.getDeviceCode()); deviceList.add(survDeviceDeploy.getDeviceCode());
deployList.add(survDeviceDeploy.getId()); deployList.add(survDeviceDeploy.getId());
List<ScEquZhibiao> equList = zhibiaoService.getAllChemical(deployList);
if(!equList.isEmpty()){
zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId));
}
if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())){//土壤设备 if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())){//土壤设备
SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode()); SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode());
if(transdataSoil!=null) { if(transdataSoil!=null) {
@ -873,10 +878,7 @@ public class BigScreenController {
survStationInfo.getDeviceList().retainAll(remainList); survStationInfo.getDeviceList().retainAll(remainList);
//补充在线状态 //补充在线状态
survStationInfo.setDeviceList(iotutils.addOnlineStatus(survStationInfo.getDeviceList())); survStationInfo.setDeviceList(iotutils.addOnlineStatus(survStationInfo.getDeviceList()));
List<ScEquZhibiao> equList = zhibiaoService.getAllChemical(deployList);
if(equList.size()>0){
zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId));
}
} }
@ -891,7 +893,7 @@ public class BigScreenController {
} }
} }
} }
survStationInfo.setDeviceCount(survStationInfo.getDeviceList().size()); survStationInfo.setDeviceCount(counts);
survStationInfo.setLatestData(returnArrs); survStationInfo.setLatestData(returnArrs);
survStationInfo.setLatestSoilData(returnSoilArrs); survStationInfo.setLatestSoilData(returnSoilArrs);
survStationInfo.setLatestAirData(returnAirArrs); survStationInfo.setLatestAirData(returnAirArrs);

2
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
View File

@ -234,7 +234,7 @@ public class SurvStationInfoController {
} }
} }
List<ScEquZhibiao> equList = zhibiaoService.getShowedChemical(deployList); List<ScEquZhibiao> equList = zhibiaoService.getShowedChemical(deployList);
if(equList.size()>0){ if(!equList.isEmpty()){
zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId)); zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId));
TransZhiBiaoVo transZhiBiaoVo = new TransZhiBiaoVo(); TransZhiBiaoVo transZhiBiaoVo = new TransZhiBiaoVo();
transZhiBiaoVo.setZhibiaos(equList); transZhiBiaoVo.setZhibiaos(equList);