From 71030ca6bc2a4a2eb05f4b63fa83dda5e89ac68b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 四月 2023 17:50:33 +0800
Subject: [PATCH] 更新readme
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 133 +++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
index 0df4610..eb8555a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
@@ -1,19 +1,14 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.session.CatalogDataCatch;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
-import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
-import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.slf4j.Logger;
@@ -23,11 +18,9 @@
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
import javax.sip.SipException;
import javax.sip.message.Response;
import java.text.ParseException;
@@ -45,12 +38,10 @@
private Logger logger = LoggerFactory.getLogger(CatalogResponseMessageHandler.class);
private final String cmdType = "Catalog";
- private boolean taskQueueHandlerRun = false;
-
@Autowired
private ResponseMessageHandler responseMessageHandler;
- private ConcurrentLinkedQueue<HandlerCatchData> taskQueue = new ConcurrentLinkedQueue<>();
+ private final ConcurrentLinkedQueue<HandlerCatchData> taskQueue = new ConcurrentLinkedQueue<>();
@Autowired
private IVideoManagerStorage storager;
@@ -69,75 +60,81 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element element) {
+ boolean isEmpty = taskQueue.isEmpty();
taskQueue.offer(new HandlerCatchData(evt, device, element));
// 鍥炲200 OK
- ServerTransaction serverTransaction = getServerTransaction(evt);
try {
- responseAck(serverTransaction, Response.OK);
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
}
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
+ // 濡傛灉涓嶄负绌哄垯璇存槑宸茬粡寮�鍚秷鎭鐞�
+ if (isEmpty) {
taskExecutor.execute(() -> {
while (!taskQueue.isEmpty()) {
- HandlerCatchData take = taskQueue.poll();
- Element rootElement = null;
+ // 鍏ㄥ眬寮傚父鎹曡幏锛屼繚璇佷笅涓�鏉″彲浠ュ緱鍒板鐞�
try {
- rootElement = getRootElement(take.getEvt(), take.getDevice().getCharset());
- } catch (DocumentException e) {
- logger.error("[xml瑙ｆ瀽] 澶辫触锛� ", e);
- continue;
- }
- if (rootElement == null) {
- logger.warn("[ 鏀跺埌閫氶亾 ] content cannot be null, {}", evt.getRequest());
- continue;
- }
- Element deviceListElement = rootElement.element("DeviceList");
- Element sumNumElement = rootElement.element("SumNum");
- Element snElement = rootElement.element("SN");
- int sumNum = Integer.parseInt(sumNumElement.getText());
-
- if (sumNum == 0) {
- logger.info("[鏀跺埌閫氶亾]璁惧:{}鐨�: 0涓�", take.getDevice().getDeviceId());
- // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹
- storager.cleanChannelsForDevice(take.getDevice().getDeviceId());
- catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
- } else {
- Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
- if (deviceListIterator != null) {
- List<DeviceChannel> channelList = new ArrayList<>();
- // 閬嶅巻DeviceList
- while (deviceListIterator.hasNext()) {
- Element itemDevice = deviceListIterator.next();
- Element channelDeviceElement = itemDevice.element("DeviceID");
- if (channelDeviceElement == null) {
- continue;
- }
- DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice, device, null);
- deviceChannel.setDeviceId(take.getDevice().getDeviceId());
-
- channelList.add(deviceChannel);
- }
- int sn = Integer.parseInt(snElement.getText());
- catalogDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, take.getDevice(), channelList);
- logger.info("[鏀跺埌閫氶亾]璁惧: {} -> {}涓紝{}/{}", take.getDevice().getDeviceId(), channelList.size(), catalogDataCatch.get(take.getDevice().getDeviceId()) == null ? 0 : catalogDataCatch.get(take.getDevice().getDeviceId()).size(), sumNum);
- if (catalogDataCatch.get(take.getDevice().getDeviceId()).size() == sumNum) {
- // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹锛� 姝ゆ椂鍙兘瀛樺湪鏌愪釜璁惧绂荤嚎鍙樹笂绾跨殑鎯呭喌锛屼絾鏄�冭檻鍒版�ц兘锛屾澶勪笉鍋氬鐞嗭紝
- // 鐩墠鏀寔璁惧閫氶亾涓婄嚎閫氱煡鏃跺拰璁惧涓婄嚎鏃跺悜涓婄骇閫氱煡
- boolean resetChannelsResult = storager.resetChannels(take.getDevice().getDeviceId(), catalogDataCatch.get(take.getDevice().getDeviceId()));
- if (!resetChannelsResult) {
- String errorMsg = "鎺ユ敹鎴愬姛锛屽啓鍏ュけ璐ワ紝鍏�" + sumNum + "鏉★紝宸叉帴鏀�" + catalogDataCatch.get(take.getDevice().getDeviceId()).size() + "鏉�";
- catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), errorMsg);
- } else {
- catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
- }
- }
+ HandlerCatchData take = taskQueue.poll();
+ Element rootElement = null;
+ try {
+ rootElement = getRootElement(take.getEvt(), take.getDevice().getCharset());
+ } catch (DocumentException e) {
+ logger.error("[xml瑙ｆ瀽] 澶辫触锛� ", e);
+ continue;
}
+ if (rootElement == null) {
+ logger.warn("[ 鏀跺埌閫氶亾 ] content cannot be null, {}", evt.getRequest());
+ continue;
+ }
+ Element deviceListElement = rootElement.element("DeviceList");
+ Element sumNumElement = rootElement.element("SumNum");
+ Element snElement = rootElement.element("SN");
+ int sumNum = Integer.parseInt(sumNumElement.getText());
+ if (sumNum == 0) {
+ logger.info("[鏀跺埌閫氶亾]璁惧:{}鐨�: 0涓�", take.getDevice().getDeviceId());
+ // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹
+ storager.cleanChannelsForDevice(take.getDevice().getDeviceId());
+ catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
+ } else {
+ Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
+ if (deviceListIterator != null) {
+ List<DeviceChannel> channelList = new ArrayList<>();
+ // 閬嶅巻DeviceList
+ while (deviceListIterator.hasNext()) {
+ Element itemDevice = deviceListIterator.next();
+ Element channelDeviceElement = itemDevice.element("DeviceID");
+ if (channelDeviceElement == null) {
+ continue;
+ }
+ DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice, device, null);
+ deviceChannel = SipUtils.updateGps(deviceChannel, device.getGeoCoordSys());
+ deviceChannel.setDeviceId(take.getDevice().getDeviceId());
+
+ channelList.add(deviceChannel);
+ }
+ int sn = Integer.parseInt(snElement.getText());
+ catalogDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, take.getDevice(), channelList);
+ logger.info("[鏀跺埌閫氶亾]璁惧: {} -> {}涓紝{}/{}", take.getDevice().getDeviceId(), channelList.size(), catalogDataCatch.get(take.getDevice().getDeviceId()) == null ? 0 : catalogDataCatch.get(take.getDevice().getDeviceId()).size(), sumNum);
+ if (catalogDataCatch.get(take.getDevice().getDeviceId()).size() == sumNum) {
+ // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹锛� 姝ゆ椂鍙兘瀛樺湪鏌愪釜璁惧绂荤嚎鍙樹笂绾跨殑鎯呭喌锛屼絾鏄�冭檻鍒版�ц兘锛屾澶勪笉鍋氬鐞嗭紝
+ // 鐩墠鏀寔璁惧閫氶亾涓婄嚎閫氱煡鏃跺拰璁惧涓婄嚎鏃跺悜涓婄骇閫氱煡
+ boolean resetChannelsResult = storager.resetChannels(take.getDevice().getDeviceId(), catalogDataCatch.get(take.getDevice().getDeviceId()));
+ if (!resetChannelsResult) {
+ String errorMsg = "鎺ユ敹鎴愬姛锛屽啓鍏ュけ璐ワ紝鍏�" + sumNum + "鏉★紝宸叉帴鏀�" + catalogDataCatch.get(take.getDevice().getDeviceId()).size() + "鏉�";
+ catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), errorMsg);
+ } else {
+ catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
+ }
+ }
+ }
+
+ }
+ }catch (Exception e) {
+ logger.warn("[鏀跺埌閫氶亾] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", evt.getRequest());
+ logger.error("[鏀跺埌閫氶亾] 寮傚父鍐呭锛� ", e);
}
}
- taskQueueHandlerRun = false;
});
}
--
Gitblit v1.8.0