From f4495e2587c0ba7c2085d3db0cbaca0d3fa30489 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 10 十一月 2023 15:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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..af3ce6b 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;
@@ -127,4 +128,11 @@
return radarClient.guideInfoBack(guideInfo);
}
+ @GetMapping("/getDeptAndRadar")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
+ public AjaxResult getDeptAndCamera() {
+ Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
+ return AjaxResult.success(deptAndCamera);
+ }
+
}
--
Gitblit v1.9.3