From 255a6915a9898fe6c1a6649cae707649226ec177 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 08 九月 2023 16:30:34 +0800
Subject: [PATCH] 程序启动清空相机缓存列表重新加载 增加sdk获取相机聚焦值接口 修改相机登录时离线清空通道列表 增加获取码流压缩参数(分辨率/编码格式/码率/流类型) 优化相机在线离线业务方法,修改仅在线设备上传ptz

---
 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 a7ca092..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,14 +148,14 @@
     @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
     public AjaxResult getDeptAndCamera()
     {
-        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
         return AjaxResult.success(deptAndCamera);
     }
     @GetMapping("/getDeptAndCameraWithCheckBox")
     @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
     public AjaxResult getDeptAndCameraWithCheckBox()
     {
-        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
+        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
         return AjaxResult.success(deptAndCamera);
     }
     @PostMapping("/getNearCamerasBycoordinate")

--
Gitblit v1.9.3