修改录像查询和录像裁剪合并

panlinlin
1 parent 428e2657
Showing 5 changed files with 92 additions and 18 deletions
pom.xml
src/main/java/top/panll/assist/config/RedisConfig.java
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/resources/application-dev.yml
@@ -21,6 +21,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <dependency>
             <groupId>log4j</groupId>
@@ -34,6 +38,13 @@
             <version>0.6.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.73</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+package top.panll.assist.config;
+
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * @Description:Redis中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置
+ * @author: swwheihei
+ * @date: 2019年5月30日 上午10:58:25
+ * 
+ */
+@Configuration
+public class RedisConfig extends CachingConfigurerSupport {
+
+	@Bean("redisTemplate")
+	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+		RedisTemplate<Object, Object> template = new RedisTemplate<>();
+		template.setConnectionFactory(redisConnectionFactory);
+		// 使用fastjson进行序列化处理，提高解析效率
+		FastJsonRedisSerializer<Object> serializer = new FastJsonRedisSerializer<Object>(Object.class);
+		// value值的序列化采用fastJsonRedisSerializer
+		template.setValueSerializer(serializer);
+		template.setHashValueSerializer(serializer);
+		// key的序列化采用StringRedisSerializer
+		template.setKeySerializer(new StringRedisSerializer());
+		template.setHashKeySerializer(new StringRedisSerializer());
+		template.setConnectionFactory(redisConnectionFactory);
+		// 使用fastjson时需设置此项，否则会报异常not support type
+		ParserConfig.getGlobalInstance().setAutoTypeSupport(true); 
+		return template;
+	}
+
+	/**
+	 * redis消息监听器容器 可以添加多个监听不同话题的redis监听器，只需要把消息监听器和相应的消息订阅处理器绑定，该消息监听器
+	 * 通过反射技术调用消息订阅处理器的相关方法进行一些业务处理
+	 * 
+	 * @param connectionFactory
+	 * @return
+	 */
+	@Bean
+	RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) {
+
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        return container;
+    }
+
+}
@@ -40,10 +40,10 @@ public class FFmpegExecUtils {
     public FFmpeg ffmpeg;
     public interface VideoHandEndCallBack {
-        public void run(String status, double percentage, String result);
+        void run(String status, double percentage, String result);
     }
-    public static void mergeOrCutFile(List<File> fils, File dest, VideoHandEndCallBack callBack){
+    public void mergeOrCutFile(List<File> fils, File dest, VideoHandEndCallBack callBack){
         FFmpeg ffmpeg = FFmpegExecUtils.getInstance().ffmpeg;
         FFprobe ffprobe = FFmpegExecUtils.getInstance().ffprobe;
         if (fils == null || fils.size() == 0 || ffmpeg == null || ffprobe == null || dest== null || !dest.exists()){
@@ -2,6 +2,7 @@ package top.panll.assist.service;
 import net.bramp.ffmpeg.FFprobe;
 import net.bramp.ffmpeg.probe.FFmpegProbeResult;
+import net.bramp.ffmpeg.progress.Progress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,26 +83,13 @@ public class VideoFileService {
         logger.debug("获取[app: {}, stream: {}, statime: {}, endTime: {}]的视频", app, stream,
                 startTimeStr, endTimeStr);
-        File file = new File(userSettings.getRecord());
-        File[] appFiles = file.listFiles((File dir, String name) -> {
-                return app.equals(name);
-        });
-        if (appFiles.length == 0) {
-            logger.warn("获取[app: {}, stream: {}, statime: {}, endTime: {}]的视频时未找到目录： {}", app, stream,
-                    startTimeStr, endTimeStr, app);
-            return result;
-        }
-        File appFile = appFiles[0];
-        File[] streamFiles = appFile.listFiles((File dir, String name)-> {
-                return stream.equals(name);
-        });
-        if (streamFiles.length == 0) {
+        File recordFile = new File(userSettings.getRecord());
+        File streamFile = new File(recordFile.getAbsolutePath() + File.separator + app + File.separator + stream);
+        if (!streamFile.exists()) {
             logger.warn("获取[app: {}, stream: {}, statime: {}, endTime: {}]的视频时未找到目录： {}", app, stream,
                     startTimeStr, endTimeStr, stream);
             return result;
         }
-        File streamFile = streamFiles[0];
-
         File[] dateFiles = streamFile.listFiles((File dir, String name) -> {
             Date fileDate = null;
             try {
@@ -163,7 +151,13 @@ public class VideoFileService {
     public void mergeOrCut(String app, String stream, Date startTime, Date endTime) {
         List<File> filesInTime = this.getFilesInTime(app, stream, startTime, endTime);
+        File recordFile = new File(userSettings.getRecord());
+        File streamFile = new File(recordFile.getAbsolutePath() + File.separator + app + File.separator + stream);
+        FFmpegExecUtils.getInstance().mergeOrCutFile(filesInTime, streamFile, (String status, double percentage, String result)->{
+            if (status.equals(Progress.Status.END.name())) {
+            }
+        });
     }
 }
+spring:
+    # REDIS数据库配置
+    redis:
+        # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
+        host: 127.0.0.1
+        # [必须修改] 端口号
+        port: 6379
+        # [可选] 数据库 DB
+        database: 8
+        # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
+        password:
+        # [可选] 超时时间
+        timeout: 10000
+
 # [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server:
     port: 18081