From 2118a0969c631a5aaaec5e97693cfcf763b401f5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 14:19:45 +0800
Subject: [PATCH] 获取封控圈内所有在线app用户改app单兵端
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 4cebdd7..b3c6f7e 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
@@ -137,7 +137,7 @@
Map option = new HashMap();
option.put("value", item.getId());
option.put("label", item.getName());
- option.put("channel", item.getChannel());
+ option.put("channel", item.getChanNo());
List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
option.put("idleTimeList", timeList);//绌洪棽鏃堕棿娈�
options.add(option);
@@ -148,7 +148,14 @@
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
public AjaxResult getDeptAndCamera()
{
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
+ return AjaxResult.success(deptAndCamera);
+ }
+ @GetMapping("/getDeptAndCameraWithCheckBox")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
+ public AjaxResult getDeptAndCameraWithCheckBox()
+ {
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
return AjaxResult.success(deptAndCamera);
}
@PostMapping("/getNearCamerasBycoordinate")
--
Gitblit v1.9.3