From cccfdace5b0af0c38627dbdce84b9c650b6c2082 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 25 十月 2023 10:11:33 +0800
Subject: [PATCH] 优化sql
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 10 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
old mode 100644
new mode 100755
index bb48089..0d99ecc
--- 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,12 +3,14 @@
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;
@@ -47,6 +49,8 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
+ @Autowired
+ private SIPCommander cmder;
@Autowired
private DynamicTask dynamicTask;
@@ -104,6 +108,7 @@
inviteStreamService.clearInviteInfo(device.getDeviceId());
}
device.setUpdateTime(now);
+ device.setKeepaliveTime(now);
if (device.getKeepaliveIntervalTime() == 0) {
// 榛樿蹇冭烦闂撮殧60
device.setKeepaliveIntervalTime(60);
@@ -117,9 +122,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 +136,10 @@
}
sync(device);
}else {
+
+ if (deviceInDb != null) {
+ device.setSwitchPrimarySubStream(deviceInDb.isSwitchPrimarySubStream());
+ }
if(!device.isOnLine()){
device.setOnLine(true);
device.setCreateTime(now);
@@ -173,6 +183,17 @@
// 鍙戦�乺edis娑堟伅
redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
}
+
+//
+// try {
+// cmder.alarmSubscribe(device, 600, "0", "4", "0", "2023-7-27T00:00:00", "2023-7-28T00:00:00");
+// } catch (InvalidArgumentException e) {
+// throw new RuntimeException(e);
+// } catch (SipException e) {
+// throw new RuntimeException(e);
+// } catch (ParseException e) {
+// throw new RuntimeException(e);
+// }
}
@@ -380,8 +401,8 @@
if (device == null) {
return null;
}
- if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) {
- parentId = null;
+ if (ObjectUtils.isEmpty(parentId) ) {
+ parentId = deviceId;
}
List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
return transportChannelsToTree(rootNodes, "");
@@ -459,6 +480,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());
}
@@ -468,8 +505,19 @@
if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
deviceInStore.setMediaServerId(device.getMediaServerId());
}
- deviceInStore.setSdpIp(device.getSdpIp());
- deviceInStore.setCharset(device.getCharset());
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
+ deviceInStore.setCharset(device.getCharset());
+ }
+ if (!ObjectUtils.isEmpty(device.getSdpIp())) {
+ deviceInStore.setSdpIp(device.getSdpIp());
+ }
+ if (!ObjectUtils.isEmpty(device.getPassword())) {
+ deviceInStore.setPassword(device.getPassword());
+ }
+ if (!ObjectUtils.isEmpty(device.getStreamMode())) {
+ deviceInStore.setStreamMode(device.getStreamMode());
+ }
+
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (device.getSubscribeCycleForCatalog() > 0) {
@@ -500,13 +548,26 @@
removeMobilePositionSubscribe(deviceInStore);
}
}
- // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
- if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
- updateDeviceChannelGeoCoordSys(device);
+ if (deviceInStore.getGeoCoordSys() != null) {
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ deviceInStore.setGeoCoordSys(device.getGeoCoordSys());
+ updateDeviceChannelGeoCoordSys(deviceInStore);
+ }
+ }else {
+ deviceInStore.setGeoCoordSys("WGS84");
}
+ if (device.getCharset() == null) {
+ deviceInStore.setCharset("GB2312");
+ }
+ //SSRC鏍￠獙
+ deviceInStore.setSsrcCheck(device.isSsrcCheck());
+ //浣滀负娑堟伅閫氶亾
+ deviceInStore.setAsMessageChannel(device.isAsMessageChannel());
+
// 鏇存柊redis
- redisCatchStorage.updateDevice(device);
- deviceMapper.updateCustom(device);
+ deviceMapper.updateCustom(deviceInStore);
+ redisCatchStorage.removeDevice(deviceInStore.getDeviceId());
}
@Override
@@ -525,6 +586,9 @@
}catch (Exception e) {
dataSourceTransactionManager.rollback(transactionStatus);
}
+ if (result) {
+ redisCatchStorage.removeDevice(deviceId);
+ }
return result;
}
--
Gitblit v1.8.0