完成向上级联->点播--精简代码

panlinlin

2021-01-15 e09e541c827157884e013ff0b50aa88b8b0f46be

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

@@ -15,6 +15,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

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

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

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

import org.dom4j.Document;

import org.dom4j.DocumentException;

import org.dom4j.Element;

@@ -162,12 +164,19 @@
   private void processMessageCatalogList(RequestEvent evt) {

      try {

         Element rootElement = getRootElement(evt);

         String name = rootElement.getName();

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

         String deviceId = deviceIdElement.getText();

         Element deviceListElement = rootElement.element("DeviceList");

         if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求

            // TODO 后续将代码拆分

            ParentPlatform parentPlatform = storager.queryParentPlatById(deviceId);



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

         AddressImpl address = (AddressImpl) fromHeader.getAddress();

         SipUri uri = (SipUri) address.getURI();

         String platformId = uri.getUser();

         // if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求

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

               // TODO 后续将代码拆分

            ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

            if (parentPlatform == null) {

               response404Ack(evt);

               return;

@@ -177,9 +186,8 @@


               Element snElement = rootElement.element("SN");

               String sn = snElement.getText();

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

               // 准备回复通道信息

               List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getDeviceGBId());

               List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());

               if (channelReduces.size() >0 ) {

                  for (ChannelReduce channelReduce : channelReduces) {

                     DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());

@@ -497,7 +505,7 @@
   }



   /***

    * 回复200 OK

    * 回复404

    * @param evt

    * @throws SipException

    * @throws InvalidArgumentException