From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 二月 2025 13:40:06 +0800 Subject: [PATCH] 管理后台bug修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java index ee26ef9..d5760fa 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * <p> @@ -111,6 +112,24 @@ return PageDTO.empty(0L, 0L); } Page<MwMonitorDeviceVO> page = baseMapper.pageMonitorPage(new Page<>(query.getPageCurr(), query.getPageSize()), query.getStatus(), treeCode, deviceList); + List<MwMonitorDeviceVO> records = page.getRecords(); + records = records.stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> { + item.setStatus(1); + }).collect(Collectors.toList()); + return PageDTO.of(page); + } + + @Override + public PageDTO<MwMonitorDeviceVO> pageMonitorPage1(MwMonitorDeviceQuery query) { + query.setPageCurr(1); + query.setPageSize(999999999); + //获取视频服务器中的在线设备列表 + List<String> deviceList = monitorDeviceApiNewService.getDeviceList(); + String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId()); + if (StringUtils.isBlank(treeCode)) { + return PageDTO.empty(0L, 0L); + } + Page<MwMonitorDeviceVO> page = baseMapper.pageMonitorPage(new Page<>(query.getPageCurr(), query.getPageSize()), query.getStatus(), treeCode, deviceList); page.getRecords().stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> { item.setStatus(1); }); -- Gitblit v1.7.1