From 2a5cdf98e669f724758865135f5fefabf7c8f185 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 04 九月 2023 09:23:51 +0800
Subject: [PATCH] 井业务修改井号唯一性验证 电子围栏报警时间改为alarmTime
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 1e98e6f..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
@@ -3,12 +3,12 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
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.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;
@@ -27,11 +27,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
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;
+import java.util.*;
/**
* 鐩告満璁惧Controller
@@ -141,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);
@@ -152,7 +148,22 @@
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
public AjaxResult getDeptAndCamera()
{
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
return AjaxResult.success(deptAndCamera);
}
+ @GetMapping("/getDeptAndCameraWithCheckBox")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
+ public AjaxResult getDeptAndCameraWithCheckBox()
+ {
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ return AjaxResult.success(deptAndCamera);
+ }
+ @PostMapping("/getNearCamerasBycoordinate")
+ @ApiOperation("鑾峰彇闄勮繎鐨勭浉鏈�")
+ @ApiOperationSupport(includeParameters = {"targetPosition"})
+ public AjaxResult getNearCamerasBycoordinate(@RequestBody CameraCmd cmd)
+ {
+ TreeMap nearCamerasBycoordinate = ardCamerasService.getNearCamerasBycoordinate(cmd);
+ return AjaxResult.success(nearCamerasBycoordinate);
+ }
}
--
Gitblit v1.9.3