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:54:45 +08:00
parent ac20a71ee0
commit c86166dfb9
2 changed files with 2 additions and 2 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

@ -830,7 +830,7 @@ public class BigScreenController {
List<ScEquZhibiao> equList = zhibiaoService.getAllChemical(deployList); List<ScEquZhibiao> equList = zhibiaoService.getAllChemical(deployList);
if(!equList.isEmpty()){ if(!equList.isEmpty()){
zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId)); zhibiaoMap.putAll(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());

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

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