From 509d9b3cbba7ba8fdc7466c34e46db70d41517a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:22:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 99 ++++++++++++++++++++++---------------------------
1 files changed, 45 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 373c862..3da2845 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -1,10 +1,10 @@
package com.genersoft.iot.vmp.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
@@ -145,10 +145,6 @@
}
sync(device);
}else {
-
- if (deviceInDb != null) {
- device.setSwitchPrimarySubStream(deviceInDb.isSwitchPrimarySubStream());
- }
if(!device.isOnLine()){
device.setOnLine(true);
device.setCreateTime(now);
@@ -238,12 +234,8 @@
}
}
// 绉婚櫎璁㈤槄
- removeCatalogSubscribe(device);
- removeMobilePositionSubscribe(device);
- if (userSetting.getDeviceStatusNotify()) {
- // 鍙戦�乺edis娑堟伅
- redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
- }
+ removeCatalogSubscribe(device, null);
+ removeMobilePositionSubscribe(device, null);
List<AudioBroadcastCatch> audioBroadcastCatches = audioBroadcastManager.get(deviceId);
if (audioBroadcastCatches.size() > 0) {
@@ -281,7 +273,7 @@
}
@Override
- public boolean removeCatalogSubscribe(Device device) {
+ public boolean removeCatalogSubscribe(Device device, CommonCallback<Boolean> callback) {
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
@@ -291,7 +283,7 @@
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
- subscribeTask.stop();
+ subscribeTask.stop(callback);
}
}
dynamicTask.stop(taskKey);
@@ -314,7 +306,7 @@
}
@Override
- public boolean removeMobilePositionSubscribe(Device device) {
+ public boolean removeMobilePositionSubscribe(Device device, CommonCallback<Boolean> callback) {
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
@@ -324,7 +316,7 @@
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
- subscribeTask.stop();
+ subscribeTask.stop(callback);
}
}
dynamicTask.stop(taskKey);
@@ -515,21 +507,6 @@
logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
return;
}
- if(deviceInStore.isSwitchPrimarySubStream() != device.isSwitchPrimarySubStream()){
- //褰撲慨鏀硅澶囩殑涓诲瓙鐮佹祦寮�鍏虫椂锛岄渶瑕佹牎楠屾槸鍚﹀瓨鍦ㄦ祦锛屽鏋滃瓨鍦ㄦ祦鍒欑洿鎺ュ叧闂�
- List<SsrcTransaction> ssrcTransactionForAll = streamSession.getSsrcTransactionForAll(device.getDeviceId(), null, null, null);
- if(ssrcTransactionForAll != null){
- for (SsrcTransaction ssrcTransaction: ssrcTransactionForAll) {
- try {
- cmder.streamByeCmd(device, ssrcTransaction.getChannelId(), ssrcTransaction.getStream(), null, null);
- } catch (InvalidArgumentException | SsrcTransactionNotFoundException | ParseException | SipException e) {
- throw new RuntimeException(e);
- }
- }
- }
- deviceChannelMapper.clearPlay(device.getDeviceId());
- inviteStreamService.clearInviteInfo(device.getDeviceId());
- }
if (!ObjectUtils.isEmpty(device.getName())) {
deviceInStore.setName(device.getName());
@@ -552,39 +529,54 @@
if (!ObjectUtils.isEmpty(device.getStreamMode())) {
deviceInStore.setStreamMode(device.getStreamMode());
}
-
-
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
if (device.getSubscribeCycleForCatalog() > 0) {
// 鑻ュ凡寮�鍚闃咃紝浣嗚闃呭懆鏈熶笉鍚岋紝鍒欏厛鍙栨秷
if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
- removeCatalogSubscribe(deviceInStore);
+ removeCatalogSubscribe(deviceInStore, result->{
+ // 寮�鍚闃�
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ addCatalogSubscribe(deviceInStore);
+ // 鍥犱负鏄紓姝ユ墽琛岋紝闇�瑕佸湪杩欓噷鏇存柊涓嬫暟鎹�
+ deviceMapper.updateCustom(deviceInStore);
+ redisCatchStorage.updateDevice(deviceInStore);
+ });
+ }else {
+ // 寮�鍚闃�
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ addCatalogSubscribe(deviceInStore);
}
- // 寮�鍚闃�
- deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
- addCatalogSubscribe(deviceInStore);
+
}else if (device.getSubscribeCycleForCatalog() == 0) {
// 鍙栨秷璁㈤槄
- deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
- removeCatalogSubscribe(deviceInStore);
+ deviceInStore.setSubscribeCycleForCatalog(0);
+ removeCatalogSubscribe(deviceInStore, null);
}
}
-
// 绉诲姩浣嶇疆璁㈤槄鐩稿叧鐨勪俊鎭�
- if (device.getSubscribeCycleForMobilePosition() > 0) {
- if (deviceInStore.getSubscribeCycleForMobilePosition() == 0 || deviceInStore.getSubscribeCycleForMobilePosition() != device.getSubscribeCycleForMobilePosition()) {
- deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
- deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
- // 寮�鍚闃�
- addMobilePositionSubscribe(deviceInStore);
- }
- }else if (device.getSubscribeCycleForMobilePosition() == 0) {
- if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
- deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
- deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
+ if (deviceInStore.getSubscribeCycleForMobilePosition() != device.getSubscribeCycleForMobilePosition()) {
+ if (device.getSubscribeCycleForMobilePosition() > 0) {
+ // 鑻ュ凡寮�鍚闃咃紝浣嗚闃呭懆鏈熶笉鍚岋紝鍒欏厛鍙栨秷
+ if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
+ removeMobilePositionSubscribe(deviceInStore, result->{
+ // 寮�鍚闃�
+ deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
+ addMobilePositionSubscribe(deviceInStore);
+ // 鍥犱负鏄紓姝ユ墽琛岋紝闇�瑕佸湪杩欓噷鏇存柊涓嬫暟鎹�
+ deviceMapper.updateCustom(deviceInStore);
+ redisCatchStorage.updateDevice(deviceInStore);
+ });
+ }else {
+ // 寮�鍚闃�
+ deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
+ addMobilePositionSubscribe(deviceInStore);
+ }
+
+ }else if (device.getSubscribeCycleForMobilePosition() == 0) {
// 鍙栨秷璁㈤槄
- removeMobilePositionSubscribe(deviceInStore);
+ deviceInStore.setSubscribeCycleForCatalog(0);
+ removeCatalogSubscribe(deviceInStore, null);
}
}
if (deviceInStore.getGeoCoordSys() != null) {
@@ -603,10 +595,9 @@
deviceInStore.setSsrcCheck(device.isSsrcCheck());
//浣滀负娑堟伅閫氶亾
deviceInStore.setAsMessageChannel(device.isAsMessageChannel());
-
- // 鏇存柊redis
+
deviceMapper.updateCustom(deviceInStore);
- redisCatchStorage.removeDevice(deviceInStore.getDeviceId());
+ redisCatchStorage.updateDevice(deviceInStore);
}
@Override
--
Gitblit v1.8.0