修改查询设备及站点接口

lizijie

2022-01-25 118ef0533310adc3ba276a9b1c851443ea01d910

修改查询设备及站点接口

 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);