From 0781d9bc2803713d227d8a1965298dde6d96d838 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 12 五月 2022 17:48:52 +0800 Subject: [PATCH] 修复缺失的设备时间 --- src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 7 +------ src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 2 ++ src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java index 4f5f96a..594c41a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java @@ -12,6 +12,7 @@ import com.genersoft.iot.vmp.service.IDeviceService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IVideoManagerStorage; +import com.genersoft.iot.vmp.utils.DateUtil; import gov.nist.javax.sip.RequestEventExt; import gov.nist.javax.sip.address.AddressImpl; import gov.nist.javax.sip.address.SipUri; @@ -176,6 +177,7 @@ // 淇濆瓨鍒皉edis if (registerFlag) { logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + deviceId, requestAddress); + device.setRegisterTime(DateUtil.getNow()); deviceService.online(device); } else { logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + deviceId, requestAddress); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java index 56a4c49..a628083 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java @@ -72,6 +72,7 @@ device.setPort(rPort); device.setHostAddress(received.concat(":").concat(String.valueOf(rPort))); } + device.setKeepaliveTime(DateUtil.getNow()); deviceService.online(device); // 鍥炲200 OK responseAck(evt, Response.OK); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java index 2bf1b27..9ac4d31 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java @@ -76,12 +76,7 @@ redisCatchStorage.clearCatchByDeviceId(device.getDeviceId()); } - if (device.getRegisterTime() == null) { - device.setRegisterTime(now); - } - if(device.getUpdateTime() == null) { - device.setUpdateTime(now); - } + device.setUpdateTime(now); device.setOnline(1); // 绗竴娆′笂绾� -- Gitblit v1.8.0