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

增加按设备过滤统计项

This commit is contained in:
zhangyue 2026-07-20 18:58:00 +08:00
parent 5681706a61
commit deb3443da2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,7 +709,6 @@ public class BigScreenController {
screenIndexSummaryDetailVo.setGroupName(survStationInfo.getGroupName()); screenIndexSummaryDetailVo.setGroupName(survStationInfo.getGroupName());
screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName()); screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName());
screenIndexSummaryDetailVo = iotTools.filterTenantData(orientIdList,screenIndexSummaryDetailVo); screenIndexSummaryDetailVo = iotTools.filterTenantData(orientIdList,screenIndexSummaryDetailVo);
results.add(screenIndexSummaryDetailVo);
} }
if(!liveList.isEmpty()) { if(!liveList.isEmpty()) {
@ -785,15 +784,18 @@ public class BigScreenController {
screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName()); screenIndexSummaryDetailVo.setStationName(survStationInfo.getStationName());
screenIndexSummaryDetailVo.setStationShortName(survStationInfo.getStationShortName()); screenIndexSummaryDetailVo.setStationShortName(survStationInfo.getStationShortName());
screenIndexSummaryDetailVo = iotTools.filterTenantData(liveIdList,screenIndexSummaryDetailVo); screenIndexSummaryDetailVo = iotTools.filterTenantData(liveIdList,screenIndexSummaryDetailVo);
results.add(screenIndexSummaryDetailVo);
} }
if(!stinkList.isEmpty()){ if(!stinkList.isEmpty()){
screenIndexSummaryDetailVo = vocsService.getStinkSummry(screenSummaryVo,stinkList,startTime,endTime); ScreenIndexSummaryDetailVo vocsData = vocsService.getStinkSummry(screenSummaryVo,stinkList,startTime,endTime);
results.add(screenIndexSummaryDetailVo); if(vocsData!=null && vocsData.getDatas()!=null && !vocsData.getDatas().isEmpty()){
screenIndexSummaryDetailVo.getDatas().putAll(vocsData.getDatas());
} }
} }
results.add(screenIndexSummaryDetailVo);
}
} }
} }
// JSONObject datajob = new JSONObject(); // JSONObject datajob = new JSONObject();