Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

Fang

2022-03-07 bea63f67e75ea6c38d946c2ee463260fcf815f87

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

@@ -158,6 +158,10 @@
                  device.setCharset("gb2312");
                  device.setDeviceId(deviceId);
                  device.setFirsRegister(true);
               }else {
                  if (device.getOnline() == 0) {
                     device.setFirsRegister(true);
                  }
               }
               device.setIp(received);
               device.setPort(rPort);
@@ -187,7 +191,6 @@
         if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
         // 注册成功
         // 保存到redis
         // 下发catelog查询目录
         if (registerFlag == 1 ) {
            logger.info("[{}] 注册成功! deviceId:" + device.getDeviceId(), requestAddress);
            publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_REGISTER);