From 221f99c764b51c3cd284c6e5a41492c26c5c7ffc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 09 九月 2022 17:06:19 +0800
Subject: [PATCH] 优化sip消息
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 259 insertions(+), 19 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 e4a2a19..00e6783 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,26 +1,34 @@
package com.genersoft.iot.vmp.service.impl;
import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+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.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
-import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.support.incrementer.AbstractIdentityColumnMaxValueIncrementer;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -50,6 +58,15 @@
private DeviceMapper deviceMapper;
@Autowired
+ private IDeviceChannelService deviceChannelService;
+
+ @Autowired
+ private DeviceChannelMapper deviceChannelMapper;
+
+ @Autowired
+ private IVideoManagerStorage storage;
+
+ @Autowired
private ISIPCommander commander;
@Autowired
@@ -68,13 +85,12 @@
if (deviceInRedis != null && deviceInDb == null) {
// redis 瀛樺湪鑴忔暟鎹�
redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
-
}
device.setUpdateTime(now);
- device.setOnline(1);
- // 绗竴娆′笂绾�
+ // 绗竴娆′笂绾� 鎴栧垯璁惧涔嬪墠鏄绾跨姸鎬�--杩涜閫氶亾鍚屾鍜岃澶囦俊鎭煡璇�
if (device.getCreateTime() == null) {
+ device.setOnline(1);
device.setCreateTime(now);
logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.add(device);
@@ -82,8 +98,20 @@
commander.deviceInfoQuery(device);
sync(device);
}else {
- deviceMapper.update(device);
- redisCatchStorage.updateDevice(device);
+ if(device.getOnline() == 0){
+ device.setOnline(1);
+ device.setCreateTime(now);
+ logger.info("[璁惧涓婄嚎,绂荤嚎鐘舵�佷笅閲嶆柊娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
+ deviceMapper.update(device);
+ redisCatchStorage.updateDevice(device);
+ commander.deviceInfoQuery(device);
+ sync(device);
+ // TODO 濡傛灉璁惧涓嬬殑閫氶亾绾ц仈鍒颁簡鍏朵粬骞冲彴锛岄偅涔堥渶瑕佸彂閫佷簨浠舵垨鑰卬otify缁欎笂绾у钩鍙�
+ }else {
+ deviceMapper.update(device);
+ redisCatchStorage.updateDevice(device);
+ }
+
}
// 涓婄嚎娣诲姞璁㈤槄
@@ -96,7 +124,6 @@
}
// 鍒锋柊杩囨湡浠诲姟
String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
- dynamicTask.stop(registerExpireTaskKey);
dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getExpires() * 1000);
}
@@ -111,6 +138,8 @@
device.setOnline(0);
redisCatchStorage.updateDevice(device);
deviceMapper.update(device);
+ //杩涜閫氶亾绂荤嚎
+ deviceChannelMapper.offlineByDeviceId(deviceId);
// 绂荤嚎閲婃斁鎵�鏈塻src
List<SsrcTransaction> ssrcTransactions = streamSession.getSsrcTransactionForAll(deviceId, null, null, null);
if (ssrcTransactions != null && ssrcTransactions.size() > 0) {
@@ -133,7 +162,7 @@
logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
// 娣诲姞鐩綍璁㈤槄
CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander, dynamicTask);
- // 鎻愬墠寮�濮嬪埛鏂拌闃�
+ // 鍒锋柊璁㈤槄
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForCatalog(),30);
// 璁剧疆鏈�灏忓�间负30
dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, (subscribeCycleForCatalog -1) * 1000);
@@ -145,8 +174,16 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
- dynamicTask.stop(device.getDeviceId() + "catalog");
+ logger.info("[绉婚櫎鐩綍璁㈤槄]: {}", device.getDeviceId());
+ String taskKey = device.getDeviceId() + "catalog";
+ if (device.getOnline() == 1) {
+ Runnable runnable = dynamicTask.get(taskKey);
+ if (runnable instanceof ISubscribeTask) {
+ ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+ subscribeTask.stop();
+ }
+ }
+ dynamicTask.stop(taskKey);
return true;
}
@@ -160,8 +197,8 @@
MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander, dynamicTask);
// 璁剧疆鏈�灏忓�间负30
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
- // 鎻愬墠寮�濮嬪埛鏂拌闃�
- dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog -1 ) * 1000);
+ // 鍒锋柊璁㈤槄
+ dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog) * 1000);
return true;
}
@@ -170,8 +207,16 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- logger.info("绉婚櫎绉诲姩浣嶇疆璁㈤槄: {}", device.getDeviceId());
- dynamicTask.stop(device.getDeviceId() + "mobile_position");
+ logger.info("[绉婚櫎绉诲姩浣嶇疆璁㈤槄]: {}", device.getDeviceId());
+ String taskKey = device.getDeviceId() + "mobile_position";
+ if (device.getOnline() == 1) {
+ Runnable runnable = dynamicTask.get(taskKey);
+ if (runnable instanceof ISubscribeTask) {
+ ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+ subscribeTask.stop();
+ }
+ }
+ dynamicTask.stop(taskKey);
return true;
}
@@ -238,13 +283,13 @@
logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
return;
}
- if (!StringUtils.isEmpty(device.getName())) {
+ if (!ObjectUtils.isEmpty(device.getName())) {
deviceInStore.setName(device.getName());
}
- if (!StringUtils.isEmpty(device.getCharset())) {
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
deviceInStore.setCharset(device.getCharset());
}
- if (!StringUtils.isEmpty(device.getMediaServerId())) {
+ if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
deviceInStore.setMediaServerId(device.getMediaServerId());
}
@@ -277,6 +322,10 @@
removeMobilePositionSubscribe(deviceInStore);
}
}
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ updateDeviceChannelGeoCoordSys(device);
+ }
String now = DateUtil.getNow();
device.setUpdateTime(now);
@@ -284,6 +333,197 @@
device.setUpdateTime(DateUtil.getNow());
if (deviceMapper.update(device) > 0) {
redisCatchStorage.updateDevice(device);
+
}
}
+
+ /**
+ * 鏇存柊閫氶亾鍧愭爣绯�
+ */
+ private void updateDeviceChannelGeoCoordSys(Device device) {
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.getAllChannelWithCoordinate(device.getDeviceId());
+ if (deviceChannels.size() > 0) {
+ List<DeviceChannel> deviceChannelsForStore = new ArrayList<>();
+ for (DeviceChannel deviceChannel : deviceChannels) {
+ deviceChannelsForStore.add(deviceChannelService.updateGps(deviceChannel, device));
+ }
+ deviceChannelService.updateChannels(device.getDeviceId(), deviceChannelsForStore);
+ }
+ }
+
+
+ @Override
+ public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog) {
+ Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ 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 (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);
+ channelsForCivilCode.addAll(channels);
+ }
+ 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);
+ List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(deviceChannels, parentId);
+ return trees;
+ }
+
+ return null;
+ }
+
+ @Override
+ public List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId) {
+ Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ 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 (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);
+ return deviceChannels;
+ }
+
+ return null;
+ }
+
+ private List<BaseTree<DeviceChannel>> transportChannelsToTree(List<DeviceChannel> channels, String parentId) {
+ if (channels == null) {
+ return null;
+ }
+ List<BaseTree<DeviceChannel>> treeNotes = new ArrayList<>();
+ if (channels.size() == 0) {
+ return treeNotes;
+ }
+ for (DeviceChannel channel : channels) {
+
+ BaseTree<DeviceChannel> node = new BaseTree<>();
+ node.setId(channel.getChannelId());
+ node.setDeviceId(channel.getDeviceId());
+ node.setName(channel.getName());
+ node.setPid(parentId);
+ 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) );
+ }else {
+ node.setParent(true);
+ }
+ 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.getChannelWithoutCiviCode(deviceId);
+ if (nonstandardNode != null && nonstandardNode.size() > 0) {
+ result.addAll(nonstandardNode);
+ }
+ }
+ }else {
+ if (haveChannel) {
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, 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;
+ }
+
}
--
Gitblit v1.8.0