diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index fd1ec6d..c3e07b8 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -709,7 +709,6 @@ public class BigScreenController { screenIndexSummaryDetailVo.setGroupName(survStationInfo.getGroupName()); screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName()); screenIndexSummaryDetailVo = iotTools.filterTenantData(orientIdList,screenIndexSummaryDetailVo); - results.add(screenIndexSummaryDetailVo); } if(!liveList.isEmpty()) { @@ -785,14 +784,17 @@ public class BigScreenController { screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName()); screenIndexSummaryDetailVo.setStationShortName(survStationInfo.getStationShortName()); screenIndexSummaryDetailVo = iotTools.filterTenantData(liveIdList,screenIndexSummaryDetailVo); - results.add(screenIndexSummaryDetailVo); } if(!stinkList.isEmpty()){ - screenIndexSummaryDetailVo = vocsService.getStinkSummry(screenSummaryVo,stinkList,startTime,endTime); - results.add(screenIndexSummaryDetailVo); + ScreenIndexSummaryDetailVo vocsData = vocsService.getStinkSummry(screenSummaryVo,stinkList,startTime,endTime); + if(vocsData!=null && vocsData.getDatas()!=null && !vocsData.getDatas().isEmpty()){ + screenIndexSummaryDetailVo.getDatas().putAll(vocsData.getDatas()); + } } + + results.add(screenIndexSummaryDetailVo); } } }