From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 16 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 48de5d2..cc237c9 100644
--- 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,17 +1,21 @@
package com.genersoft.iot.vmp.service.impl;
+import com.genersoft.iot.vmp.common.InviteSessionType;
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.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
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.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
@@ -19,7 +23,7 @@
import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +51,8 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
@Autowired
+ private SIPCommander cmder;
+ @Autowired
private DynamicTask dynamicTask;
@Autowired
@@ -57,6 +63,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
@Autowired
private DeviceMapper deviceMapper;
@@ -97,7 +106,7 @@
String now = DateUtil.getNow();
if (deviceInRedis != null && deviceInDb == null) {
// redis 瀛樺湪鑴忔暟鎹�
- redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
+ inviteStreamService.clearInviteInfo(device.getDeviceId());
}
device.setUpdateTime(now);
if (device.getKeepaliveIntervalTime() == 0) {
@@ -114,7 +123,7 @@
// 绗竴娆′笂绾� 鎴栧垯璁惧涔嬪墠鏄绾跨姸鎬�--杩涜閫氶亾鍚屾鍜岃澶囦俊鎭煡璇�
if (device.getCreateTime() == null) {
- device.setOnline(1);
+ device.setOnLine(true);
device.setCreateTime(now);
logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.add(device);
@@ -126,8 +135,12 @@
}
sync(device);
}else {
- if(device.getOnline() == 0){
- device.setOnline(1);
+
+ if (deviceInDb != null) {
+ device.setSwitchPrimarySubStream(deviceInDb.isSwitchPrimarySubStream());
+ }
+ if(!device.isOnLine()){
+ device.setOnLine(true);
device.setCreateTime(now);
deviceMapper.update(device);
redisCatchStorage.updateDevice(device);
@@ -165,18 +178,23 @@
String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + device.getDeviceId();
// 濡傛灉绗竴娆℃敞鍐岄偅涔堝繀椤诲湪60 * 3鏃堕棿鍐呮敹鍒颁竴涓績璺筹紝鍚﹀垯璁惧绂荤嚎
dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId(), "棣栨娉ㄥ唽鍚庢湭鑳芥敹鍒板績璺�"), device.getKeepaliveIntervalTime() * 1000 * 3);
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
+ }
+
}
@Override
public void offline(String deviceId, String reason) {
- logger.error("[璁惧绂荤嚎]锛寋}, device锛歿}", reason, deviceId);
+ logger.warn("[璁惧绂荤嚎]锛寋}, device锛歿}", reason, deviceId);
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) {
return;
}
String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId;
dynamicTask.stop(registerExpireTaskKey);
- device.setOnline(0);
+ device.setOnLine(false);
redisCatchStorage.updateDevice(device);
deviceMapper.update(device);
//杩涜閫氶亾绂荤嚎
@@ -193,6 +211,11 @@
// 绉婚櫎璁㈤槄
removeCatalogSubscribe(device);
removeMobilePositionSubscribe(device);
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
+ }
+
}
@Override
@@ -217,7 +240,7 @@
}
logger.info("[绉婚櫎鐩綍璁㈤槄]: {}", device.getDeviceId());
String taskKey = device.getDeviceId() + "catalog";
- if (device.getOnline() == 1) {
+ if (device.isOnLine()) {
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
@@ -250,7 +273,7 @@
}
logger.info("[绉婚櫎绉诲姩浣嶇疆璁㈤槄]: {}", device.getDeviceId());
String taskKey = device.getDeviceId() + "mobile_position";
- if (device.getOnline() == 1) {
+ if (device.isOnLine()) {
Runnable runnable = dynamicTask.get(taskKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
@@ -317,7 +340,7 @@
@Override
public void checkDeviceStatus(Device device) {
- if (device == null || device.getOnline() == 0) {
+ if (device == null || !device.isOnLine()) {
return;
}
try {
@@ -487,8 +510,10 @@
node.setBasicData(channel);
node.setParent(false);
if (channel.getChannelId().length() > 8) {
- String gbCodeType = channel.getChannelId().substring(10, 13);
- node.setParent(gbCodeType.equals(ChannelIdType.BUSINESS_GROUP) || gbCodeType.equals(ChannelIdType.VIRTUAL_ORGANIZATION) );
+ if (channel.getChannelId().length() > 13) {
+ String gbCodeType = channel.getChannelId().substring(10, 13);
+ node.setParent(gbCodeType.equals(ChannelIdType.BUSINESS_GROUP) || gbCodeType.equals(ChannelIdType.VIRTUAL_ORGANIZATION) );
+ }
}else {
node.setParent(true);
}
@@ -519,7 +544,7 @@
if (haveChannel) {
// 鏌ヨ閭ｄ簺civilCode涓嶅湪閫氶亾涓殑涓嶈鑼冮�氶亾锛屾斁缃湪鏍圭洰褰�
- List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCiviCode(deviceId);
+ List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCivilCode(deviceId);
if (nonstandardNode != null && nonstandardNode.size() > 0) {
result.addAll(nonstandardNode);
}
@@ -552,7 +577,7 @@
@Override
public void addDevice(Device device) {
- device.setOnline(0);
+ device.setOnLine(false);
device.setCreateTime(DateUtil.getNow());
device.setUpdateTime(DateUtil.getNow());
deviceMapper.addCustomDevice(device);
@@ -565,6 +590,22 @@
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());
}
@@ -636,8 +677,10 @@
}
@Override
- public ResourceBaceInfo getOverview() {
- return deviceMapper.getOverview();
+ public ResourceBaseInfo getOverview() {
+ List<Device> onlineDevices = deviceMapper.getOnlineDevices();
+ List<Device> all = deviceMapper.getAll();
+ return new ResourceBaseInfo(all.size(), onlineDevices.size());
}
@Override
--
Gitblit v1.8.0