From 94023628bd9c5e6bf724c37371a19b60d338b291 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 21 十月 2023 15:22:21 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 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..4a4976e 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,9 @@
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.camera.service.ICameraSdkService;
+import com.ruoyi.device.camera.service.impl.CameraSdkServiceImpl;
+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 +33,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 +48,11 @@
@Api(tags = "鐩告満绠＄悊鎺ュ彛")
public class ArdCamerasController extends BaseController {
@Resource
- private IHikClientService sdk;
+ private IHikClientService hikSdk;
+ @Resource
+ private IDhClientService dhSdk;
+ @Resource
+ private ICameraSdkService cameraSdkService;
@Resource
private IArdCamerasService ardCamerasService;
@Resource
@@ -94,11 +102,9 @@
@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) {
+ cameraSdkService.logout(camera.getId());
+ cameraSdkService.login(camera);
}
return toAjax(i);
}
@@ -112,11 +118,9 @@
@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) {
+ cameraSdkService.logout(camera.getId());
+ cameraSdkService.login(camera);
}
return toAjax(i);
}
@@ -129,9 +133,8 @@
@Log(title = "鐩告満璁惧", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
- for(String id :ids)
- {
- sdk.loginOut(id);
+ for (String id : ids) {
+ cameraSdkService.logout(id);
}
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
}
@@ -152,25 +155,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