|
@@ -1,16 +1,16 @@
|
|
|
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
|
|
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.genersoft.iot.vmp.conf.UserSetting;
|
|
import com.genersoft.iot.vmp.conf.UserSetting;
|
|
|
import com.genersoft.iot.vmp.gb28181.bean.*;
|
|
import com.genersoft.iot.vmp.gb28181.bean.*;
|
|
|
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
|
|
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.IMessageHandler;
|
|
|
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
|
|
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.NumericUtil;
|
|
|
import com.genersoft.iot.vmp.service.IDeviceChannelService;
|
|
import com.genersoft.iot.vmp.service.IDeviceChannelService;
|
|
|
|
|
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
|
|
|
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
|
|
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
|
|
|
import com.genersoft.iot.vmp.utils.DateUtil;
|
|
import com.genersoft.iot.vmp.utils.DateUtil;
|
|
|
-import com.genersoft.iot.vmp.utils.GpsUtil;
|
|
|
|
|
import org.dom4j.DocumentException;
|
|
import org.dom4j.DocumentException;
|
|
|
import org.dom4j.Element;
|
|
import org.dom4j.Element;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -28,6 +28,9 @@ import java.text.ParseException;
|
|
|
|
|
|
|
|
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
|
|
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
|
|
|
|
|
|
|
|
|
|
+/**
|
|
|
|
|
+ * 移动设备位置数据通知,设备主动发起,不需要上级订阅
|
|
|
|
|
+ */
|
|
|
@Component
|
|
@Component
|
|
|
public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
|
|
public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
|
|
|
|
|
|
|
@@ -43,6 +46,9 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IVideoManagerStorage storager;
|
|
private IVideoManagerStorage storager;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private IRedisCatchStorage redisCatchStorage;
|
|
|
|
|
+
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IDeviceChannelService deviceChannelService;
|
|
private IDeviceChannelService deviceChannelService;
|
|
|
|
|
|
|
@@ -56,7 +62,11 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
rootElement = getRootElement(evt, device.getCharset());
|
|
rootElement = getRootElement(evt, device.getCharset());
|
|
|
-
|
|
|
|
|
|
|
+ if (rootElement == null) {
|
|
|
|
|
+ logger.warn("[ 移动设备位置数据通知 ] content cannot be null");
|
|
|
|
|
+ responseAck(evt, Response.BAD_REQUEST);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
MobilePosition mobilePosition = new MobilePosition();
|
|
MobilePosition mobilePosition = new MobilePosition();
|
|
|
mobilePosition.setCreateTime(DateUtil.getNow());
|
|
mobilePosition.setCreateTime(DateUtil.getNow());
|
|
|
if (!StringUtils.isEmpty(device.getName())) {
|
|
if (!StringUtils.isEmpty(device.getName())) {
|
|
@@ -106,6 +116,19 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen
|
|
|
storager.updateChannelPosition(deviceChannel);
|
|
storager.updateChannelPosition(deviceChannel);
|
|
|
//回复 200 OK
|
|
//回复 200 OK
|
|
|
responseAck(evt, Response.OK);
|
|
responseAck(evt, Response.OK);
|
|
|
|
|
+
|
|
|
|
|
+ // 发送redis消息。 通知位置信息的变化
|
|
|
|
|
+ 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);
|
|
|
|
|
+
|
|
|
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
|
|
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
}
|
|
}
|