From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 191 ++++++++++++++---------------------------------
1 files changed, 59 insertions(+), 132 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 c4e88c5..5c977a5
--- 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;
@@ -34,45 +30,38 @@
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+/**
+ * 鐩綍鏌ヨ鐨勫洖澶�
+ */
@Component
public class CatalogResponseMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
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;
+ private AtomicBoolean processing = new AtomicBoolean(false);
@Override
public void afterPropertiesSet() throws Exception {
@@ -84,40 +73,43 @@
taskQueue.offer(new HandlerCatchData(evt, device, element));
// 鍥炲200 OK
try {
- responseAck(evt, Response.OK);
- } catch (SipException e) {
- throw new RuntimeException(e);
- } catch (InvalidArgumentException e) {
- throw new RuntimeException(e);
- } catch (ParseException e) {
- throw new RuntimeException(e);
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
}
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
- taskExecutor.execute(()-> {
+ // 宸茬粡寮�鍚秷鎭鐞嗗垯璺宠繃
+ if (processing.compareAndSet(false, true)) {
+ taskExecutor.execute(() -> {
while (!taskQueue.isEmpty()) {
- HandlerCatchData take = taskQueue.poll();
- String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + take.getDevice().getDeviceId();
- Element rootElement = null;
+ // 鍏ㄥ眬寮傚父鎹曡幏锛屼繚璇佷笅涓�鏉″彲浠ュ緱鍒板鐞�
try {
- rootElement = getRootElement(take.getEvt(), take.getDevice().getCharset());
+ 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");
- if (snElement == null || sumNumElement == null || deviceListElement == null) {
- responseAck(take.getEvt(), Response.BAD_REQUEST, "xml error");
- return;
- }
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 {
+ } 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();
@@ -125,45 +117,45 @@
if (channelDeviceElement == null) {
continue;
}
- //by brewswang
- // if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {//濡傛灉鍖呭惈浣嶇疆淇℃伅锛屽氨鏇存柊涓�涓嬩綅缃�
- // processNotifyMobilePosition(evt, itemDevice);
- // }
- DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice, device);
- deviceChannel.setDeviceId(take.getDevice().getDeviceId());
+ 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(deviceChannel);
+ 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);
+ 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 {
+ } 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();
+ } catch (Exception e) {
+ logger.warn("[鏀跺埌閫氶亾] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", evt.getRequest());
+ logger.error("[鏀跺埌閫氶亾] 寮傚父鍐呭锛� ", e);
}
}
- taskQueueHandlerRun = false;
+ processing.set(false);
});
-
}
+
}
@Override
@@ -171,75 +163,10 @@
}
- /**
- * 澶勭悊璁惧浣嶇疆鐨勬洿鏂�
- *
- * @param evt, itemDevice
- */
- private void processNotifyMobilePosition(RequestEvent evt, Element itemDevice) {
- try {
- // 鍥炲 200 OK
- Element rootElement = getRootElement(evt);
- MobilePosition mobilePosition = new MobilePosition();
- Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getTextTrim().toString();
- Device device = redisCatchStorage.getDevice(deviceId);
- if (device != null) {
- if (!StringUtils.isEmpty(device.getName())) {
- mobilePosition.setDeviceName(device.getName());
- }
- }
- mobilePosition.setDeviceId(XmlUtil.getText(rootElement, "DeviceID"));
-
- String time = XmlUtil.getText(itemDevice, "Time");
- if(time==null){
- time = XmlUtil.getText(itemDevice, "EndTime");
- }
- mobilePosition.setTime(time);
- String longitude = XmlUtil.getText(itemDevice, "Longitude");
- if(longitude!=null) {
- mobilePosition.setLongitude(Double.parseDouble(longitude));
- }
- String latitude = XmlUtil.getText(itemDevice, "Latitude");
- if(latitude!=null) {
- mobilePosition.setLatitude(Double.parseDouble(latitude));
- }
- if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Speed"))) {
- mobilePosition.setSpeed(Double.parseDouble(XmlUtil.getText(itemDevice, "Speed")));
- } else {
- mobilePosition.setSpeed(0.0);
- }
- if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Direction"))) {
- mobilePosition.setDirection(Double.parseDouble(XmlUtil.getText(itemDevice, "Direction")));
- } else {
- mobilePosition.setDirection(0.0);
- }
- if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Altitude"))) {
- mobilePosition.setAltitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Altitude")));
- } else {
- mobilePosition.setAltitude(0.0);
- }
- mobilePosition.setReportSource("Mobile Position");
- // 榛樿鏉ユ簮鍧愭爣绯讳负WGS-84澶勭悊
- Double[] gcj02Point = Coordtransform.WGS84ToGCJ02(mobilePosition.getLongitude(), mobilePosition.getLatitude());
- logger.info("GCJ02鍧愭爣锛�" + gcj02Point[0] + ", " + gcj02Point[1]);
- mobilePosition.setGeodeticSystem("GCJ-02");
- mobilePosition.setCnLng(gcj02Point[0] + "");
- mobilePosition.setCnLat(gcj02Point[1] + "");
- if (!userSetting.getSavePositionHistory()) {
- storager.clearMobilePositionsByDeviceId(deviceId);
- }
- storager.insertMobilePosition(mobilePosition);
- responseAck(evt, Response.OK);
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
public SyncStatus getChannelSyncProgress(String deviceId) {
if (catalogDataCatch.get(deviceId) == null) {
return null;
- }else {
+ } else {
return catalogDataCatch.getSyncStatus(deviceId);
}
}
@@ -247,7 +174,7 @@
public boolean isSyncRunning(String deviceId) {
if (catalogDataCatch.get(deviceId) == null) {
return false;
- }else {
+ } else {
return catalogDataCatch.isSyncRunning(deviceId);
}
}
--
Gitblit v1.8.0