去除旧的gps通知

src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java

@@ -126,11 +126,6 @@ public class VideoManagerConstants {
 	 */
 	public static final String VM_MSG_GET_ALL_ONLINE_REQUESTED = "VM_MSG_GET_ALL_ONLINE_REQUESTED";
 
-	/**
-	 * 移动位置订阅通知
-	 */
-	public static final String VM_MSG_SUBSCRIBE_MOBILE_POSITION = "mobileposition";
-
 	/**
 	 * 报警订阅的通知（收到报警向redis发出通知）
 	 */

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java

@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.gb28181.service.impl;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.common.InviteInfo;
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.enums.ChannelDataType;
@@ -367,17 +366,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
             }catch (Exception e) {
                 log.error("[向上级转发移动位置失败] ", e);
             }
-            // 发送redis消息。 通知位置信息的变化
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
-            jsonObject.put("serial", mobilePosition.getDeviceId());
-            jsonObject.put("code", channel.getDeviceId());
-            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);
         }
     }
 

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java

@@ -1,16 +1,15 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.HandlerCatchData;
 import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 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.utils.NumericUtil;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.service.IMobilePositionService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.utils.DateUtil;
@@ -168,36 +167,6 @@ public class NotifyRequestForMobilePositionProcessor extends SIPRequestProcessor
 				}catch (Exception e) {
 					log.error("[向上级转发移动位置失败] ", e);
 				}
-				if (mobilePosition.getChannelId() == null) {
-					List<DeviceChannel> channels = deviceChannelService.queryChaneListByDeviceId(mobilePosition.getDeviceId());
-					channels.forEach(channel -> {
-						// 发送redis消息。 通知位置信息的变化
-						JSONObject jsonObject = new JSONObject();
-						jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
-						jsonObject.put("serial", device.getDeviceId());
-						jsonObject.put("code", channel.getDeviceId());
-						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);
-					});
-				}else {
-					// 发送redis消息。 通知位置信息的变化
-					if (deviceChannel != null) {
-						JSONObject jsonObject = new JSONObject();
-						jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
-						jsonObject.put("serial", mobilePosition.getDeviceId());
-						jsonObject.put("code", deviceChannel.getDeviceId());
-						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 e) {
 				log.error("[收到移动位置订阅通知] 文档解析异常： \r\n{}", evt.getRequest(), e);
 			} catch ( Exception e) {

src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java

@@ -97,8 +97,6 @@ public interface IRedisCatchStorage {
 
     void addNetInfo(Map<String, Double> networkInterfaces);
 
-    void sendMobilePositionMsg(JSONObject jsonObject);
-
     void sendStreamPushRequestedMsg(MessageForPushChannel messageForPushChannel);
 
     /**

src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

@@ -344,13 +344,6 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
         return systemAllInfo;
     }
 
-    @Override
-    public void sendMobilePositionMsg(JSONObject jsonObject) {
-        String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
-        log.debug("[redis发送通知] 发送 移动位置 {}: {}", key, jsonObject.toString());
-        redisTemplate.convertAndSend(key, jsonObject);
-    }
-
     @Override
     public void sendStreamPushRequestedMsg(MessageForPushChannel msg) {
         String key = VideoManagerConstants.VM_MSG_STREAM_PUSH_REQUESTED;