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
@@ -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; } /**
