fix():添加历史回放视频上传和下载

王鑫
1 parent 93d6404b
Showing 79 changed files with 449 additions and 557 deletions
pom.xml
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java
src/main/java/com/genersoft/iot/vmp/conf/MybatisConfig.java
src/main/java/com/genersoft/iot/vmp/conf/MybatisPlusConfig.java
src/main/java/com/genersoft/iot/vmp/conf/security/DefaultUserDetailsServiceImpl.java
src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java
src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java
src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
src/main/java/com/genersoft/iot/vmp/jtt1078/app/VideoServerApp.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
src/main/java/com/genersoft/iot/vmp/service/ILogService.java
src/main/java/com/genersoft/iot/vmp/service/IRoleService.java
src/main/java/com/genersoft/iot/vmp/service/IUserService.java
@@ -155,10 +155,29 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.16</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.5</version>
+        </dependency>
+
+        <!-- mybatis-plus-join -->
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -24,7 +24,7 @@ import java.util.Objects;
 /**
  * 启动类
  */
-@ServletComponentScan("com.genersoft.iot.vmp.conf")
+
 @SpringBootApplication
 @EnableScheduling
 @ForestScan(basePackages = "com.genersoft.iot.vmp.vmanager.jt1078.platform.remote")
 package com.genersoft.iot.vmp.conf;
 import com.genersoft.iot.vmp.common.ApiSaveConstant;
-import com.genersoft.iot.vmp.conf.security.IpWhitelistFilter;
 import com.genersoft.iot.vmp.conf.security.SecurityUtils;
-import com.genersoft.iot.vmp.conf.security.WebSecurityConfig;
 import com.genersoft.iot.vmp.service.ILogService;
-import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+import com.genersoft.iot.vmp.storager.mapper.dto.LogDto;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -2,13 +2,11 @@ package com.genersoft.iot.vmp.conf;
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
-import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
-import com.genersoft.iot.vmp.vmanager.cloudRecord.CloudRecordController;
+import com.genersoft.iot.vmp.storager.mapper.CloudRecordServiceMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +14,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +32,7 @@ public class GlobalResponseAdvice implements ResponseBodyAdvice&lt;Object&gt; {
     @Override
     public Object beforeBodyWrite(Object body, @NotNull MethodParameter returnType, @NotNull MediaType selectedContentType, @NotNull Class<? extends HttpMessageConverter<?>> selectedConverterType, @NotNull ServerHttpRequest request, @NotNull ServerHttpResponse response) {
         // 排除api文档的接口，这个接口不需要统一
-        String[] excludePath = {"/v3/api-docs","/api/v1","/index/hook","/api/video-"};
+        String[] excludePath = {"/v3/api-docs","/api/v1","/index/hook","/api/video-","/api/jt1078/query/history/download/"};
         for (String path : excludePath) {
             if (request.getURI().getPath().startsWith(path)) {
                 return body;
-package com.genersoft.iot.vmp.conf;
-
-import org.apache.ibatis.logging.stdout.StdOutImpl;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-
-import javax.sql.DataSource;
-
-/**
- * 配置mybatis
- */
-@Configuration
-@Order(value=1)
-public class MybatisConfig {
-
-    @Autowired
-    private UserSetting userSetting;
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-       final SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-        org.apache.ibatis.session.Configuration config = new org.apache.ibatis.session.Configuration();
-        if (userSetting.getSqlLog()){
-            config.setLogImpl(StdOutImpl.class);
-        }
-        config.setMapUnderscoreToCamelCase(true);
-        sqlSessionFactory.setConfiguration(config);
-        return sqlSessionFactory.getObject();
-    }
-
-}
+package com.genersoft.iot.vmp.conf;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * mybatis-plus分页配置
+ *
+ * @Author WangXin
+ * @Data 2024/12/4
+ * @Version 1.0.0
+ */
+@Configuration
+@MapperScan("com.genersoft.iot.vmp.**.mapper")
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+        mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return mybatisPlusInterceptor;
+    }
+}
@@ -3,7 +3,7 @@ package com.genersoft.iot.vmp.conf.security;
 import com.alibaba.excel.util.StringUtils;
 import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
 import com.genersoft.iot.vmp.service.IUserService;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -2,8 +2,8 @@ package com.genersoft.iot.vmp.conf.security;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -2,7 +2,7 @@ package com.genersoft.iot.vmp.conf.security;
 import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.service.IUserService;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.jose4j.jwk.RsaJsonWebKey;
 import org.jose4j.jwk.RsaJwkGenerator;
 import org.jose4j.jws.AlgorithmIdentifiers;
 package com.genersoft.iot.vmp.conf.security;
 import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 package com.genersoft.iot.vmp.conf.security.dto;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.springframework.security.core.CredentialsContainer;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
@@ -23,7 +23,7 @@ import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.service.bean.SSRCInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.PlatformRegisterInfo;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.utils.GitUtil;
 import gov.nist.javax.sip.message.MessageFactoryImpl;
@@ -11,7 +11,7 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessag
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.ChannelSourceInfo;
 import gov.nist.javax.sip.message.SIPRequest;
 import org.dom4j.Element;
 import org.slf4j.Logger;
@@ -10,7 +10,7 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.response.SIPResponseProcesso
 import com.genersoft.iot.vmp.service.IPlatformService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.PlatformRegisterInfo;
 import gov.nist.javax.sip.message.SIPResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,10 +24,10 @@ import javax.sip.header.WWWAuthenticateHeader;
 import javax.sip.message.Response;
 import java.text.ParseException;
-/**    
+/**
  * @description:Register响应处理器
  * @author: swwheihei
- * @date:   2020年5月3日 下午5:32:23     
+ * @date:   2020年5月3日 下午5:32:23
  */
 @Component
 public class RegisterResponseProcessor extends SIPResponseProcessorAbstract {
@@ -46,10 +46,10 @@ public class VideoServerApp
                 case "wx-local":
                     configProperties = "/app.properties";
                     break;
-                case "dev100":
+                case "jt1078-dev100":
                     configProperties = "/app-dev100.properties";
                     break;
-                case "dev103":
+                case "jt1078-dev103":
                     configProperties = "/app-dev103.properties";
                     break;
                 default:
@@ -9,9 +9,9 @@ import com.genersoft.iot.vmp.service.IStreamProxyService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.StreamPushMapper;
+import com.genersoft.iot.vmp.storager.mapper.GbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformGbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.StreamPushMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+import com.genersoft.iot.vmp.storager.mapper.dto.LogDto;
 import com.github.pagehelper.PageInfo;
 /**
 package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
 import java.util.List;
 package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import com.github.pagehelper.PageInfo;
 import java.util.List;
@@ -14,7 +14,7 @@ import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
 import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
+import com.genersoft.iot.vmp.storager.mapper.CloudRecordServiceMapper;
 import com.genersoft.iot.vmp.utils.CloudRecordUtils;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -2,9 +2,8 @@ package com.genersoft.iot.vmp.service.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.service.IDeviceAlarmService;
-import com.genersoft.iot.vmp.storager.dao.DeviceAlarmMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceAlarmMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,9 +13,9 @@ import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
 import com.genersoft.iot.vmp.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.service.IInviteStreamService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
-import com.genersoft.iot.vmp.storager.dao.DeviceMobilePositionMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceMobilePositionMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
@@ -22,9 +22,9 @@ import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.service.IInviteStreamService;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformChannelMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
@@ -6,10 +6,10 @@ import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.IGbStreamService;
-import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformCatalogMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.GbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.ParentPlatformMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformCatalogMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformGbStreamMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 package com.genersoft.iot.vmp.service.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.genersoft.iot.vmp.service.ILogService;
-import com.genersoft.iot.vmp.storager.dao.LogMapper;
-import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+import com.genersoft.iot.vmp.storager.mapper.LogMapper;
+import com.genersoft.iot.vmp.storager.mapper.dto.LogDto;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +20,11 @@ import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
 import com.genersoft.iot.vmp.service.bean.SSRCInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
+import com.genersoft.iot.vmp.storager.mapper.MediaServerMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.utils.JsonUtil;
 import com.genersoft.iot.vmp.utils.redis.RedisUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -36,19 +35,16 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
+import javax.annotation.Resource;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 /**
  * 媒体服务器节点管理
@@ -85,7 +81,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
     @Autowired
     private ZLMRESTfulUtils zlmresTfulUtils;
-    @Autowired
+    @Resource
     private MediaServerMapper mediaServerMapper;
     @Autowired
@@ -5,10 +5,10 @@ import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.service.IPlatformChannelService;
-import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformCatalogMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.ParentPlatformMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformCatalogMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformChannelMapper;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,8 +15,6 @@ import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
-import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
 import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -27,11 +25,10 @@ import com.genersoft.iot.vmp.service.IPlatformService;
 import com.genersoft.iot.vmp.service.IPlayService;
 import com.genersoft.iot.vmp.service.bean.*;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.*;
+import com.genersoft.iot.vmp.storager.mapper.*;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import gov.nist.javax.sip.message.SIPRequest;
 import gov.nist.javax.sip.message.SIPResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,17 +38,12 @@ import org.springframework.stereotype.Service;
 import javax.sdp.*;
 import javax.sip.InvalidArgumentException;
 import javax.sip.ResponseEvent;
-import javax.sip.PeerUnavailableException;
 import javax.sip.SipException;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import java.util.*;
 /**
@@ -34,7 +34,7 @@ import com.genersoft.iot.vmp.service.bean.*;
 import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
+import com.genersoft.iot.vmp.storager.mapper.CloudRecordServiceMapper;
 import com.genersoft.iot.vmp.utils.CloudRecordUtils;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
@@ -2,8 +2,8 @@ package com.genersoft.iot.vmp.service.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.service.IRoleService;
-import com.genersoft.iot.vmp.storager.dao.RoleMapper;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.RoleMapper;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -3,14 +3,12 @@ package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.genersoft.iot.vmp.VManageBootstrap;
 import com.genersoft.iot.vmp.common.GeneralCallback;
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.StreamProxyTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
@@ -23,10 +21,9 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.service.*;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
+import com.genersoft.iot.vmp.storager.mapper.GbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.PlatformGbStreamMapper;
+import com.genersoft.iot.vmp.storager.mapper.StreamProxyMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
@@ -19,7 +19,7 @@ import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.*;
+import com.genersoft.iot.vmp.storager.mapper.*;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
 import com.github.pagehelper.PageHelper;
@@ -2,8 +2,8 @@ package com.genersoft.iot.vmp.service.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.service.IUserService;
-import com.genersoft.iot.vmp.storager.dao.UserMapper;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.UserMapper;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +11,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
-import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.PlatformRegisterInfo;
 import java.util.List;
 import java.util.Map;
@@ -3,24 +3,24 @@ package com.genersoft.iot.vmp.storager;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
-import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.ChannelSourceInfo;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
 import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
 import com.github.pagehelper.PageInfo;
 import java.util.List;
-/**    
+/**
  * @description:视频设备数据存储接口
  * @author: swwheihei
- * @date:   2020年5月6日 下午2:14:31     
+ * @date:   2020年5月6日 下午2:14:31
  */
 @SuppressWarnings("rawtypes")
 public interface IVideoManagerStorage {
-	/**   
+	/**
 	 * 根据设备ID判断设备是否存在
-	 * 
+	 *
 	 * @param deviceId 设备ID
 	 * @return true:存在  false：不存在
 	 */
@@ -40,10 +40,10 @@ public interface IVideoManagerStorage {
 	 * @param channelId 通道ID
 	 */
 	public void stopPlay(String deviceId, String channelId);
-	
-	/**   
+
+	/**
 	 * 获取设备
-	 * 
+	 *
 	 * @param deviceId 设备ID
 	 * @return DShadow 设备对象
 	 */
@@ -58,7 +58,7 @@ public interface IVideoManagerStorage {
 	 * @return
 	 */
 	public PageInfo<DeviceChannel> queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
-	
+
 	public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
@@ -15,9 +15,9 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
-import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import com.genersoft.iot.vmp.storager.mapper.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.mapper.DeviceMapper;
+import com.genersoft.iot.vmp.storager.mapper.dto.PlatformRegisterInfo;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.utils.JsonUtil;
 import com.genersoft.iot.vmp.utils.SystemInfoUtils;
@@ -7,12 +7,11 @@ import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.service.IGbStreamService;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.storager.dao.*;
-import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
+import com.genersoft.iot.vmp.storager.mapper.*;
+import com.genersoft.iot.vmp.storager.mapper.dto.ChannelSourceInfo;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
 import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import org.apache.ibatis.annotations.Delete;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import org.apache.ibatis.annotations.*;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import org.apache.ibatis.annotations.Delete;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
-import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+import com.genersoft.iot.vmp.storager.mapper.dto.LogDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
 import java.util.List;
 @Mapper
-@Repository
 public interface MediaServerMapper {
     @Insert("INSERT INTO wvp_media_server (" +
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
+import com.genersoft.iot.vmp.storager.mapper.dto.ChannelSourceInfo;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
-package com.genersoft.iot.vmp.storager.dao;
+package com.genersoft.iot.vmp.storager.mapper;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 public class ChannelSourceInfo {
     private String name;
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 public class LogDto {
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 /**
  * 平台发送注册/注销消息时缓存此消息
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 /**
  * 录像记录
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 public class Role {
-package com.genersoft.iot.vmp.storager.dao.dto;
+package com.genersoft.iot.vmp.storager.mapper.dto;
 public class User {
@@ -5,7 +5,6 @@
 package com.genersoft.iot.vmp.vmanager.jt1078.platform;
-import cn.hutool.core.io.resource.InputStreamResource;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONException;
@@ -19,7 +18,6 @@ import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.jtt1078.app.VideoServerApp;
 import com.genersoft.iot.vmp.jtt1078.publisher.PublishManager;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
-import com.genersoft.iot.vmp.service.IStreamProxyService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.StremProxyService1078;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -51,6 +49,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -74,6 +73,7 @@ import java.security.Key;
 import java.security.KeyFactory;
 import java.security.spec.X509EncodedKeySpec;
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -113,10 +113,6 @@ public class Jt1078OfCarController {
     private StremProxyService1078 stremProxyService1078;
     private static final long TIME_COUNT = 300000L;
     private Date tokenDate;
-    @Autowired
-    private IStreamProxyService streamProxyService;
-    @Resource
-    private Jt1078OfService jt1078OfService;
     @Resource
     private HisToryRecordService hisToryRecordService;
     @Resource
@@ -168,8 +164,29 @@ public class Jt1078OfCarController {
         return resultMap;
     }
+    public static String timeCover(String time) {
+        // 定义用于解析输入字符串的格式
+        SimpleDateFormat inputFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+
+        // 定义输出的目标格式
+        SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        try {
+            // 将字符串解析为Date对象
+            Date date = inputFormat.parse(time);
+
+            // 使用目标格式格式化Date对象
+            return outputFormat.format(date);
+
+        } catch (ParseException e) {
+            log.error("时间转换错误");
+            throw new RuntimeException("时间转换错误");
+        }
+    }
+
     /**
      * 上传历史视频到FTP
+     *
      * @param stream 流名称
      */
     @GetMapping("/history/uploading/{stream}")
@@ -185,20 +202,21 @@ public class Jt1078OfCarController {
             String startTime = split[2];
             String endTime = split[3];
             hisToryRecordService.addOrUpdRecode(
-                    HistoryRecord.builder().ip(UUID.randomUUID().toString())
+                    HistoryRecord.builder().id(UUID.randomUUID().toString())
                             .name(stream)
                             .createTime(new Date())
                             .sim(sim)
                             .channel(channel)
-                            .startTime(startTime)
-                            .endTime(endTime)
+                            .startTime(timeCover(startTime))
+                            .endTime(timeCover(endTime))
                             .status(HistoryEnum.UPLOADING.getCode())
                             .ip(ftpConfigBean.getHost())
                             .port(ftpConfigBean.getPort())
                             .username(ftpConfigBean.getUsername())
                             .password(MD5Util.encrypt(ftpConfigBean.getPassword()))
-                            .path(StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel))
-                    .build());
+                            .path(StringUtils.join(ftpConfigBean.getBasePath(), "/", sim, "/channel_", channel, "/", stream))
+                            .build());
+            updateHistoryRecord();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -208,7 +226,7 @@ public class Jt1078OfCarController {
      * 定时更新
      */
     @Scheduled(cron = "0 */2 * * * *")
-    private void HistoryRecordScheduled(){
+    private void HistoryRecordScheduled() {
         updateHistoryRecord();
     }
@@ -224,37 +242,56 @@ public class Jt1078OfCarController {
      * 更新历史视频上传记录
      */
     @GetMapping("/history/updateHistoryRecord")
-    public void updateHistoryRecord(){
+    public void updateHistoryRecord() {
         List<HistoryRecord> list = hisToryRecordService.getHistoryRecordList();
         if (CollectionUtils.isNotEmpty(list)) {
-            List<HistoryRecord> expiredList = list.stream().filter(HistoryRecord::checkCreateTimeExpiration).collect(Collectors.toList());
+            //删除过期的文件
+            List<HistoryRecord> expiredList = list.stream().filter(ftpUtils::checkCreateTimeExpiration).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(expiredList)) {
                 try {
-                    expiredList = ftpUtils.batchDelete(expiredList);
+                    expiredList = ftpUtils.batchDelete(expiredList).get("true");
                     hisToryRecordService.beachUpdRecode(expiredList);
                 } catch (IOException e) {
                     log.error("删除FTP文件失败");
                     throw new RuntimeException(e);
                 }
             }
-            List<HistoryRecord> uploadedList = list.stream().filter(HistoryRecord::checkCreateTimeNotExpiration)
-                    .filter(ftpUtils::checkHistoryVideo).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(expiredList)) {
+            //修改上传成功
+            List<HistoryRecord> uploadedList = list.stream()
+                    .filter(ftpUtils::checkCreateTimeNotExpiration).filter(ftpUtils::checkHistoryVideo)
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(uploadedList)) {
                 hisToryRecordService.beachUpdRecode(uploadedList);
             }
-            HISTORY_RECORD_MAP = hisToryRecordService.getHistoryRecordList().stream().collect(Collectors.toMap(
-                    HistoryRecord::getName, // 使用名字作为键
-                    Function.identity(), // 用户对象作为值
-                    (existing, replacement) -> {
-                        throw new IllegalArgumentException(String.format("Duplicate name found: %s", existing.getName()));
-                    },
-                    ConcurrentHashMap::new // 保持插入顺序
-            ));
+
+            //修改超时未上传成功的文件
+            List<HistoryRecord> updateTimeExpirationList = list.stream().filter(ftpUtils::checkUpdateTimeExpiration).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(updateTimeExpirationList)) {
+                try {
+                    Map<String, List<HistoryRecord>> stringListMap = ftpUtils.batchDelete(updateTimeExpirationList);
+                    expiredList = stringListMap.get("false");
+                    expiredList.addAll(stringListMap.get("true"));
+                    hisToryRecordService.beachUpdRecode(expiredList);
+                } catch (IOException e) {
+                    log.error("删除未上传成功FTP文件失败");
+                    throw new RuntimeException(e);
+                }
+            }
         }
+        //刷新内存
+        HISTORY_RECORD_MAP = hisToryRecordService.getHistoryRecordList().stream().collect(Collectors.toMap(
+                HistoryRecord::getName, // 使用名字作为键
+                Function.identity(), // 用户对象作为值
+                (existing, replacement) -> {
+                    throw new IllegalArgumentException(String.format("Duplicate name found: %s", existing.getName()));
+                },
+                ConcurrentHashMap::new // 保持插入顺序
+        ));
     }
     /**
      * 下载历史视频
+     *
      * @param stream 流名称
      */
     @GetMapping("/history/download/{stream}")
@@ -666,7 +703,13 @@ public class Jt1078OfCarController {
             endTime = this.formatTime(endTime).substring(2);
             String msg = this.jt1078ConfigBean.formatMessageHistoryListRTSP(sim, channel, startTime, endTime);
             try {
-                HttpClientPostEntity entity = this.httpClientUtil.doPost(url, msg, (String) null);
+                String KEY = StringUtils.join("history-list:", sim, "_", channel, "_", startTime, "_", endTime);
+                String s = (String) redisTemplate.opsForValue().get(KEY);
+                HttpClientPostEntity entity = JSONObject.parseObject(s, HttpClientPostEntity.class);
+                if (entity == null) {
+                    entity = this.httpClientUtil.doPost(url, msg, (String) null);
+                    redisTemplate.opsForValue().set(KEY, JSONObject.toJSONString(entity), 5, TimeUnit.MINUTES);
+                }
                 if (Objects.isNull(entity)) {
                     resultMap.put("code", "-1");
                     resultMap.put("msg", "请求历史视频列表错误，请联系管理员");
@@ -679,25 +722,16 @@ public class Jt1078OfCarController {
                         HashSet<String> set = new HashSet<>();
                         if (Objects.nonNull(dataJO.get("items"))) {
                             JSONArray jsonArray = (JSONArray) dataJO.get("items");
-                            jsonArray =
-                                    new JSONArray(
-                                            jsonArray.stream()
-                                                    .map(json -> dateCon((JSONObject) json, sim, channel))
-                                                    .filter(jsonObject -> {
-                                                        // 获取channelMapping并转换为List以便于比较
-                                                        String channelMapping = jsonObject.getString("channelMapping");
-                                                        return set.add(channelMapping);
-                                                    })
-                                                    .collect(Collectors.toList())
-                                    );
-                            if (jsonArray.size() > 1) {
-                                jsonArray = filterContainedRanges(jsonArray);
+                            if (!jsonArray.isEmpty()) {
+                                List<HistoryRecord> list = filterContainedRanges(sim, channel, startTime, endTime, jsonArray);
+                                dataJO.put("items", list);
                             }
-                            dataJO.put("items", jsonArray);
                         }
                     }
                     resultMap.put("code", "1");
                     resultMap.put("obj", hashMap);
+                    entity = this.httpClientUtil.doPost(url, msg, (String) null);
+                    redisTemplate.opsForValue().set(KEY, JSONObject.toJSONString(entity), 5, TimeUnit.MINUTES);
                     return resultMap;
                 }
             } catch (Exception e) {
@@ -707,19 +741,23 @@ public class Jt1078OfCarController {
         }
     }
-    public static JSONArray filterContainedRanges(JSONArray jsonArray) {
-        List<JSONObject> list = new ArrayList<>();
-        for (int i = 0; i < jsonArray.size(); i++) {
-            list.add(jsonArray.getJSONObject(i));
+    public static List<HistoryRecord> filterContainedRanges(String sim, String channel, String startTime, String endTime, JSONArray jsonArray) {
+        List<HistoryRecord> list = new ArrayList<>();
+        for (Object object : jsonArray) {
+            HistoryRecord historyRecord = JSONObject.parseObject(object.toString(), HistoryRecord.class);
+            historyRecord.setSim(sim);
+            historyRecord.setName(StringUtils.join(sim, "_", channel, "_",
+                    historyRecord.getStartTime().replace("-", "").replace(":", "").replace(" ", ""), "_",
+                    historyRecord.getEndTime().replace("-", "").replace(":", "").replace(" ", "")));
+            historyRecord.setData(object);
+            historyRecord.setChannel(channel);
+            HistoryRecord historyRecord1 = HISTORY_RECORD_MAP.get(historyRecord.getName());
+            historyRecord.setStatus(historyRecord1 != null ? historyRecord1.getStatus() : HistoryEnum.NOT_UPLOADED.getCode());
+            list.add(historyRecord);
         }
-        // 过滤逻辑
-        List<JSONObject> filteredList = list.stream()
-                .filter(timeRange -> !isAnyOtherRangeContainingThis(list, timeRange))
-                .collect(Collectors.toList());
-
         // 将过滤后的列表转换回 JSONArray
-        return new JSONArray(filteredList);
+        return list;
     }
     private static boolean isAnyOtherRangeContainingThis(List<JSONObject> jsonArray, JSONObject timeRange) {
@@ -818,9 +856,9 @@ public class Jt1078OfCarController {
         Map<String, Object> resultMap = new HashMap();
         startTime = this.formatTime(startTime);
         endTime = this.formatTime(endTime);
-        channelMapping = StringUtils.join(new String[]{sim, "-", channel,"-",startTime,"-",endTime});
+        channelMapping = StringUtils.join(new String[]{sim, "-", channel, "-", startTime, "-", endTime});
         Integer historyPort = createHistoryPort(channelMapping);
-        channelMapping = StringUtils.join(new String[]{channelMapping,"_", String.valueOf(historyPort)});
+        channelMapping = StringUtils.join(new String[]{channelMapping, "_", String.valueOf(historyPort)});
         this.redisTemplate.opsForValue().set(key, channelMapping, 1L, TimeUnit.HOURS);
         StreamContent streamContent = this.getStreamContentPlayURL(StringUtils.join(new String[]{channelMapping}));
         if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
@@ -935,12 +973,12 @@ public class Jt1078OfCarController {
                 }
                 String[] split = value.split("-");
                 Map<String, Object> stringObjectMap = stopHistory(split[1], split[0]);
-                while (true){
-                    if (stringObjectMap.get("code").equals("1")){
-                        log.info("{} 历史视频断流成功",value);
+                while (true) {
+                    if (stringObjectMap.get("code").equals("1")) {
+                        log.info("{} 历史视频断流成功", value);
                         break;
-                    }else {
-                        throw new ServiceException(String.format(" %s 历史视频断流失败",value));
+                    } else {
+                        throw new ServiceException(String.format(" %s 历史视频断流失败", value));
                     }
                 }
                 strings.remove(value);
@@ -1021,6 +1059,7 @@ public class Jt1078OfCarController {
     /**
      * 获取视频播放地址
+     *
      * @param stream 流名称
      * @return 流信息
      */
@@ -1156,15 +1195,17 @@ public class Jt1078OfCarController {
                 if (Objects.equals(rsultMap.get("code"), "4000") || Objects.equals(rsultMap.get("code"), 4000)) {
                     throw new ControllerException(ErrorCode.ERROR304);
                 }
+                if (Objects.equals(rsultMap.get("code"), "410") || Objects.equals(rsultMap.get("code"), 410)) {
+                    throw new ControllerException(ErrorCode.ERROR400);
+                }
                 if (flag) {
                     if (StringUtils.isNoneBlank(new CharSequence[]{rsultMap.get("msg") + ""})) {
                         throw new ControllerException(304, String.valueOf(rsultMap.get("msg")));
                     }
                 }
-            } catch (Exception var6) {
-                Exception e = var6;
-                log.error("entity.getResultStr():{{}}", entity.getResultStr(), e.getMessage());
+            } catch (Exception e) {
+                log.error("entity.getResultStr():{{}}", e.getMessage());
                 throw new ControllerException(500, e.getMessage());
             }
         }
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.ben;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.apache.http.client.CookieStore;
 import java.util.Map;
@@ -9,52 +13,14 @@ import java.util.Map;
  * @author liujun
  * @date 2024年10月21日 15:20
  */
-
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 public class HttpClientPostEntity {
     private String resultStr;
     private Map<String, String> headers;
     private CookieStore cookieStore;
-
     private Integer port;
     private  Integer httpPort;
-
-    public String getResultStr() {
-        return resultStr;
-    }
-
-    public void setResultStr(String resultStr) {
-        this.resultStr = resultStr;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    public void setHeaders(Map<String, String> headers) {
-        this.headers = headers;
-    }
-
-    public CookieStore getCookieStore() {
-        return cookieStore;
-    }
-
-    public void setCookieStore(CookieStore cookieStore) {
-        this.cookieStore = cookieStore;
-    }
-
-    public Integer getPort() {
-        return port;
-    }
-
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    public Integer getHttpPort() {
-        return httpPort;
-    }
-
-    public void setHttpPort(Integer httpPort) {
-        this.httpPort = httpPort;
-    }
 }
@@ -52,4 +52,8 @@ public class FtpConfigBean {
      * 过期天数自动删除 默认7天
      */
     private long expirationTime = 7;
+    /**
+     * 未上传成功超时时间
+     */
+    private long timeOut = 300;
 }
-package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;

@Data
@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.history_upload}")
    private String historyUpload = "9206";

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    @Resource
    private FtpConfigBean ftpConfigBean;

    public Integer getPort() {
        if (port == null) {
            return 30000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 30000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        return profilesActive.equals("wx-local") ? 10000 : 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryUpload(String stream) {
        if (StringUtils.isBlank(stream)) {
            throw new RuntimeException("上传参数不能为空");
        }
        String[] split = stream.split("_");
        if (split.length < 4){
            throw new RuntimeException("上传参数异常, 请联系管理员");
        }
        String sim = split[0];
        String channel = split[1];
        String startTime = split[2];
        String endTime = split[3];
        String msg = StringUtils.replace("{\n" +
                "  \"clientId\": \"{clientId}\",\n" +
                "  \"ip\": \"{ip}\",\n" +
                "  \"port\": {port},\n" +
                "  \"username\": \"{username}\",\n" +
                "  \"password\": \"{password}\",\n" +
                "  \"path\": \"{path}\",\n" +
                "  \"channelNo\": {channel},\n" +
                "  \"startTime\": \"{startTime}\",\n" +
                "  \"endTime\": \"{endTime}\",\n" +
                "  \"mediaType\": 0,\n" +
                "  \"streamType\": 1,\n" +
                "  \"storageType\": 1,\n" +
                "  \"condition\": 6\n" +
                "}","{clientId}",sim);
        msg = StringUtils.replace(msg, "{ip}", ftpConfigBean.getHost());
        msg = StringUtils.replace(msg, "{port}", ftpConfigBean.getPort().toString());
        msg = StringUtils.replace(msg, "{username}", channel);
        msg = StringUtils.replace(msg, "{password}", ftpConfigBean.getPassword());
        msg = StringUtils.replace(msg, "{path}", StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel));
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        return StringUtils.replace(msg, "{endTime}", endTime);
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }

    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;

@Data
@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.history_upload}")
    private String historyUpload = "9206";

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    @Resource
    private FtpConfigBean ftpConfigBean;

    public Integer getPort() {
        if (port == null) {
            return 30000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 30000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        return profilesActive.equals("wx-local") ? 10000 : 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        Set<String> historyListKeys = redisTemplate.keys("history-list:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (!historyListKeys.isEmpty()) {
            keys.addAll(historyListKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryUpload(String stream) {
        if (StringUtils.isBlank(stream)) {
            throw new RuntimeException("上传参数不能为空");
        }
        String[] split = stream.split("_");
        if (split.length < 4){
            throw new RuntimeException("上传参数异常, 请联系管理员");
        }
        String sim = split[0];
        String channel = split[1];
        String startTime = split[2];
        String endTime = split[3];
        String msg = StringUtils.replace("{\n" +
                "  \"clientId\": \"{clientId}\",\n" +
                "  \"ip\": \"{ip}\",\n" +
                "  \"port\": {port},\n" +
                "  \"username\": \"{username}\",\n" +
                "  \"password\": \"{password}\",\n" +
                "  \"path\": \"{path}\",\n" +
                "  \"channelNo\": {channel},\n" +
                "  \"startTime\": \"{startTime}\",\n" +
                "  \"endTime\": \"{endTime}\",\n" +
                "  \"mediaType\": 0,\n" +
                "  \"streamType\": 1,\n" +
                "  \"storageType\": 1,\n" +
                "  \"condition\": 6\n" +
                "}","{clientId}",sim);
        msg = StringUtils.replace(msg, "{ip}", ftpConfigBean.getHost());
        msg = StringUtils.replace(msg, "{port}", ftpConfigBean.getPort().toString());
        msg = StringUtils.replace(msg, "{username}", ftpConfigBean.getUsername());
        msg = StringUtils.replace(msg, "{password}", ftpConfigBean.getPassword());
        msg = StringUtils.replace(msg, "{path}", StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel,"/",stream));
        msg = StringUtils.replace(msg, "{channel}", channel);
        msg = StringUtils.replace(msg, "{startTime}", Jt1078OfCarController.timeCover(startTime));
        return StringUtils.replace(msg, "{endTime}", Jt1078OfCarController.timeCover(endTime));
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }

    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
@@ -169,8 +169,8 @@ public class TuohuaConfigBean {
         if (CollectionUtils.isNotEmpty(carData)) {
             if (StringUtils.equals(profileActive, "wx-local")) {
                 CarData value = carData.get(0);
-                value.setSim("13800009998");
-//                value.setSim("123456789011");
+//                value.setSim("1030715050");
+                value.setSim("123456789011");
                 map.put(value.getSim(), value);
             }else {
                 for (CarData carDatum : carData) {
@@ -319,8 +319,8 @@ public class TuohuaConfigBean {
         hashMap.put("abnormalStatus",abnormalStatus);
         if (StringUtils.equals(profileActive, "wx-local")) {
-            hashMap.put("sim","13800009998");
-//            hashMap.put("sim", "123456789011");
+//            hashMap.put("sim","1030715050");
+            hashMap.put("sim", "123456789011");
         }
         return hashMap;
     }
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.FtpConfigBean;
 import com.genersoft.iot.vmp.vmanager.util.FtpUtils;
@@ -77,6 +78,11 @@ public class HistoryRecord {
      */
     private String endTime;
     /**
+     * 原始数据
+     */
+    @TableField(exist = false)
+    private Object data;
+    /**
      * 修改时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -101,21 +107,5 @@ public class HistoryRecord {
      */
     private String remark;
-    public static boolean checkCreateTimeExpiration(HistoryRecord historyRecord) {
-        long l = calculateDaysBetween(historyRecord.createTime);
-        return l > getBean(FtpConfigBean.class).getExpirationTime();
-    }
-
-    public static boolean checkCreateTimeNotExpiration(HistoryRecord historyRecord) {
-        long l = calculateDaysBetween(historyRecord.createTime);
-        return l < getBean(FtpConfigBean.class).getExpirationTime();
-    }
-
-    private static long calculateDaysBetween(Date startDate) {
-        // 将Date转换为LocalDate
-        LocalDate startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        // 计算两个LocalDate对象之间的天数差异
-        return ChronoUnit.DAYS.between(startLocalDate, LocalDate.now());
-    }
 }
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.vmanager.jt1078.platform.mapper;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.HistoryRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import java.util.List;
@@ -18,7 +18,7 @@ public interface HisToryRecordService {
     /**
      * 修改历史视频记录
      */
-    String beachUpdRecode(List<HistoryRecord> record);
+    void beachUpdRecode(List<HistoryRecord> record);
     /**
      * 历史视频上传记录列表
      */
@@ -4,12 +4,8 @@ import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.HistoryRecord;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.mapper.HisToryRecordMapper;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.HisToryRecordService;
 import lombok.AllArgsConstructor;
-import org.springframework.data.redis.cache.RedisCache;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 /**
@@ -22,8 +18,6 @@ import java.util.List;
 public class HisToryRecordServiceImpl implements HisToryRecordService {
     private final HisToryRecordMapper hisToryRecordMapper;
-    @Resource
-    private RedisCache redisCache;
     /**
      * 添加历史下载记录
      * @param record 历史视频下载记录对象
@@ -36,8 +30,8 @@ public class HisToryRecordServiceImpl implements HisToryRecordService {
      * 修改历史视频记录
      */
     @Override
-    public String beachUpdRecode(List<HistoryRecord> record) {
-        return hisToryRecordMapper.beachUpdRecode(record) > 0 ? "success" : "fail";
+    public void beachUpdRecode(List<HistoryRecord> record) {
+        hisToryRecordMapper.beachUpdRecode(record);
     }
     /**
      * 历史视频上传记录列表
@@ -4,7 +4,7 @@ import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.service.ILogService;
-import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+import com.genersoft.iot.vmp.storager.mapper.dto.LogDto;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.github.pagehelper.PageInfo;
@@ -4,7 +4,7 @@ import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.conf.security.SecurityUtils;
 import com.genersoft.iot.vmp.service.IRoleService;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import io.swagger.v3.oas.annotations.Operation;
@@ -6,8 +6,8 @@ import com.genersoft.iot.vmp.conf.security.SecurityUtils;
 import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
 import com.genersoft.iot.vmp.service.IRoleService;
 import com.genersoft.iot.vmp.service.IUserService;
-import com.genersoft.iot.vmp.storager.dao.dto.Role;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.Role;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
@@ -12,11 +12,14 @@ import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
 import org.springframework.stereotype.Component;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.SocketException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 /**
@@ -29,6 +32,41 @@ public class FtpUtils {
     private final FtpConfigBean ftpConfigBean;
+    public boolean checkUpdateTimeExpiration(HistoryRecord historyRecord){
+        Date updateTime = historyRecord.getUpdateTime();
+        if (updateTime != null) {
+            long uploadTime = calculateSecondsBetween(updateTime);
+            return (uploadTime > ftpConfigBean.getTimeOut() && historyRecord.getStatus().equals(HistoryEnum.UPLOADING.getCode()));
+        }
+        return false;
+    }
+
+    public boolean checkCreateTimeExpiration(HistoryRecord historyRecord) {
+        long l = calculateDaysBetween(historyRecord.getCreateTime());
+        return l > ftpConfigBean.getExpirationTime();
+    }
+
+    public boolean checkCreateTimeNotExpiration(HistoryRecord historyRecord) {
+        long l = calculateDaysBetween(historyRecord.getCreateTime());
+        return l <= ftpConfigBean.getExpirationTime();
+    }
+
+
+    private long calculateDaysBetween(Date startDate) {
+        // 将Date转换为LocalDate
+        LocalDate startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        // 计算两个LocalDate对象之间的天数差异
+        return ChronoUnit.DAYS.between(startLocalDate, LocalDate.now());
+    }
+
+
+    private long calculateSecondsBetween(Date startDate) {
+        // 将Date转换为LocalDate
+        LocalDateTime startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        // 计算两个LocalDate对象之间的天数差异
+        return ChronoUnit.SECONDS.between(startLocalDate, LocalDateTime.now());
+    }
+
     /**
      * 获取 FTPClient对象
      * @return FTPClient对象
@@ -60,7 +98,7 @@ public class FtpUtils {
                 ftpClient.disconnect();
                 return null;
             } else {
-                log.info("连接到FTP服务成功");
+                log.debug("连接到FTP服务成功");
                 // 设置二进制方式传输文件
                 ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
                 // 设置被动工作模式，文件传输端口设置,否则文件上传不成功，也不报错
@@ -88,7 +126,7 @@ public class FtpUtils {
                 ftpClient.logout();
                 // 断开ftp的连接
                 ftpClient.disconnect();
-                log.info("关闭ftp客户端成功");
+                log.debug("关闭ftp客户端成功");
             }
         } catch (Exception e) {
             log.error("关闭ftp客户端异常");
@@ -211,8 +249,6 @@ public class FtpUtils {
         } catch (IOException e) {
             log.error("获取文件输入流异常");
             throw new FtpException("获取文件输入流异常");
-        } finally {
-            closeConnect(ftpClient);
         }
         return is;
     }
@@ -247,10 +283,17 @@ public class FtpUtils {
      * @return 如果目录中存在至少一个文件，则返回文件名；否则返回null
      */
     public String checkDirectoryContainsFiles(String directoryPath){
+        if (directoryPath == null ){
+            return null;
+        }
         FTPClient ftpClient = getFTPClient();
         try {
+            String substring = directoryPath;
             // 改变工作目录
-            if (ftpClient.changeWorkingDirectory(directoryPath)) {
+            if (directoryPath.endsWith(".mp4")){
+                substring = directoryPath.substring(0, directoryPath.lastIndexOf("/") + 1);
+            }
+            if (ftpClient.changeWorkingDirectory(substring)) {
                 // 列出目录中的所有文件和子目录
                 FTPFile[] files = ftpClient.listFiles();
                 for (FTPFile file : files) {
@@ -273,25 +316,27 @@ public class FtpUtils {
     public boolean checkHistoryVideo(HistoryRecord record) {
         String fileName = checkDirectoryContainsFiles(record.getPath());
-        boolean flag = fileName != null;
+        boolean flag = fileName != null && record.getStatus().equals(HistoryEnum.UPLOADING.getCode());
         if (flag){
-            record.setPath( String.join(record.getPath(),"/",fileName));
+            record.setPath( StringUtils.join(record.getPath(),"/",fileName));
             record.setStatus(HistoryEnum.UPLOADED.getCode());
+            record.setUpdateTime(new Date());
         }
         return flag;
     }
     /**
      * 批量删除指定路径下的文件和文件夹。
      */
-    public List<HistoryRecord> batchDelete(List<HistoryRecord> historyRecordList) throws IOException {
+    public Map<String,List<HistoryRecord>> batchDelete(List<HistoryRecord> historyRecordList) throws IOException {
         HashMap<String, List<HistoryRecord>> recordMap = new HashMap<>();
         recordMap.put("true",new ArrayList<>(historyRecordList));
         recordMap.put("false",new ArrayList<>(historyRecordList));
         for (HistoryRecord historyRecord : historyRecordList) {
             boolean b = deleteRecursive(historyRecord.getPath());
+            historyRecord.setPath(null);
+            historyRecord.setStatus(HistoryEnum.NOT_UPLOADED.getCode());
+            historyRecord.setUpdateTime(new Date());
             if (!b) {
-                historyRecord.setPath(null);
-                historyRecord.setStatus(HistoryEnum.NOT_UPLOADED.getCode());
                 historyRecord.setCreateTime(new Date());
                 recordMap.get("true").add(historyRecord);
             }else {
@@ -303,9 +348,10 @@ public class FtpUtils {
         log.debug("==> {} 成功删除文件 {} 个 ", format,recordMap.get("true").size());
         log.debug("==> {} 未删除文件 {} 个", format,recordMap.get("false").size());
         log.debug("===========================================================");
-        return recordMap.get("false");
+        return recordMap;
     }
+
     /**
      * 递归删除指定路径下的文件和文件夹。
      *
 package com.genersoft.iot.vmp.web.gb28181;
 import com.genersoft.iot.vmp.service.IUserService;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.storager.mapper.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-spring:
-  # 设置接口超时时间
-  mvc:
-    async:
-      request-timeout: 20000
-  thymeleaf:
-    cache: false
-  # [可选]上传文件大小限制
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 100MB
-
-  # REDIS数据库配置
-  redis:
-    # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-    host: 192.168.169.100
-    # [必须修改] 端口号
-    port: 6879
-    # [可选] 数据库 DB
-    database: 7
-    # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
-    password: wvp4@444
-    # [可选] 超时时间
-    timeout: 10000
-    # mysql数据源
-  datasource:
-    dynamic:
-      primary: master
-      datasource:
-        master:
-          type: com.zaxxer.hikari.HikariDataSource
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.169.100:3306/wvp4?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=TRUE&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&sessionVariables=sql_mode='NO_ENGINE_SUBSTITUTION'&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
-          username: root
-          password: guzijian
-          hikari:
-            connection-timeout: 20000             # 是客户端等待连接池连接的最大毫秒数
-            initialSize: 50                       # 连接池初始化连接数
-            maximum-pool-size: 200                # 连接池最大连接数
-            minimum-idle: 10                       # 连接池最小空闲连接数
-            idle-timeout: 300000                  # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
-            max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
-#[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
-server:
-  port: 18989
-  # [可选] HTTPS配置， 默认不开启
-  ssl:
-    # [可选] 是否开启HTTPS访问
-    enabled: false
-    # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
-    key-store: classpath:Aserver.keystore
-    # [可选] 证书密码
-    key-store-password: guzijian
-    # [可选] 证书类型， 默认为jks，根据实际修改
-    key-store-type: JKS
-
-# 作为28181服务器的配置
-sip:
-  # [必须修改] 本机的IP，对应你的网卡，监听什么ip就是使用什么网卡，
-  # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
-  # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
-  # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
-  ip: 192.168.169.100
-  # [可选] 28181服务监听的端口
-  port: 28083
-  # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
-  # 后两位为行业编码，定义参照附录D.3
-  # 3701020049标识山东济南历下区 信息行业接入
-  # [可选]
-  domain: 4403000000
-  # [可选]
-  id: 44030000003110008001
-  # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验
-  password: 2024bsth@gb18181
-  # 是否存储alarm信息
-  alarm: true
-
-#zlm 默认服务器配置
-media:
-  id: guzijian1
-  # [必须修改] zlm服务器的内网IP
-  ip: 192.168.169.100
-  # [必须修改] zlm服务器的http.port
-  http-port: 1909
-  # [可选] 返回流地址时的ip，置空使用 media.ip 1
-  stream-ip: 61.169.120.202
-  # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip 1
-  sdp-ip: 61.169.120.202
-  # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
-  hook-ip: 192.168.169.100
-  # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
-  http-ssl-port: 2939
-  # [可选] zlm服务器的hook.admin_params=secret
-  secret: 8KMYsD5ItKkHN1CIcPI9VeLa6u4S8deU
-  pushKey: 41db35390ddad33f83944f44b8b75ded
-  # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
-  rtp:
-    # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
-    enable: true
-    # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
-    port-range: 52000,52500 # 端口范围
-    # [可选] 国标级联在此范围内选择端口发送媒体流,
-    send-port-range: 52000,52500 # 端口范围
-  # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
-  record-assist-port: 18081
-# [根据业务需求配置]
-user-settings:
-  # 点播/录像回放 等待超时时间,单位：毫秒
-  play-timeout: 180000
-  # [可选] 自动点播， 使用固定流地址进行播放时，如果未点播则自动进行点播, 需要rtp.enable=true
-  auto-apply-play: true
-  # 设备/通道状态变化时发送消息
-  device-status-notify: true
-# [可选] 日志配置, 一般不需要改
-jt1078:
-  enable: true
-  port: 1079
-logging:
-  config: classpath:logback-spring.xml
-tuohua:
-  bsth:
-    login:
-      pageURL: http://192.168.168.152:9088/user/login/jCryptionKey
-      url: http://192.168.168.152:9088/user/login
-      userName: yuanxiaohu
-      password: Yxiaohu1.0
-      rest:
-        baseURL: http://192.168.168.152:9089/webservice/rest
-        password: bafb2b44a07a02e5e9912f42cd197423884116a8
-    tree:
-      url:
-        company: http://192.168.168.152:9088/video/tree
-        car: http://192.168.168.152:9088/video/tree/carNo/{0}
-        sim: http://192.168.168.152:9088/video//tree/caNO/sim/{0}
-    wvp28181:
-      rtsp:
-        tcpPort: 1078
-        udpPort: 1078
-        historyTcpPort: 9999
-        historyUdpPort: 9999
-        ip : 61.169.120.202
-    jt1078:
-      ports: 49101,49101
-      port: 9100
-      httpPort: 3333
-      addPortVal: 0
-      pushURL: http://127.0.0.1:3333/new/server/{pushKey}/{port}/{httpPort}
-      stopPushURL: http://127.0.0.1:3333/stop/channel/{pushKey}/{port}/{httpPort}
-      url: http://192.168.168.152:8100/device/{0}
-      new_url: http://192.168.168.152:8100/device
-      historyListPort: 9205
-      playHistoryPort: 9201
-      sendPort: 9101
-      stopSendPort: 9102
-      ws: ws://61.169.120.202:1909/schedule/{stream}.live.flv
-      wss: wss://61.169.120.202:2930/schedule/{stream}.live.flv
-      downloadFLV: http://61.169.120.202:1909/schedule/{stream}.live.flv
-      get:
-        url: http://192.168.169.100:3333/video/{stream}.flv
-      playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
-
-ftp:
-  basePath: /wvp-local
-  host: 192.168.169.100
-  httpPath: ftp://192.168.169.100
-  filePathPrefix: http://192.168.169.100:10021/wvp-local
-  password: ftp@123
-  port: 21
-  username: ftpadmin
-  retryTimes: 5
-  retryWaitTimes: 3000
-
-forest:
-  backend: okhttp3             # 后端HTTP框架（默认为 okhttp3）
-  max-connections: 1000        # 连接池最大连接数（默认为 500）
-  max-route-connections: 500   # 每个路由的最大连接数（默认为 500）
-  max-request-queue-size: 100  # [自v1.5.22版本起可用] 最大请求等待队列大小
-  max-async-thread-size: 300   # [自v1.5.21版本起可用] 最大异步线程数
-  max-async-queue-size: 16     # [自v1.5.22版本起可用] 最大异步线程池队列大小
-  timeout: 3000                # [已不推荐使用] 请求超时时间，单位为毫秒（默认为 3000）
-  connect-timeout: 3000        # 连接超时时间，单位为毫秒（默认为 timeout）
-  read-timeout: 3000           # 数据读取超时时间，单位为毫秒（默认为 timeout）
-  max-retry-count: 0           # 请求失败后重试次数（默认为 0 次不重试）
-  #  ssl-protocol: TLS            # 单向验证的HTTPS的默认TLS协议（默认为 TLS）
-  log-enabled: true            # 打开或关闭日志（默认为 true）
-  log-request: true            # 打开/关闭Forest请求日志（默认为 true）
-  log-response-status: true    # 打开/关闭Forest响应状态日志（默认为 true）
-  log-response-content: true   # 打开/关闭Forest响应内容日志（默认为 false）
-#  async-mode: platform         # [自v1.5.27版本起可用] 异步模式（默认为 platform）
@@ -50,9 +50,10 @@
         INSERT INTO `wvp_history_record`
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test=" id != null         and  id != ''         ">`id`               ,</if>
+                <if test=" name != null       and  name != ''       ">`name`             ,</if>
                 <if test=" sim != null        and  sim != ''        ">`sim`              ,</if>
                 <if test=" channel != null    and  channel != ''    ">`channel`          ,</if>
-                <if test=" startTime != null  and  startTime != ''  ">`strat_time`       ,</if>
+                <if test=" startTime != null  and  startTime != ''  ">`start_time`       ,</if>
                 <if test=" endTime != null    and  endTime != ''    ">`end_time`         ,</if>
                 <if test=" status != null     and  status != ''     ">`status`           ,</if>
                 <if test=" ip != null         and  ip != ''         ">`ip`               ,</if>
@@ -92,7 +93,7 @@
                 <if test=" name != null       and  name != ''       "> `name`          = #{name},          </if>
                 <if test=" sim != null        and  sim != ''        "> `sim`           = #{sim},           </if>
                 <if test=" channel != null    and  channel != ''    "> `channel`       = #{channel},       </if>
-                <if test=" startTime != null  and  startTime != ''  "> `strat_time`    = #{startTime},     </if>
+                <if test=" startTime != null  and  startTime != ''  "> `start_time`    = #{startTime},     </if>
                 <if test=" endTime != null    and  endTime != ''    "> `end_time`      = #{endTime},       </if>
                 <if test=" status != null     and  status != ''     "> `status`        = #{status},        </if>
                 <if test=" ip != null         and  ip != ''         "> `ip`            = #{ip},            </if>
@@ -114,7 +115,7 @@
             <set>
             <if test="item.sim != null        and item.sim != ''        ">`sim`           = #{item.sim},           </if>
             <if test="item.channel != null    and item.channel != ''    ">`channel`       = #{item.channel},       </if>
-            <if test="item.startTime != null  and item.startTime != ''  ">`strat_time`    = #{item.startTime},     </if>
+            <if test="item.startTime != null  and item.startTime != ''  ">`start_time`    = #{item.startTime},     </if>
             <if test="item.endTime != null    and item.endTime != ''    ">`end_time`      = #{item.endTime},       </if>
             <if test="item.status != null     and item.status != ''     ">`status`        = #{item.status},        </if>
             <if test="item.ip != null         and item.ip != ''         ">`ip`            = #{item.ip},            </if>
@@ -133,10 +134,12 @@
             `name` = #{item.name}
         </foreach>
     </update>
+
     <select id="getHistoryRecordList"
             resultMap="HISTORY_RECORD_LIST_MAP">
         <include refid="HISTORY_RECORD_LIST_SQL" />
     </select>
+
     <select id="getHistoryRecord"
             resultMap="HISTORY_RECORD_LIST_MAP">
         <include refid="HISTORY_RECORD_LIST_SQL" />
@@ -29,7 +29,7 @@
               </el-time-picker>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="searchHistoryList" style="width: 70%;">搜索</el-button>
+              <el-button type="primary" @click="searchHistoryTimer" style="width: 70%;">搜索</el-button>
             </el-form-item>
           </el-form>
         </el-footer>
@@ -48,7 +48,6 @@
         <el-footer style="width: 100%;height: 30%;background-color: white">
           <history-search-table :table-data="historyData"
                                 @playHistoryVideo="clickHistoricalPlay"
-                                @downloadHistoryVideo="downloadFunction"
                                 @uploadHistoryVideo="uploadHistoryVideo"/>
         </el-footer>
       </el-container>
@@ -74,6 +73,8 @@ export default {
   data() {
     //这里存放数据"
     return {
+      //列表定时器
+      timer: null,
       //历史视频列表定时器
       historyTimer: null,
       historyData: [],
@@ -148,6 +149,12 @@ export default {
       this.loading = true;
       this.getCarInfo()
     },
+    getCarInfoTimer() {
+      this.searchHistoryList()
+      this.timer = setInterval(() => {
+        this.getCarInfo();
+      }, 10000); //
+    },
     getCarInfo() {
       this.$axios({
         method: 'get',
@@ -162,11 +169,6 @@ export default {
             this.statisticsOnline(res.data.data.result)
             this.sourceValue = res.data.data.result;
             this.loading = false
-            //定时更新数据
-            let this_ = this
-            this.carInfoTimeout = setTimeout(function () {
-              this_.getCarInfo()
-            }, 45000);
           } else if (res.data.data.message) {
             this.$message.error(res.data.data.message);
           }
@@ -175,6 +177,8 @@ export default {
         }
         this.loading = false
       }).catch(error => {
+        this.loading = false
+        clearInterval(this.timer)
         this.$message.error(error.message);
       })
     },
@@ -267,10 +271,13 @@ export default {
      * 上传历史视频
      */
     uploadHistoryVideo(data){
+      console.log("开始上传视频 ===》 ",data)
+      this.loading = true
       this.$axios({
         method: 'get',
-        url: '/api/jt1078/query/history/list/' + data.sim + '/' + data.channel + "/" + this.startTime + "/" + this.endTime
+        url: '/api/jt1078/query/history/uploading/' + data.name
       }).then(res => {
+        console.log("上传视频 ==》 ",res)
         if (res.data.data.code === -1){
           this.$message.success("视频开始上传,请等待")
           this.searchHistoryList()
@@ -278,36 +285,15 @@ export default {
       }).cache(err => {
         console.log(err)
         this.$message.error("视频上传失败,请联系管理员")
+        this.loading = false
       })
     },
-    /**
-     * 下载历史视频
-     */
-    downloadFunction(data) {
-      this.$axios({
-        url: `/api/jt1078/query/history/download/${data.name}`, // 请求URL
-        method: 'GET', // 将FTP文件路径作为参数传递
-        responseType: 'blob', // 告知axios以二进制数据流的形式处理响应
-      }).then((response) => {
-        const blob = new Blob([response.data], { type: 'application/octet-stream' });
-        const link = document.createElement('a');
-        link.href = window.URL.createObjectURL(blob);
-        link.download = ftpFilePath.substring(ftpFilePath.lastIndexOf('/') + 1); // 设置下载文件名
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-      }).catch(error => {
-        console.error("下载失败", error);
-      });
+    searchHistoryTimer() {
+      this.searchHistoryList()
+      this.historyTimer = setInterval(() => {
+        this.searchHistoryList();
+      }, 10000); //
     },
-    // downloadFunction(data) {
-    //   this.getDateTime();
-    //   console.log(this.downloadURL);
-    //   if (this.isEmpty(this.downloadURL)) {
-    //     return;
-    //   }
-    //   window.open(this.downloadURL, "_download");
-    // },
     /**
      * 搜索历史视频
      */
@@ -336,34 +322,29 @@ export default {
         this.$message.error('请选择开始和结束时间');
         return;
       }
-      this.loading = true
       this.$axios({
         method: 'get',
         url: '/api/jt1078/query/history/list/' + sim + '/' + channel + "/" + this.startTime + "/" + this.endTime
-      }).then(
-        res => {
+      }).then(res => {
           let items = res.data.data.obj.data.items;
           if (res && res.data && res.data.data && res.data.data.obj && res.data.data.code == 1 && res.data.data.obj.data && items) {
             for (let i in items) {
-              items[i].sim = sim;
-              items[i].channel = channel
-              items[i].name = items[i].startTime + '-' + items[i].endTime;
+              items[i].disabled = false;
+              items[i].countdown = 10;
             }
             this.historyData = items;
-            clearInterval(this.historyTimer);
-            this.historyTimer = setInterval(() => {
-              this.searchHistoryList();
-            }, 10000); //
           } else if (res && res.data && res.data.data && res.data.data.msg) {
             this.$message.error(res.data.data.msg);
           } else if (items === undefined) {
             this.historyData = [];
             this.$message.warning("搜索历史列表为空")
           }
-          this.loading = false
-        }).cache(res => {
-        this.$message.error(res.msg);
         this.loading = false
+      }).catch(error => {
+        console.log(error)
+        this.loading = false
+        clearInterval(this.historyTimer)
+        this.$message.error("发送历史视频列表指令异常");
       })
     },
     /**
@@ -527,6 +508,8 @@ export default {
   beforeDestroy() {
   }, //生命周期 - 销毁之前",
   destroyed() {
+    clearInterval(this.timer)
+    clearInterval(this.historyTimer)
   }, //生命周期 - 销毁完成",
   activated() {
   } //如果页面有keep-alive缓存功能，这个函数会触发",
 <template>
+  <div style="width: 100%;height: 100%;">
     <el-table
+      v-if="tableData.length > 0"
       ref="singleTable"
       :data="tableData"
+      :header-cell-style="{ textAlign: 'center' ,height:'20px',lineHeight:'20px' }"
+      border
       highlight-current-row
       @current-change="handleCurrentChange"
       height="250"
-      style="width: 100%">
+      style="width: 100%;text-align: center">
       <el-table-column
         type="index"
         fixed
-        width="100">
+        align="center"
+        width="100"
+        label="序号">
       </el-table-column>
       <el-table-column
         property="name"
+        align="center"
         label="名称">
       </el-table-column>
       <el-table-column
-        property="date"
+        align="center"
         label="日期">
+        <template slot-scope="scope">
+          {{`${scope.row.startTime}-${scope.row.endTime}`}}
+        </template>
       </el-table-column>
       <el-table-column
         property="status"
+        align="center"
         label="状态">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status===null ||scope.row.status === '0'"><el-tag>未上传</el-tag></span>
+          <span v-if="scope.row.status==='2'"><el-tag type="info">上传中</el-tag></span>
+          <span v-if="scope.row.status==='3'"><el-tag type="success">已上传</el-tag></span>
+        </template>
       </el-table-column>
       <el-table-column
         fixed="right"
+        align="center"
         label="操作">
         <template slot-scope="scope">
           <el-button icon="el-icon-video-play" size="small" style="border: none" @click="playHistoryVideo(scope.row)"></el-button>
-          <el-button v-if="scope.row.status === '1'" icon="el-icon-upload" size="small" style="border: none" @click="uploadHistoryVideo(scope.row)"></el-button>
-          <el-button v-if="scope.row.status === '2'" icon="el-icon-download" size="small" style="border: none" @click="downloadHistoryVideo(scope.row)"></el-button>
+          <el-button v-if="scope.row.status === '0'" icon="el-icon-upload" size="small" style="border: none" @click="uploadHistoryVideo(scope.row)"></el-button>
+          <el-button v-if="scope.row.status === '3'"
+                     icon="el-icon-download"
+                     :disabled="scope.row.disabled"
+                     size="small" style="border: none"
+                     @click="downloadHistoryVideo(scope.row)">
+            {{ scope.row.disabled ? `${scope.row.countdown}s` : '' }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
+    <el-empty v-else style="width: 100%;height: 100%"></el-empty>
+  </div>
 </template>
 <script>
@@ -50,7 +75,8 @@
     data() {
       //这里存放数据"
       return {
-        currentRow: null
+        currentRow: null,
+        historyTimer: null
       };
     },
     //计算属性 类似于data概念",
@@ -87,8 +113,48 @@
        * 下载历史视频
        * @param row
        */
-      downloadHistoryVideo(row){
-        this.$emit('downloadHistoryVideo', row);
+      downloadHistoryVideo(data){
+        if (data.disabled) return;
+        if (data.historyTimer){
+          this.$message.warning("点击太频繁,请稍后重试")
+        }
+        let initialCountdown = data.countdown;
+        const timer = setInterval(() => {
+          if (data.countdown > 0) {
+            data.countdown--;
+          } else {
+            clearInterval(timer);
+            data.countdown = initialCountdown; // 重置倒计时
+            data.isCountingDown = false; // 结束倒计时
+          }
+        }, 1000);
+        /**
+         * 下载历史视频
+         */
+        this.$axios({
+          url: `/api/jt1078/query/history/download/${data.name}`, // 请求URL
+          method: 'GET', // 将FTP文件路径作为参数传递
+          responseType: 'blob', // 告知axios以二进制数据流的形式处理响应
+        }).then((response) => {
+          const blob = new Blob([response.data], { type: 'application/octet-stream' });
+          const link = document.createElement('a');
+          data.disabled = true;
+          link.href = window.URL.createObjectURL(blob);
+          link.download = data.name + ".mp4"; // 设置下载文件名
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          clearInterval(timer);
+          data.countdown = initialCountdown; // 重置倒计时
+          data.isCountingDown = false;
+          this.$message.success(`${link.download} 下载成功`)
+        }).catch(error => {
+          clearInterval(timer);
+          data.countdown = initialCountdown; // 重置倒计时
+          data.isCountingDown = false;
+          this.$message.error(`${data.name} 下载失败`)
+          console.error("下载失败", error);
+        });
       }
     },
     //生命周期 - 创建完成（可以访问当前this实例）",
@@ -33,9 +33,12 @@
               <span v-if="data.abnormalStatus !== undefined && data.abnormalStatus === 10">
                   <i class="el-icon-location" style="color: #909399"></i>{{ `${data.name}（未接入）` }}
               </span>
-              <span v-if="data.abnormalStatus === undefined && data.children ">
+              <span v-if="data.abnormalStatus === undefined && data.children && data.children.length > 0 ">
                   {{ `${data.name}（${data.onlineData.length}/${data.children.length}）` }}
               </span>
+              <span v-if="data.abnormalStatus === undefined && data.children && data.children.length === 0 ">
+                  {{ `${data.name}（0/0）` }}
+              </span>
               <span v-if="data.abnormalStatus === undefined && data.children === undefined ">
                   <i class="el-icon-video-camera-solid">&nbsp;&nbsp;</i>{{ `${data.name}` }}
               </span>