From deb3443da2384fdb9e8b45abcd8a8a111567e974 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Mon, 20 Jul 2026 18:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=9F=E8=AE=A1=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appmana/controller/BigScreenController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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); } } }