From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 4a4976e..afbee07 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/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);
--
Gitblit v1.9.3