Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-07 2fa66c208202f420a5f001cf0d67e5aa1bf94578

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java

@@ -86,7 +86,18 @@
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) {
        return ardCamerasMapper.selectArdCamerasList(ardCameras);
        List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(ardCameras);
        if (ardCamerasList.size() > 0) {
            for (ArdCameras camera : ardCamerasList) {
                ArdChannel ardChannel = new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
            }
        }
        return ardCamerasList;
    }

    /**
@@ -219,8 +230,7 @@
                ArdChannel ardChannel=new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if(ardChannels!=null)
                {
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
                Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -268,7 +278,13 @@
                    camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
                    ardCameras.put(distance, camera);
                }

                //获取通道列表
                ArdChannel ardChannel = new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
            }
            return ardCameras;
        } catch (Exception ex) {
@@ -329,6 +345,7 @@
        }
        return null;
    }

    /**
     * 获取监控圈内所有在线光电
     * 刘苏义
@@ -339,8 +356,7 @@
        try {
            Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
            List<Point> partitionLocation = param.getPartitionLocation();
            if(partitionLocation==null)
            {
            if (partitionLocation == null) {
                log.debug("多边形坐标集合为空");
                return null;
            }