From 7b9bb72cd616ddbcb66e7d7384ee512334e64453 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 12 三月 2024 09:40:07 +0800
Subject: [PATCH] app光电查询修提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 15 ++++++++++++---
1 files changed, 12 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 6434b46..1f5b15d 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,6 +5,7 @@
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;
@@ -194,9 +195,9 @@
Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
return AjaxResult.success(deptAndCamera);
}
- @GetMapping("/getDeptAndCamera1")
- @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�1")
- public AjaxResult getDeptAndCamera1() {
+ @GetMapping("/getDeptAndCameraByRole")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈烘寜瑙掕壊")
+ public AjaxResult getDeptAndCameraByRole() {
List<DeptAndCamerasDto> deptAndCamera = ardCamerasService.getChildDeptAndCamera();
return AjaxResult.success(deptAndCamera);
}
@@ -214,4 +215,12 @@
TreeMap nearCamerasBycoordinate = ardCamerasService.getNearCamerasBycoordinate(cmd);
return AjaxResult.success(nearCamerasBycoordinate);
}
+
+ @GetMapping("/getCamerasByDeptId")
+ @ApiOperation("鑾峰彇鏉冮檺鍙婁笅灞炴潈闄愪笅鐨勭浉鏈�")
+ public AjaxResult getCamerasByDeptId() {
+ Long deptId = SecurityUtils.getDeptId();
+ List<Map<String,Object>> camerasList = ardCamerasService.getCamerasByDeptId(deptId);
+ return AjaxResult.success(camerasList);
+ }
}
--
Gitblit v1.9.3