From 45509372bd4d2fe7765930e12189603886b4aa5a Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Thu, 7 Aug 2025 17:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=AE=BE=E7=BD=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/task/deviceStatus/DeviceStatusTaskInfo.java  | 2 +-
 .../task/deviceStatus/DeviceStatusTaskRunner.java        | 2 +-
 .../gb28181/task/deviceSubscribe/SubscribeTaskInfo.java  | 2 +-
 .../task/deviceSubscribe/SubscribeTaskRunner.java        | 2 +-
 .../task/platformStatus/PlatformRegisterTaskInfo.java    | 9 +--------
 .../task/platformStatus/PlatformStatusTaskRunner.java    | 2 +-
 src/main/resources/application.yml                       | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskInfo.java
index 2e6380436..af2aa7512 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskInfo.java
@@ -11,7 +11,7 @@ public class DeviceStatusTaskInfo{
     private SipTransactionInfo transactionInfo;
 
     /**
-     * 过期时间
+     * 过期时间,单位毫秒
      */
     private long expireTime;
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
index a94c3363a..46e19332b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
@@ -118,7 +118,7 @@ public class DeviceStatusTaskRunner {
             if (taskInfo == null) {
                 continue;
             }
-            Long expire = redisTemplate.getExpire(redisKey);
+            Long expire = redisTemplate.getExpire(redisKey, TimeUnit.MILLISECONDS);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskInfo.java
index 3a8741130..aa9dd8cfd 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskInfo.java
@@ -15,7 +15,7 @@ public class SubscribeTaskInfo {
     private String key;
 
     /**
-     * 过期时间
+     * 过期时间，单位： 秒
      */
     private long expireTime;
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java
index 996f8b970..9e04abe87 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java
@@ -118,7 +118,7 @@ public class SubscribeTaskRunner{
             if (taskInfo == null) {
                 continue;
             }
-            Long expire = redisTemplate.getExpire(redisKey);
+            Long expire = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformRegisterTaskInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformRegisterTaskInfo.java
index d7593eb90..3b3ba6c61 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformRegisterTaskInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformRegisterTaskInfo.java
@@ -1,15 +1,8 @@
 package com.genersoft.iot.vmp.gb28181.task.platformStatus;
 
-import com.genersoft.iot.vmp.common.CommonCallback;
 import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.concurrent.Delayed;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 平台注册任务可序列化的信息
@@ -23,7 +16,7 @@ public class PlatformRegisterTaskInfo{
     private SipTransactionInfo sipTransactionInfo;
 
     /**
-     * 过期时间
+     * 过期时间，单位： 毫秒
      */
     private long expireTime;
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java
index 7b3ffffb4..4768fd964 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java
@@ -179,7 +179,7 @@ public class PlatformStatusTaskRunner {
             if (taskInfo == null) {
                 continue;
             }
-            Long expire = redisTemplate.getExpire(redisKey);
+            Long expire = redisTemplate.getExpire(redisKey, TimeUnit.MILLISECONDS);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8da301568..67213e8a3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: 1078
+    active: 274-dev