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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 ccbbc0a..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,9 +1,13 @@
package com.ruoyi.device.radar.controller;
import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.device.radar.domain.GuideInfo;
+import com.ruoyi.utils.forest.RadarClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,9 +40,10 @@
@Api(tags = "闆疯揪绠＄悊鎺ュ彛")
public class ArdEquipRadarController extends BaseController
{
- @Autowired
+ @Resource
private IArdEquipRadarService ardEquipRadarService;
-
+ @Resource
+ private RadarClient radarClient;
/**
* 鏌ヨradar鍒楄〃
*/
@@ -112,4 +117,22 @@
{
return toAjax(ardEquipRadarService.deleteArdEquipRadarByIds(ids));
}
+
+ /**
+ * 瑙掑害寮曞淇℃伅鍙嶉
+ */
+ @ApiOperation(value = "瑙掑害寮曞淇℃伅鍙嶉")
+ @PostMapping("/guideInfoBack")
+ public AjaxResult guideInfoBack(@RequestBody GuideInfo guideInfo)
+ {
+ return radarClient.guideInfoBack(guideInfo);
+ }
+
+ @GetMapping("/getDeptAndRadar")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
+ public AjaxResult getDeptAndCamera() {
+ Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
+ return AjaxResult.success(deptAndCamera);
+ }
+
}
--
Gitblit v1.9.3