From bf2f8eed673c71b28364e91223bd6fe86be3b07c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 09 三月 2024 13:58:21 +0800
Subject: [PATCH] app申请去掉@ApiOperation修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 8ff1f37..8b0fe68 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.constant.CameraConstants;
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;
@@ -173,7 +174,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();
@@ -193,7 +194,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() {
--
Gitblit v1.9.3