From bcecd69be3fb0d64e0a692ce328ca7b1f44dedf3 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期五, 02 六月 2023 19:08:34 +0800
Subject: [PATCH] 优化

---
 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 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 1ba9a14..eca36f8 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
@@ -5,10 +5,10 @@
 
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.hiksdk.service.impl.hikClientServiceImpl;
-import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,10 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鐩告満璁惧Controller
@@ -41,7 +44,7 @@
 @Api(tags = "鐩告満绠$悊鎺ュ彛")
 public class ArdCamerasController extends BaseController {
     @Resource
-    private hikClientServiceImpl sdk;
+    private HikClientServiceImpl sdk;
     @Resource
     private IArdCamerasService ardCamerasService;
 
@@ -143,4 +146,26 @@
             }
         return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
     }
+    @GetMapping("/options")
+    @ApiOperation("閫夋嫨鐩告満鏁版嵁")
+    public List options(ArdCameras ardCameras) {
+        List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
+        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.getChannel());
+           // option.put("description", item.getOilProduction());
+            options.add(option);
+        }
+        return options;
+    }
+    @GetMapping("/getDeptAndCamera")
+    @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
+    public AjaxResult getDeptAndCamera()
+    {
+        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+        return AjaxResult.success(deptAndCamera);
+    }
 }

--
Gitblit v1.9.3