From ef6693aabbbf12e83d09ad8749f6e60faacc012d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 15:18:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into Zafu-Dev-1127
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java | 209 +++++++++++++++++++++++++--------------------------
1 files changed, 102 insertions(+), 107 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
index bb14978..09a5ffc 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
@@ -9,7 +9,6 @@
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.notify.NotifyMessageHandler;
-import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.service.IDeviceAlarmService;
@@ -27,17 +26,15 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.message.Response;
-
import java.text.ParseException;
import java.util.concurrent.ConcurrentLinkedQueue;
-import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.*;
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
/**
* 鎶ヨ浜嬩欢鐨勫鐞嗭紝鍙傝�冿細9.4
@@ -72,8 +69,6 @@
@Autowired
private IDeviceChannelService deviceChannelService;
- private boolean taskQueueHandlerRun = false;
-
private ConcurrentLinkedQueue<SipMsgInfo> taskQueue = new ConcurrentLinkedQueue<>();
@Qualifier("taskExecutor")
@@ -89,128 +84,128 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
logger.info("[鏀跺埌鎶ヨ閫氱煡]璁惧锛歿}", device.getDeviceId());
-
+ boolean isEmpty = taskQueue.isEmpty();
taskQueue.offer(new SipMsgInfo(evt, device, rootElement));
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
+ // 鍥炲200 OK
+ try {
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鎶ヨ閫氱煡鍥炲: {}", e.getMessage());
+ }
+ if (isEmpty) {
taskExecutor.execute(() -> {
logger.info("[澶勭悊鎶ヨ閫氱煡]寰呭鐞嗘暟閲忥細{}", taskQueue.size() );
while (!taskQueue.isEmpty()) {
- SipMsgInfo sipMsgInfo = taskQueue.poll();
- // 鍥炲200 OK
try {
- responseAck((SIPRequest) sipMsgInfo.getEvt().getRequest(), Response.OK);
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[澶勭悊鎶ヨ閫氱煡], 鍥炲200OK澶辫触", e);
- }
+ SipMsgInfo sipMsgInfo = taskQueue.poll();
- Element deviceIdElement = sipMsgInfo.getRootElement().element("DeviceID");
- String channelId = deviceIdElement.getText().toString();
+ Element deviceIdElement = sipMsgInfo.getRootElement().element("DeviceID");
+ String channelId = deviceIdElement.getText().toString();
- DeviceAlarm deviceAlarm = new DeviceAlarm();
- deviceAlarm.setCreateTime(DateUtil.getNow());
- deviceAlarm.setDeviceId(sipMsgInfo.getDevice().getDeviceId());
- deviceAlarm.setChannelId(channelId);
- deviceAlarm.setAlarmPriority(getText(sipMsgInfo.getRootElement(), "AlarmPriority"));
- deviceAlarm.setAlarmMethod(getText(sipMsgInfo.getRootElement(), "AlarmMethod"));
- String alarmTime = XmlUtil.getText(sipMsgInfo.getRootElement(), "AlarmTime");
- if (alarmTime == null) {
- continue;
- }
- deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
- String alarmDescription = getText(sipMsgInfo.getRootElement(), "AlarmDescription");
- if (alarmDescription == null) {
- deviceAlarm.setAlarmDescription("");
- } else {
- deviceAlarm.setAlarmDescription(alarmDescription);
- }
- String longitude = getText(sipMsgInfo.getRootElement(), "Longitude");
- if (longitude != null && NumericUtil.isDouble(longitude)) {
- deviceAlarm.setLongitude(Double.parseDouble(longitude));
- } else {
- deviceAlarm.setLongitude(0.00);
- }
- String latitude = getText(sipMsgInfo.getRootElement(), "Latitude");
- if (latitude != null && NumericUtil.isDouble(latitude)) {
- deviceAlarm.setLatitude(Double.parseDouble(latitude));
- } else {
- deviceAlarm.setLatitude(0.00);
- }
+ DeviceAlarm deviceAlarm = new DeviceAlarm();
+ deviceAlarm.setCreateTime(DateUtil.getNow());
+ deviceAlarm.setDeviceId(sipMsgInfo.getDevice().getDeviceId());
+ deviceAlarm.setChannelId(channelId);
+ deviceAlarm.setAlarmPriority(getText(sipMsgInfo.getRootElement(), "AlarmPriority"));
+ deviceAlarm.setAlarmMethod(getText(sipMsgInfo.getRootElement(), "AlarmMethod"));
+ String alarmTime = XmlUtil.getText(sipMsgInfo.getRootElement(), "AlarmTime");
+ if (alarmTime == null) {
+ continue;
+ }
+ deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
+ String alarmDescription = getText(sipMsgInfo.getRootElement(), "AlarmDescription");
+ if (alarmDescription == null) {
+ deviceAlarm.setAlarmDescription("");
+ } else {
+ deviceAlarm.setAlarmDescription(alarmDescription);
+ }
+ String longitude = getText(sipMsgInfo.getRootElement(), "Longitude");
+ if (longitude != null && NumericUtil.isDouble(longitude)) {
+ deviceAlarm.setLongitude(Double.parseDouble(longitude));
+ } else {
+ deviceAlarm.setLongitude(0.00);
+ }
+ String latitude = getText(sipMsgInfo.getRootElement(), "Latitude");
+ if (latitude != null && NumericUtil.isDouble(latitude)) {
+ deviceAlarm.setLatitude(Double.parseDouble(latitude));
+ } else {
+ deviceAlarm.setLatitude(0.00);
+ }
- if (!ObjectUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
- if ( deviceAlarm.getAlarmMethod().contains(DeviceAlarmMethod.GPS.getVal() + "")) {
- MobilePosition mobilePosition = new MobilePosition();
- mobilePosition.setCreateTime(DateUtil.getNow());
- mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
- mobilePosition.setTime(deviceAlarm.getAlarmTime());
- mobilePosition.setLongitude(deviceAlarm.getLongitude());
- mobilePosition.setLatitude(deviceAlarm.getLatitude());
- mobilePosition.setReportSource("GPS Alarm");
+ if (!ObjectUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
+ if ( deviceAlarm.getAlarmMethod().contains(DeviceAlarmMethod.GPS.getVal() + "")) {
+ MobilePosition mobilePosition = new MobilePosition();
+ mobilePosition.setCreateTime(DateUtil.getNow());
+ mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
+ mobilePosition.setTime(deviceAlarm.getAlarmTime());
+ mobilePosition.setLongitude(deviceAlarm.getLongitude());
+ mobilePosition.setLatitude(deviceAlarm.getLatitude());
+ mobilePosition.setReportSource("GPS Alarm");
- // 鏇存柊device channel 鐨勭粡绾害
- DeviceChannel deviceChannel = new DeviceChannel();
- deviceChannel.setDeviceId(sipMsgInfo.getDevice().getDeviceId());
- deviceChannel.setChannelId(channelId);
- deviceChannel.setLongitude(mobilePosition.getLongitude());
- deviceChannel.setLatitude(mobilePosition.getLatitude());
- deviceChannel.setGpsTime(mobilePosition.getTime());
+ // 鏇存柊device channel 鐨勭粡绾害
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setDeviceId(sipMsgInfo.getDevice().getDeviceId());
+ deviceChannel.setChannelId(channelId);
+ deviceChannel.setLongitude(mobilePosition.getLongitude());
+ deviceChannel.setLatitude(mobilePosition.getLatitude());
+ deviceChannel.setGpsTime(mobilePosition.getTime());
- deviceChannel = deviceChannelService.updateGps(deviceChannel, sipMsgInfo.getDevice());
+ deviceChannel = deviceChannelService.updateGps(deviceChannel, sipMsgInfo.getDevice());
- mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
- mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
- mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
- mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());
+ mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
+ mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
+ mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
+ mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());
- if (userSetting.getSavePositionHistory()) {
- storager.insertMobilePosition(mobilePosition);
+ if (userSetting.getSavePositionHistory()) {
+ storager.insertMobilePosition(mobilePosition);
+ }
+ storager.updateChannelPosition(deviceChannel);
+
+ // 鍙戦�乺edis娑堟伅銆� 閫氱煡浣嶇疆淇℃伅鐨勫彉鍖�
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", mobilePosition.getTime());
+ jsonObject.put("serial", deviceChannel.getDeviceId());
+ jsonObject.put("code", deviceChannel.getChannelId());
+ jsonObject.put("longitude", mobilePosition.getLongitude());
+ jsonObject.put("latitude", mobilePosition.getLatitude());
+ jsonObject.put("altitude", mobilePosition.getAltitude());
+ jsonObject.put("direction", mobilePosition.getDirection());
+ jsonObject.put("speed", mobilePosition.getSpeed());
+ redisCatchStorage.sendMobilePositionMsg(jsonObject);
}
- storager.updateChannelPosition(deviceChannel);
-
- // 鍙戦�乺edis娑堟伅銆� 閫氱煡浣嶇疆淇℃伅鐨勫彉鍖�
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("time", mobilePosition.getTime());
- jsonObject.put("serial", deviceChannel.getDeviceId());
- jsonObject.put("code", deviceChannel.getChannelId());
- jsonObject.put("longitude", mobilePosition.getLongitude());
- jsonObject.put("latitude", mobilePosition.getLatitude());
- jsonObject.put("altitude", mobilePosition.getAltitude());
- jsonObject.put("direction", mobilePosition.getDirection());
- jsonObject.put("speed", mobilePosition.getSpeed());
- redisCatchStorage.sendMobilePositionMsg(jsonObject);
}
- }
- if (!ObjectUtils.isEmpty(deviceAlarm.getDeviceId())) {
- if (deviceAlarm.getAlarmMethod().contains(DeviceAlarmMethod.Video.getVal() + "")) {
- deviceAlarm.setAlarmType(getText(sipMsgInfo.getRootElement().element("Info"), "AlarmType"));
+ if (!ObjectUtils.isEmpty(deviceAlarm.getDeviceId())) {
+ if (deviceAlarm.getAlarmMethod().contains(DeviceAlarmMethod.Video.getVal() + "")) {
+ deviceAlarm.setAlarmType(getText(sipMsgInfo.getRootElement().element("Info"), "AlarmType"));
+ }
}
- }
- logger.info("[鏀跺埌鎶ヨ閫氱煡]鍐呭锛歿}", JSON.toJSONString(deviceAlarm));
- if ("7".equals(deviceAlarm.getAlarmMethod()) ) {
- // 鍙戦�佺粰骞冲彴鐨勬姤璀︿俊鎭�� 鍙戦�乺edis閫氱煡
- AlarmChannelMessage alarmChannelMessage = new AlarmChannelMessage();
- alarmChannelMessage.setAlarmSn(Integer.parseInt(deviceAlarm.getAlarmMethod()));
- alarmChannelMessage.setAlarmDescription(deviceAlarm.getAlarmDescription());
- alarmChannelMessage.setGbId(channelId);
- redisCatchStorage.sendAlarmMsg(alarmChannelMessage);
- continue;
- }
+ logger.info("[鏀跺埌鎶ヨ閫氱煡]鍐呭锛歿}", JSON.toJSONString(deviceAlarm));
+ if ("7".equals(deviceAlarm.getAlarmMethod()) ) {
+ // 鍙戦�佺粰骞冲彴鐨勬姤璀︿俊鎭�� 鍙戦�乺edis閫氱煡
+ AlarmChannelMessage alarmChannelMessage = new AlarmChannelMessage();
+ alarmChannelMessage.setAlarmSn(Integer.parseInt(deviceAlarm.getAlarmMethod()));
+ alarmChannelMessage.setAlarmDescription(deviceAlarm.getAlarmDescription());
+ alarmChannelMessage.setGbId(channelId);
+ redisCatchStorage.sendAlarmMsg(alarmChannelMessage);
+ continue;
+ }
- logger.debug("瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�");
- // 瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�
- if (sipConfig.isAlarm()) {
- deviceAlarmService.add(deviceAlarm);
- }
+ logger.debug("瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�");
+ // 瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�
+ if (sipConfig.isAlarm()) {
+ deviceAlarmService.add(deviceAlarm);
+ }
- if (redisCatchStorage.deviceIsOnline(sipMsgInfo.getDevice().getDeviceId())) {
- publisher.deviceAlarmEventPublish(deviceAlarm);
+ if (redisCatchStorage.deviceIsOnline(sipMsgInfo.getDevice().getDeviceId())) {
+ publisher.deviceAlarmEventPublish(deviceAlarm);
+ }
+ }catch (Exception e) {
+ logger.warn("[鏀跺埌鎶ヨ閫氱煡] 鍙戠幇鏈鐞嗙殑寮傚父, {}\r\n{}",e.getMessage(), evt.getRequest());
}
}
- taskQueueHandlerRun = false;
});
}
-
-
}
@Override
--
Gitblit v1.8.0