From bea63f67e75ea6c38d946c2ee463260fcf815f87 Mon Sep 17 00:00:00 2001 From: Fang <costa11@qq.com> Date: 星期一, 07 三月 2022 14:21:29 +0800 Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java index 62d4bec..c6fba3d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.gb28181.auth; +import com.genersoft.iot.vmp.storager.impl.VideoManagerStoragerImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,13 +21,24 @@ @Autowired private SIPCommander cmder; + + @Autowired + private VideoManagerStoragerImpl storager; public void onRegister(Device device) { // 鍙湁绗竴娆℃敞鍐屾椂璋冪敤鏌ヨ璁惧淇℃伅锛屽闇�鏇存柊璋冪敤鏇存柊API鎺ュ彛 + // TODO 姝ゅ閿欒鏃犳硶鑾峰彇鍒伴�氶亾 + Device device1 = storager.queryVideoDevice(device.getDeviceId()); if (device.isFirsRegister()) { logger.info("[{}] 棣栨娉ㄥ唽锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId()); - cmder.deviceInfoQuery(device); - cmder.catalogQuery(device, null); + try { + Thread.sleep(100); + cmder.deviceInfoQuery(device); + Thread.sleep(100); + cmder.catalogQuery(device, null); + } catch (InterruptedException e) { + e.printStackTrace(); + } } } } -- Gitblit v1.8.0