From bcecd69be3fb0d64e0a692ce328ca7b1f44dedf3 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期五, 02 六月 2023 19:08:34 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index beb9483..eca36f8 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -8,6 +8,7 @@
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -154,10 +155,17 @@
Map option = new HashMap();
option.put("value", item.getId());
option.put("label", item.getName());
+ option.put("channel", item.getChannel());
// option.put("description", item.getOilProduction());
options.add(option);
}
return options;
}
-
+ @GetMapping("/getDeptAndCamera")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
+ public AjaxResult getDeptAndCamera()
+ {
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ return AjaxResult.success(deptAndCamera);
+ }
}
--
Gitblit v1.9.3