Merge branch 'wvp-28181-2.0'

648540858

2022-08-15 cb16cabb64e99d7f505822a49665725ff5b61ff6

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java

@@ -7,7 +7,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.SIPResponseProcessorAbstract;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,14 +26,14 @@
@Component
public class RegisterResponseProcessor extends SIPResponseProcessorAbstract {

   private Logger logger = LoggerFactory.getLogger(RegisterResponseProcessor.class);
   private String method = "REGISTER";
   private final Logger logger = LoggerFactory.getLogger(RegisterResponseProcessor.class);
   private final String method = "REGISTER";

   @Autowired
   private ISIPCommanderForPlatform sipCommanderForPlatform;

   @Autowired
   private IVideoManagerStorager storager;
   private IVideoManagerStorage storager;

   @Autowired
   private IRedisCatchStorage redisCatchStorage;
@@ -69,11 +69,11 @@

      ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(platformGBId);
      if (parentPlatformCatch == null) {
         logger.warn(String.format("收到 %s 的注册/注销%S请求, 但是平台缓存信息未查询到!!!", platformGBId, response.getStatusCode()));
         logger.warn(String.format("[收到注册/注销%S请求]平台：%s，但是平台缓存信息未查询到!!!", response.getStatusCode(),platformGBId));
         return;
      }
      String action = parentPlatformCatch.getParentPlatform().getExpires().equals("0") ? "注销" : "注册";
      logger.info(String.format("收到 %s %s的%S响应", platformGBId, action, response.getStatusCode() ));
      logger.info(String.format("[%s %S响应]%s ", action, response.getStatusCode(), platformGBId ));
      ParentPlatform parentPlatform = parentPlatformCatch.getParentPlatform();
      if (parentPlatform == null) {
         logger.warn(String.format("收到 %s %s的%S请求, 但是平台信息未查询到!!!", platformGBId, action, response.getStatusCode()));
@@ -90,17 +90,18 @@
         redisCatchStorage.delPlatformCatchInfo(platformGBId);
         // 取回Expires设置，避免注销过程中被置为0
         ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
         parentPlatformTmp.setStatus("注册".equals(action));
         redisCatchStorage.updatePlatformRegister(parentPlatformTmp);
         redisCatchStorage.updatePlatformKeepalive(parentPlatformTmp);
         parentPlatformCatch.setParentPlatform(parentPlatformTmp);
         if (parentPlatformTmp != null) {
            parentPlatformTmp.setStatus("注册".equals(action));
            redisCatchStorage.updatePlatformRegister(parentPlatformTmp);
            redisCatchStorage.updatePlatformKeepalive(parentPlatformTmp);
            parentPlatformCatch.setParentPlatform(parentPlatformTmp);
         }
         redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
         storager.updateParentPlatformStatus(platformGBId, "注册".equals(action));
         if ("注销".equals(action)) {
            subscribeHolder.removeCatalogSubscribe(platformGBId);
            subscribeHolder.removeMobilePositionSubscribe(platformGBId);
         }

      }
   }