From 2809c11f8611aea88673c105945a8e093ff1efc7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 30 五月 2023 13:54:26 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 1ba9a14..beb9483 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
@@ -5,8 +5,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.hiksdk.service.impl.hikClientServiceImpl;
-import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
@@ -27,7 +26,10 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鐩告満璁惧Controller
@@ -41,7 +43,7 @@
@Api(tags = "鐩告満绠＄悊鎺ュ彛")
public class ArdCamerasController extends BaseController {
@Resource
- private hikClientServiceImpl sdk;
+ private HikClientServiceImpl sdk;
@Resource
private IArdCamerasService ardCamerasService;
@@ -143,4 +145,19 @@
}
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
}
+ @GetMapping("/options")
+ @ApiOperation("閫夋嫨鐩告満鏁版嵁")
+ public List options(ArdCameras ardCameras) {
+ List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
+ List options = new ArrayList();
+ for (ArdCameras item : list) {
+ Map option = new HashMap();
+ option.put("value", item.getId());
+ option.put("label", item.getName());
+ // option.put("description", item.getOilProduction());
+ options.add(option);
+ }
+ return options;
+ }
+
}
--
Gitblit v1.9.3