From 8d1bc7117022f204d2d8e2b0ee608e49682fd416 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Mon, 11 Sep 2023 10:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E8=A1=A8?=
 =?UTF-8?q?=20=E7=B4=A2=E5=BC=95=E5=AE=9A=E4=B9=89=20=E4=B8=8E=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=20=E9=80=BB=E8=BE=91=20=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=B8=8B=E7=BA=A7=E5=B9=B3=E5=8F=B0=20=E6=9C=89?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=AE=BE=E5=A4=87,=20=E6=AF=8F=E4=B8=AA?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=BA=E4=B8=80=E4=B8=AA=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orm/mybatis/operation/WvpProxyOperateTableMapper.xml    | 2 +-
 .../skcks/docking/gb28181/wvp/service/wvp/WvpService.java   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gb28181-wvp-proxy-orm/src/main/java/cn/skcks/docking/gb28181/wvp/orm/mybatis/operation/WvpProxyOperateTableMapper.xml b/gb28181-wvp-proxy-orm/src/main/java/cn/skcks/docking/gb28181/wvp/orm/mybatis/operation/WvpProxyOperateTableMapper.xml
index f33ffab..3a09c61 100644
--- a/gb28181-wvp-proxy-orm/src/main/java/cn/skcks/docking/gb28181/wvp/orm/mybatis/operation/WvpProxyOperateTableMapper.xml
+++ b/gb28181-wvp-proxy-orm/src/main/java/cn/skcks/docking/gb28181/wvp/orm/mybatis/operation/WvpProxyOperateTableMapper.xml
@@ -4,7 +4,7 @@
 
 <mapper namespace="cn.skcks.docking.gb28181.wvp.orm.mybatis.operation.WvpProxyOperateTableMapper">
     <update id="createDeviceTable">
-        CREATE TABLE `wvp_proxy_device` (
+        CREATE TABLE IF NOT EXISTS `wvp_proxy_device` (
                                             `id` bigint(20) NOT NULL AUTO_INCREMENT,
                                             `device_code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
                                             `gb_device_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
index c400953..fd8b5d6 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
@@ -27,7 +27,6 @@ import cn.skcks.docking.gb28181.wvp.service.download.DownloadService;
 import cn.skcks.docking.gb28181.wvp.service.video.RecordService;
 import cn.skcks.docking.gb28181.wvp.utils.RetryUtil;
 import com.github.rholder.retry.*;
-import io.swagger.v3.core.util.Json;
 import jakarta.servlet.AsyncContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -128,7 +127,10 @@ public class WvpService {
         log.info("wvp 登录成功 token => {}", token);
 
         log.debug("通过 wvp 查询设备 国标id(gbDeviceId => {}) 通道信息", deviceId);
-        JsonResponse<GetDeviceChannelsResp> deviceChannels = wvpProxyClient.getDeviceChannels(token, deviceId, GetDeviceChannelsReq.builder().build());
+        JsonResponse<GetDeviceChannelsResp> deviceChannels = wvpProxyClient.getDeviceChannels(
+                token,
+                deviceId,
+                GetDeviceChannelsReq.builder().query(channelId).build());
         if (deviceChannels.getData() == null || deviceChannels.getData().getTotal() == 0) {
             writeErrorToResponse(response, JsonResponse.error(MessageFormat.format("未能获取 设备: {0}, 国标id: {1}, 的通道信息", deviceCode, deviceId)));
             return JsonResponse.success(null);