From fdef922f0f8adea77cfaee8194033b2947575fd2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:32:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
index e76122a..46220f2 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
@@ -47,16 +47,25 @@
servicesScopeDeviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
servicesScopeDeviceQueryWrapper.eq("services_scope_id",servicesScopeId);
List<ServicesScopeDevice> servicesScopeDevices = servicesScopeDeviceMapper.selectList(servicesScopeDeviceQueryWrapper);
+ if (servicesScopeDevices.size() == 0){
+ return null;
+ }
List<Integer> deviceIds = servicesScopeDevices.stream().map(p -> p.getDeviceId()).collect(Collectors.toList());
QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
deviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
deviceQueryWrapper.in("id",deviceIds);
List<Device> devices = deviceMapper.selectList(deviceQueryWrapper);
+ if (devices.size() == 0){
+ return null;
+ }
List<Integer> monitorPointIds = devices.stream().map(p -> p.getMonitorPointId()).collect(Collectors.toList());
QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
monitorPointQueryWrapper.in("id",monitorPointIds);
List<MonitorPoint> monitorPointList = monitorPointMapper.selectList(monitorPointQueryWrapper);
+ if (monitorPointList.size() == 0){
+ return null;
+ }
List resultList = new ArrayList();
for (MonitorPoint monitorPoint:monitorPointList) {
Map monitorPointMap = JSON.parseObject(JSON.toJSONString(monitorPoint), Map.class);
--
Gitblit v1.8.0