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 | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 1f5b15d..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
@@ -220,7 +220,23 @@
@ApiOperation("鑾峰彇鏉冮檺鍙婁笅灞炴潈闄愪笅鐨勭浉鏈�")
public AjaxResult getCamerasByDeptId() {
Long deptId = SecurityUtils.getDeptId();
- List<Map<String,Object>> camerasList = ardCamerasService.getCamerasByDeptId(deptId);
+ 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