修复收到catalog消息是更新导致是否有音频的设置失效的BUG

648540858

2024-04-24 c21d973977a9f1d00d26179de764687ddd0ec56c

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

@@ -1,12 +1,9 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;

import com.alibaba.fastjson2.JSONObject;
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.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
@@ -28,9 +25,9 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;

import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -38,7 +35,7 @@
import javax.sip.header.FromHeader;
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;

@@ -81,7 +78,7 @@
   private NotifyRequestForCatalogProcessor notifyRequestForCatalogProcessor;

   @Autowired
   private CivilCodeFileConf civilCodeFileConf;
   private NotifyRequestForMobilePositionProcessor notifyRequestForMobilePositionProcessor;

   private ConcurrentLinkedQueue<HandlerCatchData> taskQueue = new ConcurrentLinkedQueue<>();

@@ -100,381 +97,157 @@
   @Override
   public void process(RequestEvent evt) {
      try {

         if (taskQueue.size() >= userSetting.getMaxNotifyCountQueue()) {
            responseAck((SIPRequest) evt.getRequest(), Response.BUSY_HERE, null, null);
            logger.error("[notify] 待处理消息队列已满 {}，返回486 BUSY_HERE，消息不做处理", userSetting.getMaxNotifyCountQueue());
            return;
         }else {
         } else {
            responseAck((SIPRequest) evt.getRequest(), Response.OK, null, null);
         }

      }catch (SipException | InvalidArgumentException | ParseException e) {
      } catch (SipException | InvalidArgumentException | ParseException e) {
         logger.error("未处理的异常 ", e);
      }
      boolean runed = !taskQueue.isEmpty();
      logger.info("[notify] 待处理消息数量： {}", taskQueue.size());
      taskQueue.offer(new HandlerCatchData(evt, null, null));
      if (!runed) {
         taskExecutor.execute(()-> {
            while (!taskQueue.isEmpty()) {
               try {
                  HandlerCatchData take = taskQueue.poll();
                  if (take == null) {
                     continue;
                  }
                  Element rootElement = getRootElement(take.getEvt());
                  if (rootElement == null) {
                     logger.error("处理NOTIFY消息时未获取到消息体,{}", take.getEvt().getRequest());
                     continue;
                  }
                  String cmd = XmlUtil.getText(rootElement, "CmdType");

                  if (CmdType.CATALOG.equals(cmd)) {
                     logger.info("接收到Catalog通知");
                     processNotifyCatalogList(take.getEvt());
                     notifyRequestForCatalogProcessor.process(take.getEvt());
                  } else if (CmdType.ALARM.equals(cmd)) {
                     logger.info("接收到Alarm通知");
                     processNotifyAlarm(take.getEvt());
                  } else if (CmdType.MOBILE_POSITION.equals(cmd)) {
                     logger.info("接收到MobilePosition通知");
                     processNotifyMobilePosition(take.getEvt());
                  } else {
                     logger.info("接收到消息：" + cmd);
                  }
               } catch (DocumentException e) {
                  logger.error("处理NOTIFY消息时错误", e);
               }
            }
         });
      }
   }

   /**
    * 处理MobilePosition移动位置Notify
    *
    * @param evt
    */
   private void processNotifyMobilePosition(RequestEvent evt) {
   @Scheduled(fixedRate = 200)   //每200毫秒执行一次
   public void executeTaskQueue(){
      if (taskQueue.isEmpty()) {
         return;
      }
      try {
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
         String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);
         List<RequestEvent> catalogEventList = new ArrayList<>();
         List<RequestEvent> alarmEventList = new ArrayList<>();
         List<RequestEvent> mobilePositionEventList = new ArrayList<>();
         for (HandlerCatchData take : taskQueue) {
            if (take == null) {
               continue;
            }
            Element rootElement = getRootElement(take.getEvt());
            if (rootElement == null) {
               logger.error("处理NOTIFY消息时未获取到消息体,{}", take.getEvt().getRequest());
               continue;
            }
            String cmd = XmlUtil.getText(rootElement, "CmdType");

         // 回复 200 OK
         Element rootElement = getRootElement(evt);
         if (rootElement == null) {
            logger.error("处理MobilePosition移动位置Notify时未获取到消息体,{}", evt.getRequest());
            return;
         }

         MobilePosition mobilePosition = new MobilePosition();
         mobilePosition.setCreateTime(DateUtil.getNow());

         Element deviceIdElement = rootElement.element("DeviceID");
         String channelId = deviceIdElement.getTextTrim().toString();
         Device device = redisCatchStorage.getDevice(deviceId);

         if (device == null) {
            device = redisCatchStorage.getDevice(channelId);
            if (device == null) {
               // 根据通道id查询设备Id
               List<Device> deviceList = deviceChannelService.getDeviceByChannelId(channelId);
               if (deviceList.size() > 0) {
                  device = deviceList.get(0);
               }
            if (CmdType.CATALOG.equals(cmd)) {
               catalogEventList.add(take.getEvt());
            } else if (CmdType.ALARM.equals(cmd)) {
               alarmEventList.add(take.getEvt());
            } else if (CmdType.MOBILE_POSITION.equals(cmd)) {
               mobilePositionEventList.add(take.getEvt());
            } else {
               logger.info("接收到消息：" + cmd);
            }
         }
         if (device == null) {
            logger.warn("[mobilePosition移动位置Notify] 未找到通道{}所属的设备", channelId);
            return;
         taskQueue.clear();
         if (!alarmEventList.isEmpty()) {
            processNotifyAlarm(alarmEventList);
         }
         if (!ObjectUtils.isEmpty(device.getName())) {
            mobilePosition.setDeviceName(device.getName());
         if (!catalogEventList.isEmpty()) {
            notifyRequestForCatalogProcessor.process(catalogEventList);
         }

         mobilePosition.setDeviceId(device.getDeviceId());
         mobilePosition.setChannelId(channelId);
         String time = XmlUtil.getText(rootElement, "Time");
         if (ObjectUtils.isEmpty(time)){
            mobilePosition.setTime(DateUtil.getNow());
         }else {
            mobilePosition.setTime(SipUtils.parseTime(time));
         if (!mobilePositionEventList.isEmpty()) {
            notifyRequestForMobilePositionProcessor.process(mobilePositionEventList);
         }

         mobilePosition.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
         mobilePosition.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
         if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Speed"))) {
            mobilePosition.setSpeed(Double.parseDouble(XmlUtil.getText(rootElement, "Speed")));
         } else {
            mobilePosition.setSpeed(0.0);
         }
         if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Direction"))) {
            mobilePosition.setDirection(Double.parseDouble(XmlUtil.getText(rootElement, "Direction")));
         } else {
            mobilePosition.setDirection(0.0);
         }
         if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Altitude"))) {
            mobilePosition.setAltitude(Double.parseDouble(XmlUtil.getText(rootElement, "Altitude")));
         } else {
            mobilePosition.setAltitude(0.0);
         }
         logger.info("[收到移动位置订阅通知]：{}/{}->{}.{}", mobilePosition.getDeviceId(), mobilePosition.getChannelId(),
               mobilePosition.getLongitude(), mobilePosition.getLatitude());
         mobilePosition.setReportSource("Mobile Position");


         // 更新device channel 的经纬度
         DeviceChannel deviceChannel = new DeviceChannel();
         deviceChannel.setDeviceId(device.getDeviceId());
         deviceChannel.setChannelId(channelId);
         deviceChannel.setLongitude(mobilePosition.getLongitude());
         deviceChannel.setLatitude(mobilePosition.getLatitude());
         deviceChannel.setGpsTime(mobilePosition.getTime());
         deviceChannel = deviceChannelService.updateGps(deviceChannel, device);

         mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
         mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
         mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
         mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());

         if (userSetting.getSavePositionHistory()) {
            storager.insertMobilePosition(mobilePosition);
         }

         storager.updateChannelPosition(deviceChannel);

         // 发送redis消息。 通知位置信息的变化
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
         jsonObject.put("serial", deviceId);
         jsonObject.put("code", channelId);
         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) {
         logger.error("未处理的异常 ", e);
      } catch (DocumentException e) {
         logger.error("处理NOTIFY消息时错误", e);
      }
   }

   /***
    * 处理alarm设备报警Notify
    *
    * @param evt
    */
   private void processNotifyAlarm(RequestEvent evt) {
   private void processNotifyAlarm(List<RequestEvent> evtList) {
      if (!sipConfig.isAlarm()) {
         return;
      }
      try {
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
         String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);
      if (!evtList.isEmpty()) {
         for (RequestEvent evt : evtList) {
            try {
               FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
               String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);

         Element rootElement = getRootElement(evt);
         if (rootElement == null) {
            logger.error("处理alarm设备报警Notify时未获取到消息体{}", evt.getRequest());
            return;
         }
         Element deviceIdElement = rootElement.element("DeviceID");
         String channelId = deviceIdElement.getText().toString();

         Device device = redisCatchStorage.getDevice(deviceId);
         if (device == null) {
            logger.warn("[ NotifyAlarm ] 未找到设备：{}", deviceId);
            return;
         }
         rootElement = getRootElement(evt, device.getCharset());
         if (rootElement == null) {
            logger.warn("[ NotifyAlarm ] content cannot be null, {}", evt.getRequest());
            return;
         }
         DeviceAlarm deviceAlarm = new DeviceAlarm();
         deviceAlarm.setDeviceId(deviceId);
         deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
         deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
         String alarmTime = XmlUtil.getText(rootElement, "AlarmTime");
         if (alarmTime == null) {
            logger.warn("[ NotifyAlarm ] AlarmTime cannot be null");
            return;
         }
         deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
         if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
            deviceAlarm.setAlarmDescription("");
         } else {
            deviceAlarm.setAlarmDescription(XmlUtil.getText(rootElement, "AlarmDescription"));
         }
         if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Longitude"))) {
            deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
         } else {
            deviceAlarm.setLongitude(0.00);
         }
         if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Latitude"))) {
            deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
         } else {
            deviceAlarm.setLatitude(0.00);
         }
         logger.info("[收到Notify-Alarm]：{}/{}", device.getDeviceId(), deviceAlarm.getChannelId());
         if ("4".equals(deviceAlarm.getAlarmMethod())) {
            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(device.getDeviceId());
            deviceChannel.setChannelId(channelId);
            deviceChannel.setLongitude(mobilePosition.getLongitude());
            deviceChannel.setLatitude(mobilePosition.getLatitude());
            deviceChannel.setGpsTime(mobilePosition.getTime());

            deviceChannel = deviceChannelService.updateGps(deviceChannel, device);

            mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
            mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
            mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
            mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());

            if (userSetting.getSavePositionHistory()) {
               storager.insertMobilePosition(mobilePosition);
            }

            storager.updateChannelPosition(deviceChannel);
            // 发送redis消息。 通知位置信息的变化
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(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);

         }
         // TODO: 需要实现存储报警信息、报警分类

         // 回复200 OK
         if (redisCatchStorage.deviceIsOnline(deviceId)) {
            publisher.deviceAlarmEventPublish(deviceAlarm);
         }
      } catch (DocumentException e) {
         logger.error("未处理的异常 ", e);
      }
   }

   /***
    * 处理catalog设备目录列表Notify
    *
    * @param evt
    */
   private void processNotifyCatalogList(RequestEvent evt) {
      try {
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
         String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);

         Device device = redisCatchStorage.getDevice(deviceId);
         if (device == null || !device.isOnLine()) {
            logger.warn("[收到目录订阅]：{}, 但是设备已经离线", (device != null ? device.getDeviceId():"" ));
            return;
         }
         Element rootElement = getRootElement(evt, device.getCharset());
         if (rootElement == null) {
            logger.warn("[ 收到目录订阅 ] content cannot be null, {}", evt.getRequest());
            return;
         }
         Element deviceListElement = rootElement.element("DeviceList");
         if (deviceListElement == null) {
            return;
         }
         Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
         if (deviceListIterator != null) {

            // 遍历DeviceList
            while (deviceListIterator.hasNext()) {
               Element itemDevice = deviceListIterator.next();
               Element channelDeviceElement = itemDevice.element("DeviceID");
               if (channelDeviceElement == null) {
                  continue;
               Element rootElement = getRootElement(evt);
               if (rootElement == null) {
                  logger.error("处理alarm设备报警Notify时未获取到消息体{}", evt.getRequest());
                  return;
               }
               Element eventElement = itemDevice.element("Event");
               String event;
               if (eventElement == null) {
                  logger.warn("[收到目录订阅]：{}, 但是Event为空, 设为默认值 ADD", (device != null ? device.getDeviceId():"" ));
                  event = CatalogEvent.ADD;
               }else {
                  event = eventElement.getText().toUpperCase();
               }
               DeviceChannel channel = XmlUtil.channelContentHandler(itemDevice, device, event, civilCodeFileConf);
               if (channel == null) {
                  logger.info("[收到目录订阅]：但是解析失败 {}", new String(evt.getRequest().getRawContent()));
                  continue;
               }
               if (channel.getParentId() != null && channel.getParentId().equals(sipConfig.getId())) {
                  channel.setParentId(null);
               }
               channel.setDeviceId(device.getDeviceId());
               logger.info("[收到目录订阅]：{}/{}", device.getDeviceId(), channel.getChannelId());
               switch (event) {
                  case CatalogEvent.ON:
                     // 上线
                     logger.info("[收到通道上线通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     storager.deviceChannelOnline(deviceId, channel.getChannelId());
                     break;
                  case CatalogEvent.OFF :
                     // 离线
                     logger.info("[收到通道离线通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     if (userSetting.getRefuseChannelStatusChannelFormNotify()) {
                        storager.deviceChannelOffline(deviceId, channel.getChannelId());
                     }else {
                        logger.info("[收到通道离线通知] 但是平台已配置拒绝此消息，来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     }
                     break;
                  case CatalogEvent.VLOST:
                     // 视频丢失
                     logger.info("[收到通道视频丢失通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     if (userSetting.getRefuseChannelStatusChannelFormNotify()) {
                        storager.deviceChannelOffline(deviceId, channel.getChannelId());
                     }else {
                        logger.info("[收到通道视频丢失通知] 但是平台已配置拒绝此消息，来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     }
                     break;
                  case CatalogEvent.DEFECT:
                     // 故障
                     break;
                  case CatalogEvent.ADD:
                     // 增加
                     logger.info("[收到增加通道通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     deviceChannelService.updateChannel(deviceId, channel);
                     break;
                  case CatalogEvent.DEL:
                     // 删除
                     logger.info("[收到删除通道通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     storager.delChannel(deviceId, channel.getChannelId());
                     break;
                  case CatalogEvent.UPDATE:
                     // 更新
                     logger.info("[收到更新通道通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     deviceChannelService.updateChannel(deviceId, channel);
                     break;
                  default:
                     logger.warn("[ NotifyCatalog ] event not found ： {}", event );
               Element deviceIdElement = rootElement.element("DeviceID");
               String channelId = deviceIdElement.getText().toString();

               Device device = redisCatchStorage.getDevice(deviceId);
               if (device == null) {
                  logger.warn("[ NotifyAlarm ] 未找到设备：{}", deviceId);
                  return;
               }
               // 转发变化信息
               eventPublisher.catalogEventPublish(null, channel, event);
               rootElement = getRootElement(evt, device.getCharset());
               if (rootElement == null) {
                  logger.warn("[ NotifyAlarm ] content cannot be null, {}", evt.getRequest());
                  return;
               }
               DeviceAlarm deviceAlarm = new DeviceAlarm();
               deviceAlarm.setDeviceId(deviceId);
               deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
               deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
               String alarmTime = XmlUtil.getText(rootElement, "AlarmTime");
               if (alarmTime == null) {
                  logger.warn("[ NotifyAlarm ] AlarmTime cannot be null");
                  return;
               }
               deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
               if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
                  deviceAlarm.setAlarmDescription("");
               } else {
                  deviceAlarm.setAlarmDescription(XmlUtil.getText(rootElement, "AlarmDescription"));
               }
               if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Longitude"))) {
                  deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
               } else {
                  deviceAlarm.setLongitude(0.00);
               }
               if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Latitude"))) {
                  deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
               } else {
                  deviceAlarm.setLatitude(0.00);
               }
               logger.info("[收到Notify-Alarm]：{}/{}", device.getDeviceId(), deviceAlarm.getChannelId());
               if ("4".equals(deviceAlarm.getAlarmMethod())) {
                  MobilePosition mobilePosition = new MobilePosition();
                  mobilePosition.setChannelId(channelId);
                  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(device.getDeviceId());
                  deviceChannel.setChannelId(channelId);
                  deviceChannel.setLongitude(mobilePosition.getLongitude());
                  deviceChannel.setLatitude(mobilePosition.getLatitude());
                  deviceChannel.setGpsTime(mobilePosition.getTime());

                  deviceChannel = deviceChannelService.updateGps(deviceChannel, device);

                  mobilePosition.setLongitudeWgs84(deviceChannel.getLongitudeWgs84());
                  mobilePosition.setLatitudeWgs84(deviceChannel.getLatitudeWgs84());
                  mobilePosition.setLongitudeGcj02(deviceChannel.getLongitudeGcj02());
                  mobilePosition.setLatitudeGcj02(deviceChannel.getLatitudeGcj02());

                  deviceChannelService.updateChannelGPS(device, deviceChannel, mobilePosition);
               }

               // 回复200 OK
               if (redisCatchStorage.deviceIsOnline(deviceId)) {
                  publisher.deviceAlarmEventPublish(deviceAlarm);
               }
            } catch (DocumentException e) {
               logger.error("未处理的异常 ", e);
            }
         }
      } catch (DocumentException e) {
         logger.error("未处理的异常 ", e);
      }
   }

@@ -502,4 +275,9 @@
   public void setRedisCatchStorage(IRedisCatchStorage redisCatchStorage) {
      this.redisCatchStorage = redisCatchStorage;
   }

   @Scheduled(fixedRate = 10000)   //每1秒执行一次
   public void execute(){
      logger.info("[待处理Notify消息数量]: {}", taskQueue.size());
   }
}