From f069ce1cc814e57c36b3c8d48d10af215350081b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 14 六月 2023 09:40:16 +0800
Subject: [PATCH] 修改盗电报警数据从mqtt接收 修改管线泄漏sql错误
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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..1e98e6f 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,11 @@
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 com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -27,7 +28,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,9 +45,11 @@
@Api(tags = "鐩告満绠＄悊鎺ュ彛")
public class ArdCamerasController extends BaseController {
@Resource
- private hikClientServiceImpl sdk;
+ private HikClientServiceImpl sdk;
@Resource
private IArdCamerasService ardCamerasService;
+ @Resource
+ private IArdVideoInspectTaskService ardVideoInspectTaskService;
/**
* 鏌ヨ鐩告満璁惧鍒楄〃
@@ -91,16 +97,7 @@
//娉ㄩ攢
sdk.loginOut(camera.getId());
//鐧诲綍
- camera = sdk.login(camera);
- if (camera.getLoginId() >= 0) {
- log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛锛�" + camera.getLoginId());
- camera.setUpdateBy(SecurityUtils.getUsername());
- ardCamerasService.updateArdCameras(camera);
- }
- else
- {
- log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触锛�" + camera.getLoginId());
- }
+ sdk.login(camera);
return toAjax(ardCamerasService.insertArdCameras(camera));
}
@@ -113,19 +110,10 @@
@PutMapping
public AjaxResult edit(@RequestBody ArdCameras camera) {
int i = ardCamerasService.updateArdCameras(camera);
- if(i>0)
- {
+ if (i > 0) {
ArdCameras cameras = ardCamerasService.selectArdCamerasById(camera.getId());
sdk.loginOut(cameras.getId());
- camera = sdk.login(cameras);
- if (camera.getLoginId() >= 0) {
- log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛锛�" + camera.getLoginId());
- ardCamerasService.updateArdCameras(camera);
- }
- else
- {
- log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触锛�" + camera.getLoginId());
- }
+ sdk.login(cameras);
}
return toAjax(i);
}
@@ -139,8 +127,32 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
for (String id : ids) {
- sdk.loginOut(id);
- }
+ sdk.loginOut(id);
+ }
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());
+ List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
+ option.put("idleTimeList", timeList);//绌洪棽鏃堕棿娈�
+ options.add(option);
+ }
+ return options;
+ }
+ @GetMapping("/getDeptAndCamera")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
+ public AjaxResult getDeptAndCamera()
+ {
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ return AjaxResult.success(deptAndCamera);
+ }
}
--
Gitblit v1.9.3