From 04789eecab1e759fd31f234e56a50d46c4123d74 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Thu, 16 Apr 2026 18:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=A7=A3=E6=9E=90=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/bean/MobilePosition.java | 54 +++++++++++ .../MobilePositionNotifyMessageHandler.java | 96 ++++++++----------- 2 files changed, 93 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java index c739f6b2e..38d9552c5 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java @@ -1,6 +1,16 @@ package com.genersoft.iot.vmp.gb28181.bean; +import com.genersoft.iot.vmp.gb28181.utils.NumericUtil; +import com.genersoft.iot.vmp.gb28181.utils.SipUtils; +import com.genersoft.iot.vmp.utils.DateUtil; import lombok.Data; +import org.dom4j.Element; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText; /** * @description: 移动位置bean @@ -69,6 +79,50 @@ public class MobilePosition { */ private String createTime; + public static List decode(String deviceName, String deviceId, Element rootElementAfterCharset) { + + List mobilePositions = new ArrayList<>(); + + MobilePosition mobilePosition = new MobilePosition(); + mobilePosition.setCreateTime(DateUtil.getNow()); + if (!ObjectUtils.isEmpty(deviceName)) { + mobilePosition.setDeviceName(deviceName); + } + mobilePosition.setDeviceId(deviceId); + + String channelId = getText(rootElementAfterCharset, "DeviceID"); + + mobilePosition.setChannelDeviceId(channelId); + String time = getText(rootElementAfterCharset, "Time"); + if (ObjectUtils.isEmpty(time)){ + mobilePosition.setTime(DateUtil.getNow()); + }else { + mobilePosition.setTime(SipUtils.parseTime(time)); + } + mobilePosition.setLongitude(Double.parseDouble(getText(rootElementAfterCharset, "Longitude"))); + mobilePosition.setLatitude(Double.parseDouble(getText(rootElementAfterCharset, "Latitude"))); + if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Speed"))) { + mobilePosition.setSpeed(Double.parseDouble(getText(rootElementAfterCharset, "Speed"))); + } else { + mobilePosition.setSpeed(0.0); + } + if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Direction"))) { + mobilePosition.setDirection(Double.parseDouble(getText(rootElementAfterCharset, "Direction"))); + } else { + mobilePosition.setDirection(0.0); + } + if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Altitude"))) { + mobilePosition.setAltitude(Double.parseDouble(getText(rootElementAfterCharset, "Altitude"))); + } else { + mobilePosition.setAltitude(0.0); + } + mobilePosition.setReportSource("Mobile Position"); + + mobilePositions.add(mobilePosition); + + return mobilePositions; + } + @Override public String toString() { return "MobilePosition{" + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java index dcf86004d..452c6537b 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java @@ -1,33 +1,29 @@ package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd; import com.genersoft.iot.vmp.gb28181.bean.*; +import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService; 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.NumericUtil; -import com.genersoft.iot.vmp.gb28181.utils.SipUtils; -import com.genersoft.iot.vmp.utils.DateUtil; +import com.genersoft.iot.vmp.service.IMobilePositionService; import gov.nist.javax.sip.message.SIPRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dom4j.DocumentException; import org.dom4j.Element; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Component; -import org.springframework.util.ObjectUtils; import javax.sip.InvalidArgumentException; import javax.sip.RequestEvent; import javax.sip.SipException; import javax.sip.message.Response; import java.text.ParseException; +import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; -import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText; - /** * 移动设备位置数据通知，设备主动发起，不需要上级订阅 */ @@ -38,16 +34,17 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen private final String cmdType = "MobilePosition"; - @Autowired - private NotifyMessageHandler notifyMessageHandler; + private final NotifyMessageHandler notifyMessageHandler; - @Autowired - private IDeviceChannelService deviceChannelService; + private final IMobilePositionService mobilePositionService; - private ConcurrentLinkedQueue taskQueue = new ConcurrentLinkedQueue<>(); + private final IDeviceChannelService deviceChannelService; - @Autowired - private TaskExecutor taskExecutor; + private final ConcurrentLinkedQueue taskQueue = new ConcurrentLinkedQueue<>(); + + private final TaskExecutor taskExecutor; + + private final EventPublisher eventPublisher; @Override public void afterPropertiesSet() throws Exception { @@ -75,53 +72,38 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen log.warn("[移动位置通知] {}处理失败，未识别到信息体", device.getDeviceId()); continue; } - String channelId = getText(rootElementAfterCharset, "DeviceID"); - DeviceChannel deviceChannel = deviceChannelService.getOne(device.getDeviceId(), channelId); - if (deviceChannel == null) { - log.warn("[解析移动位置通知] 未找到通道：{}/{}", device.getDeviceId(), channelId); - continue; - } - MobilePosition mobilePosition = new MobilePosition(); - mobilePosition.setCreateTime(DateUtil.getNow()); - if (!ObjectUtils.isEmpty(sipMsgInfo.getDevice().getName())) { - mobilePosition.setDeviceName(sipMsgInfo.getDevice().getName()); - } - mobilePosition.setDeviceId(sipMsgInfo.getDevice().getDeviceId()); + List mobilePositionList = MobilePosition.decode(sipMsgInfo.getDevice().getName(), sipMsgInfo.getDevice().getDeviceId(), rootElementAfterCharset); + mobilePositionList.forEach(mobilePosition -> { + try { + // 更新device channel 的经纬度 + DeviceChannel deviceChannel = deviceChannelService.getOne(device.getDeviceId(), mobilePosition.getChannelDeviceId()); + if (deviceChannel == null) { + log.warn("[解析移动位置通知] 未找到通道：{}/{}", device.getDeviceId(), mobilePosition.getChannelDeviceId()); + return; + } + mobilePosition.setChannelId(deviceChannel.getId()); + mobilePosition.setReportSource("Mobile Position"); - mobilePosition.setChannelId(deviceChannel.getId()); - mobilePosition.setChannelDeviceId(deviceChannel.getDeviceId()); - String time = getText(rootElementAfterCharset, "Time"); - if (ObjectUtils.isEmpty(time)){ - mobilePosition.setTime(DateUtil.getNow()); - }else { - mobilePosition.setTime(SipUtils.parseTime(time)); - } - mobilePosition.setLongitude(Double.parseDouble(getText(rootElementAfterCharset, "Longitude"))); - mobilePosition.setLatitude(Double.parseDouble(getText(rootElementAfterCharset, "Latitude"))); - if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Speed"))) { - mobilePosition.setSpeed(Double.parseDouble(getText(rootElementAfterCharset, "Speed"))); - } else { - mobilePosition.setSpeed(0.0); - } - if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Direction"))) { - mobilePosition.setDirection(Double.parseDouble(getText(rootElementAfterCharset, "Direction"))); - } else { - mobilePosition.setDirection(0.0); - } - if (NumericUtil.isDouble(getText(rootElementAfterCharset, "Altitude"))) { - mobilePosition.setAltitude(Double.parseDouble(getText(rootElementAfterCharset, "Altitude"))); - } else { - mobilePosition.setAltitude(0.0); - } - mobilePosition.setReportSource("Mobile Position"); + log.info("[收到移动位置订阅通知]：{}/{}->{}.{}, 时间： {}", mobilePosition.getDeviceId(), mobilePosition.getChannelDeviceId(), + mobilePosition.getLongitude(), mobilePosition.getLatitude(), mobilePosition.getTime()); - // 更新device channel 的经纬度 - deviceChannel.setLongitude(mobilePosition.getLongitude()); - deviceChannel.setLatitude(mobilePosition.getLatitude()); - deviceChannel.setGpsTime(mobilePosition.getTime()); + mobilePositionService.add(mobilePosition); + // 向关联了该通道并且开启移动位置订阅的上级平台发送移动位置订阅消息 + try { + eventPublisher.mobilePositionEventPublish(mobilePosition); + }catch (Exception e) { + log.error("[MobilePositionEvent] 发送失败： ", e); + } - deviceChannelService.updateChannelGPS(device, deviceChannel, mobilePosition); + deviceChannel.setLongitude(mobilePosition.getLongitude()); + deviceChannel.setLatitude(mobilePosition.getLatitude()); + deviceChannel.setGpsTime(mobilePosition.getTime()); + deviceChannelService.updateChannelGPS(device, deviceChannel, mobilePosition); + }catch (Exception e) { + log.error("未处理的异常 ", e); + } + }); } catch (DocumentException e) { log.error("未处理的异常 ", e);