From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init

---
 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