From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 42ea28a..3d561ff 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
@@ -1,6 +1,7 @@
package com.ruoyi.device.radar.controller;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -55,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鍒楄〃
*/
@@ -126,5 +137,13 @@
{
return radarClient.guideInfoBack(guideInfo);
}
-
+ /**
+ * 鑾峰彇閮ㄩ棬鍜岄浄杈�
+ */
+ @GetMapping("/getDeptAndRadar")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
+ public AjaxResult getDeptAndCamera() {
+ Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
+ return AjaxResult.success(deptAndCamera);
+ }
}
--
Gitblit v1.9.3