Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da

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

@@ -82,7 +82,16 @@
     */
    @Override
    public ArdCameras selectArdCamerasById(String id) {
        return ardCamerasMapper.selectArdCamerasById(id);
        ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(id);
        if (ardCameras != null) {
            ArdChannel ardChannel = new ArdChannel();
            ardChannel.setDeviceId(ardCameras.getId());
            List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
            if (ardChannels != null) {
                ardCameras.setChannelList(ardChannels);
            }
        }
        return ardCameras;
    }

    /**
@@ -190,7 +199,15 @@
    }

    public List findOptions(ArdCameras ardCameras) {
        return ardCamerasMapper.findOptions(ardCameras);
        List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
        for (ArdCameras camera :
                options) {
            ArdChannel ardChannel = new ArdChannel();
            ardChannel.setDeviceId(camera.getId());
            List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
            camera.setChannelList(ardChannels);
        }
        return options;
    }

    /**