From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 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 9a28677..9eb2008 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,8 +5,10 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.constant.CameraConstants;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.domain.DeptAndCamerasDto;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -61,7 +63,16 @@
List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ鐩告満璁惧鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation("鏌ヨ鐩告満璁惧鍒楄〃")
+ public TableDataInfo listNoPerm(ArdCameras ardCamera) {
+ startPage();
+ List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭鐩告満璁惧鍒楄〃
*/
@@ -164,7 +175,7 @@
@ApiOperation("閫夋嫨鐩告満鏁版嵁")
public List options(ArdCameras ardCameras) {
List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
- System.out.println("list:"+list.size());
+ //System.out.println("list:"+list.size());
List options = new ArrayList();
for (ArdCameras item : list) {
Map option = new HashMap();
@@ -184,7 +195,12 @@
Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
return AjaxResult.success(deptAndCamera);
}
-
+ @GetMapping("/getDeptAndCameraByRole")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈烘寜瑙掕壊")
+ public AjaxResult getDeptAndCameraByRole() {
+ List<DeptAndCamerasDto> deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ return AjaxResult.success(deptAndCamera);
+ }
@GetMapping("/getDeptAndCameraWithCheckBox")
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
public AjaxResult getDeptAndCameraWithCheckBox() {
@@ -199,4 +215,28 @@
TreeMap nearCamerasBycoordinate = ardCamerasService.getNearCamerasBycoordinate(cmd);
return AjaxResult.success(nearCamerasBycoordinate);
}
+
+ @GetMapping("/getCamerasByDeptId")
+ @ApiOperation("鑾峰彇鏉冮檺鍙婁笅灞炴潈闄愪笅鐨勭浉鏈�")
+ public AjaxResult getCamerasByDeptId() {
+ Long deptId = SecurityUtils.getDeptId();
+ String userId = SecurityUtils.getUserId();
+ List<Map<String,Object>> camerasList = ardCamerasService.getCamerasByDeptId(deptId,userId);
+ return AjaxResult.success(camerasList);
+ }
+
+ @PostMapping("/getCameraOperationByCameraId")
+ @ApiOperation("鏌ョ湅鐩告満鍙惁鎿嶆帶")
+ public AjaxResult getCameraOperationByCameraId(@RequestBody Map<String,String> map) {
+ String userId = SecurityUtils.getUserId();
+ Boolean flag = ardCamerasService.getCameraOperationByCameraId(map.get("id"),userId);
+ return AjaxResult.success(flag);
+ }
+
+ @PostMapping("/getChannelByCameraId")
+ @ApiOperation("鑾峰彇鐩告満閫氶亾")
+ public AjaxResult getChannelByCameraId(@RequestBody Map<String,String> map) {
+ Map<String,Object> result = ardCamerasService.getChannelByCameraId(map.get("id"));
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3