From e73fb642838412794ad9f57680d9bd53e6198000 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Wed, 10 Jul 2024 00:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InviteStreamServiceImpl.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
index 96f5ea58c..3969bbdb2 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
@@ -7,9 +7,13 @@ import com.genersoft.iot.vmp.common.InviteSessionStatus;
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper;
+import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper;
 import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
 import com.genersoft.iot.vmp.media.event.media.MediaDepartureEvent;
 import com.genersoft.iot.vmp.service.IDeviceChannelService;
+import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.service.IInviteStreamService;
 import com.genersoft.iot.vmp.service.bean.ErrorCallback;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -37,15 +41,15 @@ public class InviteStreamServiceImpl implements IInviteStreamService {
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
 
-    @Autowired
-    private IVideoManagerStorage storage;
-
-    @Autowired
-    private IDeviceChannelService deviceChannelService;
-
     @Autowired
     private UserSetting userSetting;
 
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private DeviceChannelMapper deviceChannelMapper;
+
     /**
      * 流到来的处理
      */
@@ -67,7 +71,10 @@ public class InviteStreamServiceImpl implements IInviteStreamService {
             InviteInfo inviteInfo = getInviteInfoByStream(null, event.getStream());
             if (inviteInfo != null && (inviteInfo.getType() == InviteSessionType.PLAY || inviteInfo.getType() == InviteSessionType.PLAYBACK)) {
                 removeInviteInfo(inviteInfo);
-                deviceChannelService.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
+                Device device = deviceMapper.getDeviceByDeviceId(inviteInfo.getDeviceId());
+                if (device != null) {
+                    deviceChannelMapper.stopPlay(device.getId(), inviteInfo.getChannelId());
+                }
             }
         }
     }