From c551164c89f70e664b498c3a09e615928261e01a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 18:33:42 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 230 ++++++++++++++++++++-------------------------------------
1 files changed, 80 insertions(+), 150 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 6ebdbe2..e683da6 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
@@ -3,13 +3,18 @@
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;
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.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IInviteStreamService;
@@ -34,9 +39,7 @@
import javax.sip.SipException;
import java.text.ParseException;
import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -47,6 +50,8 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
+ @Autowired
+ private SIPCommander cmder;
@Autowired
private DynamicTask dynamicTask;
@@ -92,6 +97,12 @@
@Autowired
private IMediaServerService mediaServerService;
+ @Autowired
+ private AudioBroadcastManager audioBroadcastManager;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
@Override
public void online(Device device, SipTransactionInfo sipTransactionInfo) {
logger.info("[璁惧涓婄嚎] deviceId锛歿}->{}:{}", device.getDeviceId(), device.getIp(), device.getPort());
@@ -117,9 +128,10 @@
}
// 绗竴娆′笂绾� 鎴栧垯璁惧涔嬪墠鏄绾跨姸鎬�--杩涜閫氶亾鍚屾鍜岃澶囦俊鎭煡璇�
- if (device.getCreateTime() == null) {
+ if (deviceInDb == null) {
device.setOnLine(true);
device.setCreateTime(now);
+ device.setUpdateTime(now);
logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.add(device);
redisCatchStorage.updateDevice(device);
@@ -130,6 +142,10 @@
}
sync(device);
}else {
+
+ if (deviceInDb != null) {
+ device.setSwitchPrimarySubStream(deviceInDb.isSwitchPrimarySubStream());
+ }
if(!device.isOnLine()){
device.setOnLine(true);
device.setCreateTime(now);
@@ -178,7 +194,7 @@
@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;
@@ -207,6 +223,24 @@
redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
}
+ List<AudioBroadcastCatch> audioBroadcastCatches = audioBroadcastManager.get(deviceId);
+ if (audioBroadcastCatches.size() > 0) {
+ for (AudioBroadcastCatch audioBroadcastCatch : audioBroadcastCatches) {
+
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(deviceId, audioBroadcastCatch.getChannelId(), null, null);
+ if (sendRtpItem != null) {
+ redisCatchStorage.deleteSendRTPServer(deviceId, sendRtpItem.getChannelId(), null, null);
+ MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
+ zlmresTfulUtils.stopSendRtp(mediaInfo, param);
+ }
+
+ audioBroadcastManager.del(deviceId, audioBroadcastCatch.getChannelId());
+ }
+ }
}
@Override
@@ -380,63 +414,11 @@
if (device == null) {
return null;
}
- if (parentId == null || parentId.equals(deviceId)) {
- // 瀛楁牴鑺傜偣寮�濮嬫煡璇�
- List<DeviceChannel> rootNodes = getRootNodes(deviceId, TreeType.CIVIL_CODE.equals(device.getTreeType()), true, !onlyCatalog);
- return transportChannelsToTree(rootNodes, "");
+ if (ObjectUtils.isEmpty(parentId) ) {
+ parentId = deviceId;
}
-
- if (TreeType.CIVIL_CODE.equals(device.getTreeType())) {
- if (parentId.length()%2 != 0) {
- return null;
- }
- // 浣跨敤琛屾斂鍖哄垝灞曠ず鏍�
-// if (parentId.length() > 10) {
-// // TODO 鍙兘鏄鏀垮尯鍒掍笌涓氬姟鍒嗙粍娣锋潅鐨勬儏褰�
-// return null;
-// }
-
- if (parentId.length() == 10 ) {
- if (onlyCatalog) {
- return null;
- }
- // parentId涓鸿涓氱紪鐮侊紝 鍏朵笅涓嶄細鍐嶆湁琛屾斂鍖哄垝
- List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
- List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channels, parentId);
- return trees;
- }
- // 鏌ヨ鍏朵笅鐨勮鏀垮尯鍒掑拰鎽勫儚鏈�
- List<DeviceChannel> channelsForCivilCode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, parentId, parentId.length() + 2);
- if (!onlyCatalog) {
- List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
-
- for(DeviceChannel channel : channels) {
- boolean flag = false;
- for(DeviceChannel deviceChannel : channelsForCivilCode) {
- if(channel.getChannelId().equals(deviceChannel.getChannelId())) {
- flag = true;
- }
- }
- if(!flag) {
- channelsForCivilCode.add(channel);
- }
- }
- }
- List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channelsForCivilCode, parentId);
- return trees;
-
- }
- // 浣跨敤涓氬姟鍒嗙粍灞曠ず鏍�
- if (TreeType.BUSINESS_GROUP.equals(device.getTreeType())) {
- if (parentId.length() < 14 ) {
- return null;
- }
- List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null,null);
- List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(deviceChannels, parentId);
- return trees;
- }
-
- return null;
+ List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
+ return transportChannelsToTree(rootNodes, "");
}
@Override
@@ -445,42 +427,11 @@
if (device == null) {
return null;
}
- if (parentId == null || parentId.equals(deviceId)) {
- // 瀛楁牴鑺傜偣寮�濮嬫煡璇�
- List<DeviceChannel> rootNodes = getRootNodes(deviceId, TreeType.CIVIL_CODE.equals(device.getTreeType()), false, true);
- return rootNodes;
+ if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) {
+ return deviceChannelMapper.getSubChannelsByDeviceId(deviceId, null, false);
+ }else {
+ return deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, false);
}
-
- if (TreeType.CIVIL_CODE.equals(device.getTreeType())) {
- if (parentId.length()%2 != 0) {
- return null;
- }
- // 浣跨敤琛屾斂鍖哄垝灞曠ず鏍�
- if (parentId.length() > 10) {
- // TODO 鍙兘鏄鏀垮尯鍒掍笌涓氬姟鍒嗙粍娣锋潅鐨勬儏褰�
- return null;
- }
-
- if (parentId.length() == 10 ) {
- // parentId涓鸿涓氱紪鐮侊紝 鍏朵笅涓嶄細鍐嶆湁琛屾斂鍖哄垝
- List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
- return channels;
- }
- // 鏌ヨ鍏朵笅鐨勮鏀垮尯鍒掑拰鎽勫儚鏈�
- List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
- return channels;
-
- }
- // 浣跨敤涓氬姟鍒嗙粍灞曠ず鏍�
- if (TreeType.BUSINESS_GROUP.equals(device.getTreeType())) {
- if (parentId.length() < 14 ) {
- return null;
- }
- List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null,null);
- return deviceChannels;
- }
-
- return null;
}
private List<BaseTree<DeviceChannel>> transportChannelsToTree(List<DeviceChannel> channels, String parentId) {
@@ -500,65 +451,26 @@
node.setPid(parentId);
node.setBasicData(channel);
node.setParent(false);
- if (channel.getChannelId().length() > 8) {
- 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 {
+ if (channel.getChannelId().length() <= 8) {
node.setParent(true);
+ }else {
+ if (channel.getChannelId().length() != 20) {
+ node.setParent(channel.getParental() == 1);
+ }else {
+ try {
+ int type = Integer.parseInt(channel.getChannelId().substring(10, 13));
+ if (type == 215 || type == 216 || type == 200) {
+ node.setParent(true);
+ }
+ }catch (NumberFormatException e) {
+ node.setParent(false);
+ }
+ }
}
treeNotes.add(node);
}
Collections.sort(treeNotes);
return treeNotes;
- }
-
- private List<DeviceChannel> getRootNodes(String deviceId, boolean isCivilCode, boolean haveCatalog, boolean haveChannel) {
- if (!haveCatalog && !haveChannel) {
- return null;
- }
- List<DeviceChannel> result = new ArrayList<>();
- if (isCivilCode) {
- // 浣跨敤琛屾斂鍖哄垝
- Integer length= deviceChannelMapper.getChannelMinLength(deviceId);
- if (length == null) {
- return null;
- }
- if (length <= 10) {
- if (haveCatalog) {
- List<DeviceChannel> provinceNode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, null, length);
- if (provinceNode != null && provinceNode.size() > 0) {
- result.addAll(provinceNode);
- }
- }
-
- if (haveChannel) {
- // 鏌ヨ閭ｄ簺civilCode涓嶅湪閫氶亾涓殑涓嶈鑼冮�氶亾锛屾斁缃湪鏍圭洰褰�
- List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCivilCode(deviceId);
- if (nonstandardNode != null && nonstandardNode.size() > 0) {
- result.addAll(nonstandardNode);
- }
- }
- }else {
- if (haveChannel) {
- List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, null, null, null, null,null);
- if (deviceChannels != null && deviceChannels.size() > 0) {
- result.addAll(deviceChannels);
- }
- }
- }
-
- }else {
- // 浣跨敤涓氬姟鍒嗙粍+铏氭嫙缁勭粐
-
- // 鍙幏鍙栦笟鍔″垎缁�
- List<DeviceChannel> deviceChannels = deviceChannelMapper.getBusinessGroups(deviceId, ChannelIdType.BUSINESS_GROUP);
- if (deviceChannels != null && deviceChannels.size() > 0) {
- result.addAll(deviceChannels);
- }
- }
- return result;
}
@Override
@@ -581,6 +493,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());
}
@@ -592,7 +520,6 @@
}
deviceInStore.setSdpIp(device.getSdpIp());
deviceInStore.setCharset(device.getCharset());
- deviceInStore.setTreeType(device.getTreeType());
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (device.getSubscribeCycleForCatalog() > 0) {
@@ -648,6 +575,9 @@
}catch (Exception e) {
dataSourceTransactionManager.rollback(transactionStatus);
}
+ if (result) {
+ redisCatchStorage.removeDevice(deviceId);
+ }
return result;
}
--
Gitblit v1.8.0