去除冗余代码，修正编译报警项

lawrencehj

2021-02-05 a8603075d4bfb6ebc3248e6662eb700261c0fa56

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

@@ -50,17 +50,11 @@

    private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor.class);

   private SIPCommander cmder;

   private IVideoManagerStorager storager;

   private IRedisCatchStorage redisCatchStorage;

   private EventPublisher publisher;

   private RedisUtil redis;

   private DeferredResultHolder deferredResultHolder;

   private DeviceOffLineDetector offLineDetector;

@@ -94,6 +88,7 @@

   /**
    * 处理MobilePosition移动位置Notify
    * 
    * @param evt
    */
   private void processNotifyMobilePosition(RequestEvent evt) {
@@ -147,6 +142,7 @@

   /***
    * 处理alarm设备报警Notify
    * 
    * @param evt
    */
   private void processNotifyAlarm(RequestEvent evt) {
@@ -259,29 +255,34 @@
               deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode"));
               deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block"));
               deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address"));
               if (XmlUtil.getText(itemDevice, "Parental") == null || XmlUtil.getText(itemDevice, "Parental") == "") {
               if (XmlUtil.getText(itemDevice, "Parental") == null
                     || XmlUtil.getText(itemDevice, "Parental") == "") {
                  deviceChannel.setParental(0);
               } else {
                  deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));
               } 
               deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
               if (XmlUtil.getText(itemDevice, "SafetyWay") == null || XmlUtil.getText(itemDevice, "SafetyWay")== "") {
               if (XmlUtil.getText(itemDevice, "SafetyWay") == null
                     || XmlUtil.getText(itemDevice, "SafetyWay") == "") {
                  deviceChannel.setSafetyWay(0);
               } else {
                  deviceChannel.setSafetyWay(Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));
               }
               if (XmlUtil.getText(itemDevice, "RegisterWay") == null || XmlUtil.getText(itemDevice, "RegisterWay") =="") {
               if (XmlUtil.getText(itemDevice, "RegisterWay") == null
                     || XmlUtil.getText(itemDevice, "RegisterWay") == "") {
                  deviceChannel.setRegisterWay(1);
               } else {
                  deviceChannel.setRegisterWay(Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));
               }
               deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum"));
               if (XmlUtil.getText(itemDevice, "Certifiable") == null || XmlUtil.getText(itemDevice, "Certifiable") == "") {
               if (XmlUtil.getText(itemDevice, "Certifiable") == null
                     || XmlUtil.getText(itemDevice, "Certifiable") == "") {
                  deviceChannel.setCertifiable(0);
               } else {
                  deviceChannel.setCertifiable(Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));
               }
               if (XmlUtil.getText(itemDevice, "ErrCode") == null || XmlUtil.getText(itemDevice, "ErrCode") == "") {
               if (XmlUtil.getText(itemDevice, "ErrCode") == null
                     || XmlUtil.getText(itemDevice, "ErrCode") == "") {
                  deviceChannel.setErrCode(0);
               } else {
                  deviceChannel.setErrCode(Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode")));
@@ -305,7 +306,8 @@
               } else {
                  deviceChannel.setLatitude(0.00);
               }
               if (XmlUtil.getText(itemDevice, "PTZType") == null || XmlUtil.getText(itemDevice, "PTZType") == "") {
               if (XmlUtil.getText(itemDevice, "PTZType") == null
                     || XmlUtil.getText(itemDevice, "PTZType") == "") {
                  deviceChannel.setPTZType(0);
               } else {
                  deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
@@ -330,9 +332,9 @@
      }
   }


    /***
    * 回复200 OK
    * 
    * @param evt
    * @throws SipException
    * @throws InvalidArgumentException
@@ -352,7 +354,6 @@
   }

   public void setCmder(SIPCommander cmder) {
      this.cmder = cmder;
   }

   public void setStorager(IVideoManagerStorager storager) {
@@ -364,11 +365,9 @@
   }

   public void setRedis(RedisUtil redis) {
      this.redis = redis;
   }

   public void setDeferredResultHolder(DeferredResultHolder deferredResultHolder) {
      this.deferredResultHolder = deferredResultHolder;
   }

   public void setOffLineDetector(DeviceOffLineDetector offLineDetector) {