解决循环依赖导致的打包失败

panlinlin

2021-03-25 b37a77f23f995758178b6af38b89a860107d218d

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

@@ -4,14 +4,22 @@
import java.text.ParseException;

import java.util.*;



import javax.sip.address.SipURI;



import javax.sip.header.FromHeader;

import javax.sip.header.HeaderAddress;

import javax.sip.header.ToHeader;

import javax.sip.InvalidArgumentException;

import javax.sip.ListeningPoint;

import javax.sip.ObjectInUseException;

import javax.sip.RequestEvent;

import javax.sip.SipException;

import javax.sip.SipProvider;

import javax.sip.message.Request;

import javax.sip.message.Response;



import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.VManageBootstrap;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.common.VideoManagerConstants;

import com.genersoft.iot.vmp.conf.UserSetup;

@@ -34,6 +42,7 @@
import com.genersoft.iot.vmp.utils.redis.RedisUtil;

import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;



import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.address.AddressImpl;

import gov.nist.javax.sip.address.SipUri;



@@ -114,10 +123,10 @@
            logger.info("接收到Catalog消息");

            processMessageCatalogList(evt);

         } else if (MESSAGE_DEVICE_INFO.equals(cmd)) {

            logger.info("接收到DeviceInfo消息");

            //DeviceInfo消息处理

            processMessageDeviceInfo(evt);

         } else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {

            logger.info("接收到DeviceStatus消息");

            // DeviceStatus消息处理

            processMessageDeviceStatus(evt);

         } else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {

            logger.info("接收到DeviceControl消息");

@@ -211,27 +220,48 @@
   private void processMessageDeviceStatus(RequestEvent evt) {

      try {

         Element rootElement = getRootElement(evt);

         String deviceId = XmlUtil.getText(rootElement, "DeviceID");

         // 检查设备是否存在， 不存在则不回复

         if (storager.exists(deviceId)) {

            // 回复200 OK

            responseAck(evt);

            JSONObject json = new JSONObject();

            XmlUtil.node2Json(rootElement, json);

            if (logger.isDebugEnabled()) {

               logger.debug(json.toJSONString());

            }

            RequestMessage msg = new RequestMessage();

            msg.setDeviceId(deviceId);

            msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS);

            msg.setData(json);

            deferredResultHolder.invokeResult(msg);

         String name = rootElement.getName();

         Element deviceIdElement = rootElement.element("DeviceID");

         String deviceId = deviceIdElement.getText();



            if (offLineDetector.isOnline(deviceId)) {

               publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求

            logger.info("接收到DeviceStatus查询消息");

            FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);

            String platformId = ((SipUri) fromHeader.getAddress().getURI()).getUser();

               if (platformId == null) {

               response404Ack(evt);

               return;

            } else {

               // 回复200 OK

               responseAck(evt);

               String sn = rootElement.element("SN").getText();

               ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

               cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag());

            }

         } else {

            logger.info("接收到DeviceStatus应答消息");

            // 检查设备是否存在， 不存在则不回复

            if (storager.exists(deviceId)) {

               // 回复200 OK

               responseAck(evt);

               JSONObject json = new JSONObject();

               XmlUtil.node2Json(rootElement, json);

               if (logger.isDebugEnabled()) {

                  logger.debug(json.toJSONString());

               }

               RequestMessage msg = new RequestMessage();

               msg.setDeviceId(deviceId);

               msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS);

               msg.setData(json);

               deferredResultHolder.invokeResult(msg);



               if (offLineDetector.isOnline(deviceId)) {

                  publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

               } else {

               }

            }

         }



      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {

         e.printStackTrace();

      }

@@ -263,6 +293,51 @@
            deferredResultHolder.invokeResult(msg);

         } else {

            // 此处是上级发出的DeviceControl指令

            String platformId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();

            String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();

            // 远程启动功能

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {

               if (deviceId.equals(targetGBId)) {

                  // 远程启动功能：需要在重新启动程序后先对SipStack解绑

                  logger.info("执行远程启动本平台命令");

                  ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

                  cmderFroPlatform.unregister(parentPlatform, null, null);

	
                  Thread restartThread = new Thread(new Runnable() {

                     @Override

                     public void run() {

                        try {

                           Thread.sleep(3000);

                           SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");

                           SipStackImpl stack = (SipStackImpl)up.getSipStack();

                           stack.stop();

                           Iterator listener = stack.getListeningPoints();

                           while (listener.hasNext()) {

                              stack.deleteListeningPoint((ListeningPoint) listener.next());

                           }

                           Iterator providers = stack.getSipProviders();

                           while (providers.hasNext()) {

                              stack.deleteSipProvider((SipProvider) providers.next());

                           }

                           VManageBootstrap.restart();

                        } catch (InterruptedException ignored) {

                        } catch (ObjectInUseException e) {

                           e.printStackTrace();

                        }

                     }

                  });

			
                  restartThread.setDaemon(false);

                  restartThread.start();

               } else {

                  // 远程启动指定设备

               }

            }

            if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {

               String cmdString = XmlUtil.getText(rootElement,"PTZCmd");

               Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);

               cmder.fronEndCmd(device, deviceId, cmdString);

            }

         }

      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {

         e.printStackTrace();

@@ -370,31 +445,48 @@
   private void processMessageDeviceInfo(RequestEvent evt) {

      try {

         Element rootElement = getRootElement(evt);

         String requestName = rootElement.getName();

         Element deviceIdElement = rootElement.element("DeviceID");

         String deviceId = deviceIdElement.getTextTrim().toString();



         Device device = storager.queryVideoDevice(deviceId);

         if (device == null) {

            return;

         }

         device.setName(XmlUtil.getText(rootElement, "DeviceName"));

         device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));

         device.setModel(XmlUtil.getText(rootElement, "Model"));

         device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));

         if (StringUtils.isEmpty(device.getStreamMode())) {

            device.setStreamMode("UDP");

         }

         storager.updateDevice(device);



         RequestMessage msg = new RequestMessage();

         msg.setDeviceId(deviceId);

         msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);

         msg.setData(device);

         deferredResultHolder.invokeResult(msg);

         // 回复200 OK

         responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         if (requestName.equals("Query")) {

            logger.info("接收到DeviceInfo查询消息");

            FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);

            String platformId = ((SipUri) fromHeader.getAddress().getURI()).getUser();

               if (platformId == null) {

               response404Ack(evt);

               return;

            } else {

               // 回复200 OK

               responseAck(evt);

               String sn = rootElement.element("SN").getText();

               ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

               cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());

            }

         } else {

            logger.info("接收到DeviceInfo应答消息");

            Device device = storager.queryVideoDevice(deviceId);

            if (device == null) {

               return;

            }

            device.setName(XmlUtil.getText(rootElement, "DeviceName"));

            device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));

            device.setModel(XmlUtil.getText(rootElement, "Model"));

            device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));

            if (StringUtils.isEmpty(device.getStreamMode())) {

               device.setStreamMode("UDP");

            }

            storager.updateDevice(device);

	
            RequestMessage msg = new RequestMessage();

            msg.setDeviceId(deviceId);

            msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);

            msg.setData(device);

            deferredResultHolder.invokeResult(msg);

            // 回复200 OK

            responseAck(evt);

            if (offLineDetector.isOnline(deviceId)) {

               publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

            }

         }

      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {

         e.printStackTrace();