From 55811ddff81bc142eac3c27e44f30c55e84311f1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 20 七月 2024 13:25:19 +0800
Subject: [PATCH] 三一车辆遗漏提交
---
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 3d561ff..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
@@ -140,10 +140,22 @@
/**
* 鑾峰彇閮ㄩ棬鍜岄浄杈�
*/
- @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