From 972c99ffc2c884bf24044c59b21674052582c42c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期五, 08 三月 2024 18:38:55 +0800 Subject: [PATCH] 增加日志 --- ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 21 ++++++++++++++++++--- 1 files changed, 18 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..6434b46 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; @@ -61,7 +62,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 +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(); @@ -184,7 +194,12 @@ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true); return AjaxResult.success(deptAndCamera); } - + @GetMapping("/getDeptAndCamera1") + @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�1") + public AjaxResult getDeptAndCamera1() { + List<DeptAndCamerasDto> deptAndCamera = ardCamerasService.getChildDeptAndCamera(); + return AjaxResult.success(deptAndCamera); + } @GetMapping("/getDeptAndCameraWithCheckBox") @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)") public AjaxResult getDeptAndCameraWithCheckBox() { -- Gitblit v1.9.3