视频巡检任务,加入通道管理

zhangjian

2023-10-24 f6a88f721b58a8f97759c0c1542608ff68b0fb5c

视频巡检任务,加入通道管理

 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java

@@ -143,12 +143,13 @@
    @ApiOperation("选择相机数据")
    public List options(ArdCameras ardCameras) {
        List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
        System.out.println("list:"+list.size());
        List options = new ArrayList();
        for (ArdCameras item : list) {
            Map option = new HashMap();
            option.put("value", item.getId());
            option.put("label", item.getName());
            option.put("channel", item.getChanNo());
            option.put("channelList", item.getChannelList());
            List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
            option.put("idleTimeList", timeList);//空闲时间段
            options.add(option);

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

@@ -84,12 +84,12 @@
    public ArdCameras selectArdCamerasById(String 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);
                }
            ArdChannel ardChannel = new ArdChannel();
            ardChannel.setDeviceId(ardCameras.getId());
            List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
            if (ardChannels != null) {
                ardCameras.setChannelList(ardChannels);
            }
        }
        return ardCameras;
    }
@@ -199,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;
    }

    /**