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;
 }

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, TimeUnit.MILLISECONDS);
+            Long expire = redisTemplate.getExpire(redisKey);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }

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;
 

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, TimeUnit.SECONDS);
+            Long expire = redisTemplate.getExpire(redisKey);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }

src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformRegisterTaskInfo.java

@@ -1,8 +1,15 @@
 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;
 
 /**
  * 平台注册任务可序列化的信息
@@ -16,7 +23,7 @@ public class PlatformRegisterTaskInfo{
     private SipTransactionInfo sipTransactionInfo;
 
     /**
-     * 过期时间，单位： 毫秒
+     * 过期时间
      */
     private long expireTime;
 }

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, TimeUnit.MILLISECONDS);
+            Long expire = redisTemplate.getExpire(redisKey);
             taskInfo.setExpireTime(expire);
             result.add(taskInfo);
         }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java

@@ -42,6 +42,9 @@ public class JTDevice {
     @Schema(description = "车牌")
     private String plateNo;
 
+    @Schema(description = "鉴权码")
+    private String authenticationCode;
+
     @Schema(description = "经度")
     private Double longitude;
 

src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTTerminalMapper.java

@@ -23,6 +23,7 @@ public interface JTTerminalMapper {
             "<if test=\"model != null\">, model=#{model}</if>" +
             "<if test=\"plateColor != null\">, plate_color=#{plateColor}</if>" +
             "<if test=\"plateNo != null\">, plate_no=#{plateNo}</if>" +
+            "<if test=\"authenticationCode != null\">, authentication_code=#{authenticationCode}</if>" +
             "<if test=\"longitude != null\">, longitude=#{longitude}</if>" +
             "<if test=\"latitude != null\">, latitude=#{latitude}</if>" +
             "<if test=\"registerTime != null\">, register_time=#{registerTime}</if>" +
@@ -63,6 +64,7 @@ public interface JTTerminalMapper {
             "model,"+
             "plate_color,"+
             "plate_no,"+
+            "authentication_code,"+
             "longitude,"+
             "latitude,"+
             "create_time,"+
@@ -79,6 +81,7 @@ public interface JTTerminalMapper {
             "#{model}," +
             "#{plateColor}," +
             "#{plateNo}," +
+            "#{authenticationCode}," +
             "#{longitude}," +
             "#{latitude}," +
             "#{createTime}," +

src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: 274-dev
+    active: 1078

src/main/resources/配置详情.yml

@@ -120,13 +120,6 @@ sip:
     # 命令发送等待回复的超时时间, 单位:毫秒
     timeout: 1000
 
-# 做为JT1078服务器的配置
-ftp:
-  #[必须修改] 是否开启1078的服务
-  enable: true
-  port: 2121
-  passive-ports: 10000-10500
-
 # 做为JT1078服务器的配置
 jt1078:
     #[必须修改] 是否开启1078的服务
@@ -136,7 +129,6 @@ jt1078:
     #[可选] 设备鉴权的密码
     password: admin123
 
-
 #zlm 默认服务器配置
 media:
     # [必须修改] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId

web/src/views/jtDevice/channel/edit.vue

@@ -21,7 +21,7 @@
         </el-form>
 
       </el-tab-pane>
-      <el-tab-pane label="国标通道配置">
+      <el-tab-pane :disabled="!jtChannel.gbId" label="国标通道配置">
         <CommonChannelEdit :id="jtChannel.gbId" ref="commonChannelEdit" :cancel="close" />
       </el-tab-pane>
     </el-tabs>

数据库/2.7.4/初始化-mysql-2.7.4.sql

@@ -183,7 +183,6 @@ create table IF NOT EXISTS wvp_media_server
     flv_ssl_port        integer,
     ws_flv_port         integer,
     ws_flv_ssl_port     integer,
-    jtt_proxy_port      integer,
     auto_config         bool                  default false,
     secret              character varying(50),
     type                character varying(50) default 'zlm',

数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql

@@ -184,7 +184,6 @@ create table IF NOT EXISTS wvp_media_server
     flv_ssl_port        integer,
     ws_flv_port         integer,
     ws_flv_ssl_port     integer,
-    jtt_proxy_port      integer,
     auto_config         bool                  default false,
     secret              character varying(50),
     type                character varying(50) default 'zlm',