From e9a7207e1f4bffa8aa44029bdf10548ac80d0cd9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:17:58 +0800
Subject: [PATCH] Merge pull request #646 from XiaoQiTong/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 194 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 58 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 1d54b5c..7ba2c4e 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
@@ -16,15 +16,23 @@
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.storager.dao.PlatformChannelMapper;
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.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.support.incrementer.AbstractIdentityColumnMaxValueIncrementer;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
@@ -57,10 +65,19 @@
private DeviceMapper deviceMapper;
@Autowired
+ private PlatformChannelMapper platformChannelMapper;
+
+ @Autowired
private IDeviceChannelService deviceChannelService;
@Autowired
private DeviceChannelMapper deviceChannelMapper;
+
+ @Autowired
+ DataSourceTransactionManager dataSourceTransactionManager;
+
+ @Autowired
+ TransactionDefinition transactionDefinition;
@Autowired
private IVideoManagerStorage storage;
@@ -94,7 +111,11 @@
logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.add(device);
redisCatchStorage.updateDevice(device);
- commander.deviceInfoQuery(device);
+ try {
+ commander.deviceInfoQuery(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鏌ヨ璁惧淇℃伅: {}", e.getMessage());
+ }
sync(device);
}else {
if(device.getOnline() == 0){
@@ -103,7 +124,11 @@
logger.info("[璁惧涓婄嚎,绂荤嚎鐘舵�佷笅閲嶆柊娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
deviceMapper.update(device);
redisCatchStorage.updateDevice(device);
- commander.deviceInfoQuery(device);
+ try {
+ commander.deviceInfoQuery(device);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鏌ヨ璁惧淇℃伅: {}", e.getMessage());
+ }
sync(device);
// TODO 濡傛灉璁惧涓嬬殑閫氶亾绾ц仈鍒颁簡鍏朵粬骞冲彴锛岄偅涔堥渶瑕佸彂閫佷簨浠舵垨鑰卬otify缁欎笂绾у钩鍙�
}else {
@@ -128,6 +153,7 @@
@Override
public void offline(String deviceId) {
+ logger.info("[璁惧绂荤嚎]锛� device锛歿}", deviceId);
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) {
return;
@@ -144,7 +170,7 @@
if (ssrcTransactions != null && ssrcTransactions.size() > 0) {
for (SsrcTransaction ssrcTransaction : ssrcTransactions) {
mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
- mediaServerService.closeRTPServer(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
streamSession.remove(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
}
}
@@ -237,15 +263,28 @@
}
int sn = (int)((Math.random()*9+1)*100000);
catalogResponseMessageHandler.setChannelSyncReady(device, sn);
- sipCommander.catalogQuery(device, sn, event -> {
- String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ try {
+ sipCommander.catalogQuery(device, sn, event -> {
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
+ });
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍚屾閫氶亾], 淇′护鍙戦�佸け璐ワ細{}", e.getMessage() );
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 %s", e.getMessage());
catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
- });
+ }
}
@Override
- public Device queryDevice(String deviceId) {
- return deviceMapper.getDeviceByDeviceId(deviceId);
+ public Device getDevice(String deviceId) {
+ Device device = redisCatchStorage.getDevice(deviceId);
+ if (device == null) {
+ device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device != null) {
+ redisCatchStorage.updateDevice(device);
+ }
+ }
+ return device;
}
@Override
@@ -265,7 +304,11 @@
if (device == null || device.getOnline() == 0) {
return;
}
- sipCommander.deviceStatusQuery(device, null);
+ try {
+ sipCommander.deviceStatusQuery(device, null);
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧鐘舵�佹煡璇�: {}", e.getMessage());
+ }
}
@@ -276,55 +319,6 @@
@Override
public void updateDevice(Device device) {
-
- Device deviceInStore = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
- if (deviceInStore == null) {
- logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
- return;
- }
- if (!StringUtils.isEmpty(device.getName())) {
- deviceInStore.setName(device.getName());
- }
- if (!StringUtils.isEmpty(device.getCharset())) {
- deviceInStore.setCharset(device.getCharset());
- }
- if (!StringUtils.isEmpty(device.getMediaServerId())) {
- deviceInStore.setMediaServerId(device.getMediaServerId());
- }
-
- // 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
- if (device.getSubscribeCycleForCatalog() > 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
- deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
- // 寮�鍚闃�
- addCatalogSubscribe(deviceInStore);
- }
- }else if (device.getSubscribeCycleForCatalog() == 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
- deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
- // 鍙栨秷璁㈤槄
- removeCatalogSubscribe(deviceInStore);
- }
- }
-
- // 绉诲姩浣嶇疆璁㈤槄鐩稿叧鐨勪俊鎭�
- 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) {
- // 鍙栨秷璁㈤槄
- removeMobilePositionSubscribe(deviceInStore);
- }
- }
- // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
- if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
- updateDeviceChannelGeoCoordSys(device);
- }
String now = DateUtil.getNow();
device.setUpdateTime(now);
@@ -525,4 +519,88 @@
return result;
}
+ @Override
+ public boolean isExist(String deviceId) {
+ return deviceMapper.getDeviceByDeviceId(deviceId) != null;
+ }
+
+ @Override
+ public void addDevice(Device device) {
+ device.setOnline(0);
+ device.setCreateTime(DateUtil.getNow());
+ device.setUpdateTime(DateUtil.getNow());
+ deviceMapper.addCustomDevice(device);
+ }
+
+ @Override
+ public void updateCustomDevice(Device device) {
+ Device deviceInStore = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
+ if (deviceInStore == null) {
+ logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
+ return;
+ }
+ if (!ObjectUtils.isEmpty(device.getName())) {
+ deviceInStore.setName(device.getName());
+ }
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
+ deviceInStore.setCharset(device.getCharset());
+ }
+ if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
+ deviceInStore.setMediaServerId(device.getMediaServerId());
+ }
+
+ // 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 寮�鍚闃�
+ addCatalogSubscribe(deviceInStore);
+ }
+ }else if (device.getSubscribeCycleForCatalog() == 0) {
+ if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 鍙栨秷璁㈤槄
+ removeCatalogSubscribe(deviceInStore);
+ }
+ }
+
+ // 绉诲姩浣嶇疆璁㈤槄鐩稿叧鐨勪俊鎭�
+ 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) {
+ // 鍙栨秷璁㈤槄
+ removeMobilePositionSubscribe(deviceInStore);
+ }
+ }
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ updateDeviceChannelGeoCoordSys(device);
+ }
+ deviceMapper.updateCustom(device);
+ }
+
+ @Override
+ public boolean delete(String deviceId) {
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ boolean result = false;
+ try {
+ platformChannelMapper.delChannelForDeviceId(deviceId);
+ deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+ if ( deviceMapper.del(deviceId) < 0 ) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ result = true;
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ }catch (Exception e) {
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0