panlinlin
2021-01-12 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -107,17 +107,15 @@
               rPort = viaHeader.getPort();
            }
            //
            Host host = new Host();
            host.setIp(received);
            host.setPort(rPort);
            host.setAddress(received.concat(":").concat(String.valueOf(rPort)));
            AddressImpl address = (AddressImpl) fromHeader.getAddress();
            SipUri uri = (SipUri) address.getURI();
            String deviceId = uri.getUser();
            device = new Device();
            device.setStreamMode("UDP");
            device.setDeviceId(deviceId);
            device.setHost(host);
            device.setIp(received);
            device.setPort(rPort);
            device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
            // 注销成功
            if (expiresHeader != null && expiresHeader.getExpires() == 0) {
               registerFlag = 2;
@@ -141,9 +139,15 @@
         // 下发catelog查询目录
         if (registerFlag == 1 && device != null) {
            logger.info("注册成功! deviceId:" + device.getDeviceId());
            boolean exists = storager.exists(device.getDeviceId());
            device.setRegisterTimeMillis(System.currentTimeMillis());
            storager.updateDevice(device);
            publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
            handler.onRegister(device);
            // 重新注册更新设备和通道,以免设备替换或更新后信息无法更新
            //if (!exists) {
               handler.onRegister(device);
            //}
         } else if (registerFlag == 2) {
            logger.info("注销成功! deviceId:" + device.getDeviceId());
            publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);