From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 80 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index 1336705..548dbde 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -35,21 +35,16 @@
/**
* SIP鍛戒护绫诲瀷锛� SUBSCRIBE璇锋眰
+ * @author lin
*/
@Component
public class SubscribeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
- private Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
- private String method = "SUBSCRIBE";
+ private final Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
+ private final String method = "SUBSCRIBE";
@Autowired
private SIPProcessorObserver sipProcessorObserver;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private ISIPCommanderForPlatform sipCommanderForPlatform;
@Autowired
private IVideoManagerStorage storager;
@@ -82,7 +77,7 @@
/**
* 澶勭悊SUBSCRIBE璇锋眰
*
- * @param evt
+ * @param evt 浜嬩欢
*/
@Override
public void process(RequestEvent evt) {
@@ -101,13 +96,12 @@
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
- Response response = null;
- response = getMessageFactory().createResponse(200, request);
+ Response response = getMessageFactory().createResponse(200, request);
if (response != null) {
ExpiresHeader expireHeader = getHeaderFactory().createExpiresHeader(30);
response.setExpires(expireHeader);
}
- logger.info("response : " + response.toString());
+ logger.info("response : " + response);
ServerTransaction transaction = getServerTransaction(evt);
if (transaction != null) {
transaction.sendResponse(response);
@@ -117,13 +111,7 @@
logger.info("processRequest serverTransactionId is null.");
}
}
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (DocumentException e) {
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
e.printStackTrace();
}
@@ -134,11 +122,14 @@
*/
private void processNotifyMobilePosition(RequestEvent evt, Element rootElement) throws SipException {
String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- String deviceID = XmlUtil.getText(rootElement, "DeviceID");
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
+ if (platform == null) {
+ return;
+ }
if (evt.getServerTransaction() == null) {
- ServerTransaction serverTransaction = platform.getTransport().equals("TCP") ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
+ ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
: udpSipProvider.getNewServerTransaction(evt.getRequest());
subscribeInfo.setTransaction(serverTransaction);
Dialog dialog = serverTransaction.getDialog();
@@ -146,37 +137,36 @@
subscribeInfo.setDialog(dialog);
}
String sn = XmlUtil.getText(rootElement, "SN");
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_MobilePosition_" + platformId;
- logger.info("[notify-MobilePosition]: {}", platformId);
+ logger.info("[鍥炲 绉诲姩浣嶇疆璁㈤槄]: {}", platformId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
.append("<CmdType>MobilePosition</CmdType>\r\n")
- .append("<SN>" + sn + "</SN>\r\n")
- .append("<DeviceID>" + deviceID + "</DeviceID>\r\n")
+ .append("<SN>").append(sn).append("</SN>\r\n")
+ .append("<DeviceID>").append(deviceId).append("</DeviceID>\r\n")
.append("<Result>OK</Result>\r\n")
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
- if (subscribeHolder.getMobilePositionSubscribe(platformId) != null) {
- dynamicTask.stop(key);
+ // GPS涓婃姤鏃堕棿闂撮殧
+ String interval = XmlUtil.getText(rootElement, "Interval");
+ if (interval == null) {
+ subscribeInfo.setGpsInterval(5);
+ }else {
+ subscribeInfo.setGpsInterval(Integer.parseInt(interval));
}
- String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key, subscribeHolder), Integer.parseInt(interval) -1 );
+
+ subscribeInfo.setSn(sn);
subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+
}else if (subscribeInfo.getExpires() == 0) {
- dynamicTask.stop(key);
subscribeHolder.removeMobilePositionSubscribe(platformId);
}
try {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
responseXmlAck(evt, resultXml.toString(), parentPlatform);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
+ } catch (SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace();
}
}
@@ -187,11 +177,14 @@
private void processNotifyCatalogList(RequestEvent evt, Element rootElement) throws SipException {
String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- String deviceID = XmlUtil.getText(rootElement, "DeviceID");
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ if (platform == null){
+ return;
+ }
SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
if (evt.getServerTransaction() == null) {
- ServerTransaction serverTransaction = platform.getTransport().equals("TCP") ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
+ ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
: udpSipProvider.getNewServerTransaction(evt.getRequest());
subscribeInfo.setTransaction(serverTransaction);
Dialog dialog = serverTransaction.getDialog();
@@ -199,14 +192,13 @@
subscribeInfo.setDialog(dialog);
}
String sn = XmlUtil.getText(rootElement, "SN");
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_Catalog_" + platformId;
- logger.info("[notify-Catalog]: {}", platformId);
+ logger.info("[鍥炲 鐩綍璁㈤槄]: {}/{}", platformId, deviceId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
.append("<CmdType>Catalog</CmdType>\r\n")
- .append("<SN>" + sn + "</SN>\r\n")
- .append("<DeviceID>" + deviceID + "</DeviceID>\r\n")
+ .append("<SN>").append(sn).append("</SN>\r\n")
+ .append("<DeviceID>").append(deviceId).append("</DeviceID>\r\n")
.append("<Result>OK</Result>\r\n")
.append("</Response>\r\n");
@@ -219,11 +211,7 @@
try {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
responseXmlAck(evt, resultXml.toString(), parentPlatform);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
+ } catch (SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace();
}
}
--
Gitblit v1.8.0