Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

panlinlin

2021-01-12 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c

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

@@ -144,10 +144,10 @@
            storager.updateDevice(device);

            publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);



            // 只有第一次注册才更新通道

            if (!exists) {

            // 重新注册更新设备和通道，以免设备替换或更新后信息无法更新

            //if (!exists) {

               handler.onRegister(device);

            }

            //}

         } else if (registerFlag == 2) {

            logger.info("注销成功! deviceId:" + device.getDeviceId());

            publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);