优化对讲逻辑

648540858

2022-07-03 72c1b36d6d2ece497e032c8434641d6576590f9d

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

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

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -26,6 +25,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

@@ -36,6 +37,7 @@
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;

/**
 * SIP命令类型： NOTIFY请求
@@ -64,10 +66,18 @@
   @Autowired
   private EventPublisher publisher;

   private String method = "NOTIFY";
   private final String method = "NOTIFY";

   @Autowired
   private SIPProcessorObserver sipProcessorObserver;

   private boolean taskQueueHandlerRun = false;

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

   @Qualifier("taskExecutor")
   @Autowired
   private ThreadPoolTaskExecutor taskExecutor;

   @Override
   public void afterPropertiesSet() throws Exception {
@@ -78,23 +88,40 @@
   @Override
   public void process(RequestEvent evt) {
      try {
         Element rootElement = getRootElement(evt);
         String cmd = XmlUtil.getText(rootElement, "CmdType");

         if (CmdType.CATALOG.equals(cmd)) {
            logger.info("接收到Catalog通知");
            processNotifyCatalogList(evt);
         } else if (CmdType.ALARM.equals(cmd)) {
            logger.info("接收到Alarm通知");
            processNotifyAlarm(evt);
         } else if (CmdType.MOBILE_POSITION.equals(cmd)) {
            logger.info("接收到MobilePosition通知");
            processNotifyMobilePosition(evt);
         } else {
            logger.info("接收到消息：" + cmd);
            responseAck(evt, Response.OK);
         taskQueue.offer(new HandlerCatchData(evt, null, null));
         responseAck(evt, Response.OK);
         if (!taskQueueHandlerRun) {
            taskQueueHandlerRun = true;
            taskExecutor.execute(()-> {
                     while (!taskQueue.isEmpty()) {
                        try {
                           HandlerCatchData take = taskQueue.poll();
                           Element rootElement = getRootElement(take.getEvt());
                           String cmd = XmlUtil.getText(rootElement, "CmdType");

                           if (CmdType.CATALOG.equals(cmd)) {
                              logger.info("接收到Catalog通知");
                              processNotifyCatalogList(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) {
                           throw new RuntimeException(e);
                        }
                     }
                  taskQueueHandlerRun = false;
                  });
         }
      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {


      } catch (SipException | InvalidArgumentException | ParseException e) {
         e.printStackTrace();
      }
   }
@@ -167,8 +194,7 @@
         jsonObject.put("direction", mobilePosition.getDirection());
         jsonObject.put("speed", mobilePosition.getSpeed());
         redisCatchStorage.sendMobilePositionMsg(jsonObject);
         responseAck(evt, Response.OK);
      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
      } catch (DocumentException  e) {
         e.printStackTrace();
      }
   }
@@ -189,7 +215,7 @@

         Device device = redisCatchStorage.getDevice(deviceId);
         if (device == null) {
            responseAck(evt, Response.NOT_FOUND, "device is not found");
            logger.warn("[ NotifyAlarm ] 未找到设备：{}", deviceId);
            return;
         }
         rootElement = getRootElement(evt, device.getCharset());
@@ -199,7 +225,7 @@
         deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
         String alarmTime = XmlUtil.getText(rootElement, "AlarmTime");
         if (alarmTime == null) {
            responseAck(evt, Response.BAD_REQUEST, "AlarmTime cannot be null");
            logger.warn("[ NotifyAlarm ] AlarmTime cannot be null");
            return;
         }
         deviceAlarm.setAlarmTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(alarmTime));
@@ -219,7 +245,7 @@
            deviceAlarm.setLatitude(0.00);
         }
         logger.info("[收到Notify-Alarm]：{}/{}", device.getDeviceId(), deviceAlarm.getChannelId());
         if (deviceAlarm.getAlarmMethod().equals("4")) {
         if ("4".equals(deviceAlarm.getAlarmMethod())) {
            MobilePosition mobilePosition = new MobilePosition();
            mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
            mobilePosition.setTime(deviceAlarm.getAlarmTime());
@@ -240,11 +266,10 @@
         // TODO: 需要实现存储报警信息、报警分类

         // 回复200 OK
         responseAck(evt, Response.OK);
         if (redisCatchStorage.deviceIsOnline(deviceId)) {
            publisher.deviceAlarmEventPublish(deviceAlarm);
         }
      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
      } catch (DocumentException e) {
         e.printStackTrace();
      }
   }
@@ -280,64 +305,60 @@
                  continue;
               }
               Element eventElement = itemDevice.element("Event");
               DeviceChannel channel = XmlUtil.channelContentHander(itemDevice);
               String event;
               if (eventElement == null) {
                  logger.warn("[收到 目录订阅]：{}, 但是Event为空, 设为默认值 ADD", (device != null ? device.getDeviceId():"" ));
                  event = CatalogEvent.ADD;
               }else {
                  event = eventElement.getText().toUpperCase();
               }
               DeviceChannel channel = XmlUtil.channelContentHander(itemDevice, device);
               channel.setDeviceId(device.getDeviceId());
               logger.info("[收到 目录订阅]：{}/{}", device.getDeviceId(), channel.getChannelId());
               switch (eventElement.getText().toUpperCase()) {
               switch (event) {
                  case CatalogEvent.ON:
                     // 上线
                     logger.info("收到来自设备【{}】的通道【{}】上线通知", device.getDeviceId(), channel.getChannelId());
                     storager.deviceChannelOnline(deviceId, channel.getChannelId());
                     // 回复200 OK
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.OFF :
                     // 离线
                     logger.info("收到来自设备【{}】的通道【{}】离线通知", device.getDeviceId(), channel.getChannelId());
                     storager.deviceChannelOffline(deviceId, channel.getChannelId());
                     // 回复200 OK
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.VLOST:
                     // 视频丢失
                     logger.info("收到来自设备【{}】的通道【{}】视频丢失通知", device.getDeviceId(), channel.getChannelId());
                     storager.deviceChannelOffline(deviceId, channel.getChannelId());
                     // 回复200 OK
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.DEFECT:
                     // 故障
                     // 回复200 OK
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.ADD:
                     // 增加
                     logger.info("收到来自设备【{}】的增加通道【{}】通知", device.getDeviceId(), channel.getChannelId());
                     storager.updateChannel(deviceId, channel);
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.DEL:
                     // 删除
                     logger.info("收到来自设备【{}】的删除通道【{}】通知", device.getDeviceId(), channel.getChannelId());
                     storager.delChannel(deviceId, channel.getChannelId());
                     responseAck(evt, Response.OK);
                     break;
                  case CatalogEvent.UPDATE:
                     // 更新
                     logger.info("收到来自设备【{}】的更新通道【{}】通知", device.getDeviceId(), channel.getChannelId());
                     storager.updateChannel(deviceId, channel);
                     responseAck(evt, Response.OK);
                     break;
                  default:
                     responseAck(evt, Response.BAD_REQUEST, "event not found");
                     logger.warn("[ NotifyCatalog ] event not found ： {}", event );

               }
               // 转发变化信息
               eventPublisher.catalogEventPublish(null, channel, eventElement.getText().toUpperCase());
               eventPublisher.catalogEventPublish(null, channel, event);

            }
         }
      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
      } catch (DocumentException e) {
         e.printStackTrace();
      }
   }