From 9d56da5680fe1bb78a928d3f5f747b90a2364248 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 01:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 184 +++++++++++++++++++++-------------------------
1 files changed, 84 insertions(+), 100 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
old mode 100644
new mode 100755
index be01fd7..8648dc4
--- 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,16 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+import com.genersoft.iot.vmp.conf.CivilCodeFileConf;
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,7 +20,6 @@
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;
@@ -44,38 +40,26 @@
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;
@Autowired
- private DeferredResultHolder deferredResultHolder;
-
- @Autowired
private CatalogDataCatch catalogDataCatch;
-
- @Autowired
- private SipConfig config;
-
- @Autowired
- private EventPublisher publisher;
-
- //by brewswang
- @Autowired
- private UserSetting userSetting;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
@Qualifier("taskExecutor")
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
+
+ @Autowired
+ private CivilCodeFileConf civilCodeFileConf;
+
+ @Autowired
+ private SipConfig sipConfig;
@Override
public void afterPropertiesSet() throws Exception {
@@ -84,90 +68,90 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element element) {
+ boolean isEmpty = taskQueue.isEmpty();
taskQueue.offer(new HandlerCatchData(evt, device, element));
// 鍥炲200 OK
try {
- responseAck(evt, Response.OK);
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
- taskExecutor.execute(()-> {
- while (!taskQueue.isEmpty()) {
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
+ }
+ // 濡傛灉涓嶄负绌哄垯璇存槑宸茬粡寮�鍚秷鎭鐞�
+ if (isEmpty) {
+ taskExecutor.execute(() -> {
+ while (!taskQueue.isEmpty()) {
+ // 鍏ㄥ眬寮傚父鎹曡幏锛屼繚璇佷笅涓�鏉″彲浠ュ緱鍒板鐞�
+ try {
HandlerCatchData take = taskQueue.poll();
+ Element rootElement = null;
try {
- Element rootElement = getRootElement(take.getEvt(), take.getDevice().getCharset());
- 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");
- if (snElement == null || sumNumElement == null || deviceListElement == null) {
- responseAck(take.getEvt(), Response.BAD_REQUEST, "xml error");
- continue;
- }
- int sumNum = Integer.parseInt(sumNumElement.getText());
+ 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);
+ 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<>();
+ List<String> parentChannelIds = new ArrayList<>();
+ // 閬嶅巻DeviceList
+ while (deviceListIterator.hasNext()) {
+ Element itemDevice = deviceListIterator.next();
+ Element channelDeviceElement = itemDevice.element("DeviceID");
+ if (channelDeviceElement == null) {
+ continue;
}
- 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);
- }
+ DeviceChannel channel = XmlUtil.channelContentHandler(itemDevice, device, null, civilCodeFileConf);
+ if (channel == null) {
+ logger.info("[鏀跺埌鐩綍璁㈤槄]锛氫絾鏄В鏋愬け璐� {}", new String(evt.getRequest().getRawContent()));
+ continue;
+ }
+ if (channel.getParentId() != null && channel.getParentId().equals(sipConfig.getId())) {
+ channel.setParentId(null);
+ }
+ SipUtils.updateGps(channel, device.getGeoCoordSys());
+ channel.setDeviceId(take.getDevice().getDeviceId());
+
+ channelList.add(channel);
+ }
+ 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 (DocumentException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
- } finally {
- taskQueueHandlerRun = false;
+
}
+ }catch (Exception e) {
+ logger.warn("[鏀跺埌閫氶亾] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", evt.getRequest());
+ logger.error("[鏀跺埌閫氶亾] 寮傚父鍐呭锛� ", e);
}
- });
- }
- } catch (SipException e) {
- throw new RuntimeException(e);
- } catch (InvalidArgumentException e) {
- throw new RuntimeException(e);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- } finally {
- taskQueueHandlerRun = false;
+ }
+ });
}
}
@@ -180,7 +164,7 @@
public SyncStatus getChannelSyncProgress(String deviceId) {
if (catalogDataCatch.get(deviceId) == null) {
return null;
- }else {
+ } else {
return catalogDataCatch.getSyncStatus(deviceId);
}
}
@@ -188,7 +172,7 @@
public boolean isSyncRunning(String deviceId) {
if (catalogDataCatch.get(deviceId) == null) {
return false;
- }else {
+ } else {
return catalogDataCatch.isSyncRunning(deviceId);
}
}
--
Gitblit v1.8.0