From b092035af19a6efdb63df650b36eadfb563d7adb Mon Sep 17 00:00:00 2001
From: zxb <919411476@qq.com>
Date: Thu, 21 Sep 2023 23:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E6=A0=87=E7=BA=A7=E8=81=94=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=9A=E7=BA=A7=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E6=97=B6=E6=89=BE=E4=B8=8D=E5=88=B0=20=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E7=9A=84=20=E8=AE=BE=E5=A4=87=20=E5=92=8C=20=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/impl/InviteRequestProcessor.java      | 15 +++++++++------
 .../vmp/storager/dao/PlatformChannelMapper.java   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index d2d9657b..0a19aaa5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -312,13 +312,16 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                 if (channel != null) {
                     device = storager.queryVideoDeviceByPlatformIdAndChannelId(requesterId, channelId);
                     if (device == null) {
-                        logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channel);
-                        try {
-                            responseAck(request, Response.SERVER_INTERNAL_ERROR);
-                        } catch (SipException | InvalidArgumentException | ParseException e) {
-                            logger.error("[命令发送失败] invite 未找到设备信息: {}", e.getMessage());
+                        device = storager.queryDeviceInfoByPlatformIdAndChannelId(requesterId, channelId);
+                        if (device == null) {
+                            logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channelId);
+                            try {
+                                responseAck(request, Response.SERVER_INTERNAL_ERROR);
+                            } catch (SipException | InvalidArgumentException | ParseException e) {
+                                logger.error("[命令发送失败] invite 未找到设备信息: {}", e.getMessage());
+                            }
+                            return;
                         }
-                        return;
                     }
                     mediaServerItem = playService.getNewMediaServerItem(device);
                     if (mediaServerItem == null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
index 1a2f1911..364eaf64 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
@@ -108,7 +108,7 @@ public interface PlatformChannelMapper {
             "</script>")
     int delChannelForGBByCatalogId(String platformId, String catalogId);
 
-    @Select("select dc.channel_id dc.device_id,dc.name,d.manufacturer,d.model,d.firmware\n" +
+    @Select("select dc.channel_id,dc.device_id,dc.name,d.manufacturer,d.model,d.firmware\n" +
             "from wvp_platform_gb_channel pgc\n" +
             "         left join wvp_device_channel dc on dc.id = pgc.device_channel_id\n" +
             "         left join wvp_device d on dc.device_id = d.device_id\n" +