From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java |   56 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 20 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 ccd6313..2ffda2a 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
@@ -7,6 +7,7 @@
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.dhsdk.service.IDhClientService;
 import com.ruoyi.device.hiksdk.service.IHikClientService;
 import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,6 +31,7 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
+
 import java.util.*;
 
 /**
@@ -44,7 +46,9 @@
 @Api(tags = "鐩告満绠＄悊鎺ュ彛")
 public class ArdCamerasController extends BaseController {
     @Resource
-    private IHikClientService sdk;
+    private IHikClientService hikSdk;
+    @Resource
+    private IDhClientService dhSdk;
     @Resource
     private IArdCamerasService ardCamerasService;
     @Resource
@@ -94,11 +98,18 @@
     @PostMapping
     public AjaxResult add(@RequestBody ArdCameras camera) {
         int i = ardCamerasService.insertArdCameras(camera);
-        if(i>0) {
-            //娉ㄩ攢
-            sdk.loginOut(camera.getId());
-            //寮傛鐧诲綍
-            sdk.asyncLogin(camera);
+        if (i > 0) {
+            if (camera.getFactory().equals("1")) {
+                //娉ㄩ攢
+                hikSdk.logout(camera.getId());
+                //寮傛鐧诲綍
+                hikSdk.asyncLogin(camera);
+            }
+            else if(camera.getFactory().equals("2"))
+            {
+                dhSdk.logout(camera.getId());
+                dhSdk.login(camera);
+            }
         }
         return toAjax(i);
     }
@@ -112,11 +123,16 @@
     @PutMapping
     public AjaxResult edit(@RequestBody ArdCameras camera) {
         int i = ardCamerasService.updateArdCameras(camera);
-        if(i>0)
-        {
-            ArdCameras cameras = ardCamerasService.selectArdCamerasById(camera.getId());
-            sdk.loginOut(cameras.getId());
-            sdk.asyncLogin(cameras);
+        if (i > 0) {
+            camera= ardCamerasService.selectArdCamerasById(camera.getId());
+            if(camera.getFactory().equals("1")) {
+                hikSdk.logout(camera.getId());
+                hikSdk.asyncLogin(camera);
+            }
+            else if(camera.getFactory().equals("2")) {
+                dhSdk.logout(camera.getId());
+                dhSdk.login(camera);
+            }
         }
         return toAjax(i);
     }
@@ -129,9 +145,9 @@
     @Log(title = "鐩告満璁惧", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
-        for(String id :ids)
-        {
-            sdk.loginOut(id);
+        for (String id : ids) {
+            hikSdk.logout(id);
+            dhSdk.logout(id);
         }
         return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
     }
@@ -152,25 +168,25 @@
         }
         return options;
     }
+
     @GetMapping("/getDeptAndCamera")
     @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
-    public AjaxResult getDeptAndCamera()
-    {
+    public AjaxResult getDeptAndCamera() {
         Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
         return AjaxResult.success(deptAndCamera);
     }
+
     @GetMapping("/getDeptAndCameraWithCheckBox")
     @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
-    public AjaxResult getDeptAndCameraWithCheckBox()
-    {
+    public AjaxResult getDeptAndCameraWithCheckBox() {
         Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
         return AjaxResult.success(deptAndCamera);
     }
+
     @PostMapping("/getNearCamerasBycoordinate")
     @ApiOperation("鑾峰彇闄勮繎鐨勭浉鏈�")
     @ApiOperationSupport(includeParameters = {"targetPosition"})
-    public AjaxResult getNearCamerasBycoordinate(@RequestBody CameraCmd cmd)
-    {
+    public AjaxResult getNearCamerasBycoordinate(@RequestBody CameraCmd cmd) {
         TreeMap nearCamerasBycoordinate = ardCamerasService.getNearCamerasBycoordinate(cmd);
         return AjaxResult.success(nearCamerasBycoordinate);
     }

--
Gitblit v1.9.3