From b61c4537a78d58412ef7ccd6e2c30152d807c5b7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 七月 2024 11:04:54 +0800
Subject: [PATCH] 电磁锁密码查询去除上一组密码修改提交
---
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
index af3ce6b..e196402 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
@@ -56,7 +56,17 @@
List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨradar鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation(value = "鏌ヨ闆疯揪绠＄悊鍒楄〃")
+ public TableDataInfo listNoPerm(ArdEquipRadar ardEquipRadar)
+ {
+ startPage();
+ List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭radar鍒楄〃
*/
@@ -127,12 +137,25 @@
{
return radarClient.guideInfoBack(guideInfo);
}
-
- @GetMapping("/getDeptAndRadar")
+ /**
+ * 鑾峰彇閮ㄩ棬鍜岄浄杈�
+ */
+ /*@GetMapping("/getDeptAndRadar")
@ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
public AjaxResult getDeptAndCamera() {
Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
return AjaxResult.success(deptAndCamera);
- }
+ }*/
+ /**
+ * 鑾峰彇閮ㄩ棬鍜岄浄杈�
+ * zns
+ */
+ @GetMapping("/getDeptAndRadar")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
+ public AjaxResult getDeptAndRadar() {
+ //Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
+ List<Map<String, Object>> deptAndRadar = ardEquipRadarService.getChildDeptAndRadarOwn(false);
+ return AjaxResult.success(deptAndRadar);
+ }
}
--
Gitblit v1.9.3