From cd43cc9fa81bed42bce7c42a537c1eadb8df9e46 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Thu, 7 Sep 2023 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81(21=E4=BD=8D)=20=E5=9B=BD=E6=A0=87=E8=AE=BE=E5=A4=87id?=
 =?UTF-8?q?(20=E4=BD=8D)=20=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wvp/api/device/DeviceController.java      | 20 ++++++++++++++++---
 .../wvp/api/{ => video}/VideoController.java  |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)
 rename gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/{ => video}/VideoController.java (97%)

diff --git a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
index c816e6a..19e1738 100644
--- a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
+++ b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
@@ -18,9 +18,8 @@ import org.springdoc.core.annotations.ParameterObject;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 @Slf4j
 @Tag(name = "设备信息")
 @RestController
@@ -40,8 +39,23 @@ public class DeviceController {
         return JsonResponse.success(PageWrapper.of(deviceService.getDevicesWithPage(dto.getPage(), dto.getSize())));
     }
 
+    @Operation(summary = "添加设备")
     @PostJson("/add")
     public JsonResponse<Boolean> addDevice(@RequestBody AddDeviceDTO dto) {
         return JsonResponse.success(deviceService.addDevice(DeviceDTOConvertor.INSTANCE.dto2dao(dto)));
     }
+
+    @Operation(summary = "根据设备编码(21位) 查询指定设备信息")
+    @GetJson("/info/deviceCode")
+    public JsonResponse<WvpProxyDevice> infoByDeviceCode(@RequestParam String deviceCode) {
+        WvpProxyDevice wvpProxyDevice = deviceService.getDeviceByDeviceCode(deviceCode).orElse(null);
+        return JsonResponse.success(wvpProxyDevice);
+    }
+
+    @Operation(summary = "根据国标id(20位) 查询指定设备信息")
+    @GetJson("/info/gbDeviceId")
+    public JsonResponse<WvpProxyDevice> infoByGbDeviceId(@RequestParam String gbDeviceId) {
+        WvpProxyDevice wvpProxyDevice = deviceService.getDeviceByGbDeviceId(gbDeviceId).orElse(null);
+        return JsonResponse.success(wvpProxyDevice);
+    }
 }
diff --git a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/VideoController.java b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/video/VideoController.java
similarity index 97%
rename from gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/VideoController.java
rename to gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/video/VideoController.java
index 3ac8d05..2444c00 100644
--- a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/VideoController.java
+++ b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/video/VideoController.java
@@ -1,4 +1,4 @@
-package cn.skcks.docking.gb28181.wvp.api;
+package cn.skcks.docking.gb28181.wvp.api.video;
 
 import cn.skcks.docking.gb28181.media.config.ZlmMediaConfig;
 import cn.skcks.docking.gb28181.wvp.config.SwaggerConfig;