修改接口bug

64850858
1 parent f3e2bf1e
Showing 13 changed files with 359 additions and 96 deletions
.gitignore
pom.xml
src/main/java/top/panll/assist/config/FastJsonRedisSerializer.java
src/main/java/top/panll/assist/config/RedisConfig.java
src/main/java/top/panll/assist/config/StartConfig.java
src/main/java/top/panll/assist/config/TaskConfig.java
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/dto/MergeOrCutTaskInfo.java
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/java/top/panll/assist/config/RedisUtil.java → src/main/java/top/panll/assist/utils/RedisUtil.java
src/main/resources/application-dev.yml
src/main/resources/application-local.yml
+/target/
 /.idea/
+/logs/
@@ -81,6 +81,14 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+package top.panll.assist.config;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+import java.nio.charset.Charset;
+
+public class FastJsonRedisSerializer<T> implements RedisSerializer<T> {
+    private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+    private Class<T> clazz;
+
+    /**
+     * 添加autotype白名单
+     * 解决redis反序列化对象时报错 ：com.alibaba.fastjson.JSONException: autoType is not support
+     */
+    static {
+        ParserConfig.getGlobalInstance().addAccept("top.panll.assist");
+    }
+
+    public FastJsonRedisSerializer(Class<T> clazz) {
+        super();
+        this.clazz = clazz;
+    }
+
+    @Override
+    public byte[] serialize(T t) throws SerializationException {
+        if (null == t) {
+            return new byte[0];
+        }
+        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
+    }
+
+    @Override
+    public T deserialize(byte[] bytes) throws SerializationException {
+        if (null == bytes || bytes.length <= 0) {
+            return null;
+        }
+        String str = new String(bytes, DEFAULT_CHARSET);
+        return JSON.parseObject(str, clazz);
+    }
+}
 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.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 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.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -17,14 +20,21 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
  * 
  */
 @Configuration
-public class RedisConfig extends CachingConfigurerSupport {
+@ConditionalOnClass(RedisOperations.class)
+@EnableConfigurationProperties(RedisProperties.class)
+public class RedisConfig {
-	@Bean("redisTemplate")
+	static {
+		ParserConfig.getGlobalInstance().addAccept("top.panll.assist");
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(name = "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);
+		FastJsonRedisSerializer<Object> serializer = new FastJsonRedisSerializer<>(Object.class);
 		// value值的序列化采用fastJsonRedisSerializer
 		template.setValueSerializer(serializer);
 		template.setHashValueSerializer(serializer);
@@ -33,8 +43,9 @@ public class RedisConfig extends CachingConfigurerSupport {
 		template.setHashKeySerializer(new StringRedisSerializer());
 		template.setConnectionFactory(redisConnectionFactory);
 		// 使用fastjson时需设置此项，否则会报异常not support type
-		ParserConfig.getGlobalInstance().setAutoTypeSupport(true); 
+//		ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
 		return template;
+
 	}
 	/**
@@ -53,7 +53,7 @@ public class StartConfig implements CommandLineRunner {
             String ffprobePath = userSettings.getFfprobe();
             FFmpeg ffmpeg = new FFmpeg(ffmpegPath);
             FFprobe ffprobe = new FFprobe(ffprobePath);
-            logger.info("wvp-pro辅助程序启动成功");
+            logger.info("wvp-pro辅助程序启动成功。 \n{}\n{} ", ffmpeg.version(), ffprobe.version());
             FFmpegExecUtils.getInstance().ffmpeg = ffmpeg;
             FFmpegExecUtils.getInstance().ffprobe = ffprobe;
             // 对目录进行预整理
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import top.panll.assist.service.VideoFileService;
 import java.io.File;
@@ -16,7 +17,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-@Configuration
+@Component
 @EnableScheduling
 public class TaskConfig {
 package top.panll.assist.controller;
+import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import top.panll.assist.controller.bean.WVPResult;
+import top.panll.assist.dto.MergeOrCutTaskInfo;
 import top.panll.assist.service.VideoFileService;
 import top.panll.assist.utils.PageInfo;
@@ -105,11 +109,11 @@ public class RecordController {
      */
     @GetMapping(value = "/date/list")
     @ResponseBody
-    public WVPResult<PageInfo<String>> getDateList(@RequestParam int page,
-                                                     @RequestParam int count,
-                                                     @RequestParam String app,
-                                                     @RequestParam String stream ){
-        WVPResult<PageInfo<String>> result = new WVPResult<>();
+    public WVPResult<List<String>> getDateList( @RequestParam(required = false) Integer year,
+                                                @RequestParam(required = false) Integer month,
+                                                 @RequestParam String app,
+                                                 @RequestParam String stream ){
+        WVPResult<List<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         if (app == null) {
             result.setCode(400);
@@ -121,15 +125,13 @@ public class RecordController {
             result.setMsg("stream不能为空");
             return result;
         }
-        List<File> dateList = videoFileService.getDateList(app, stream);
+        List<File> dateList = videoFileService.getDateList(app, stream, year, month);
         for (File file : dateList) {
             resultData.add(file.getName());
         }
         result.setCode(0);
         result.setMsg("success");
-        PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
-        stringPageInfo.startPage(page, count);
-        result.setData(stringPageInfo);
+        result.setData(resultData);
         return result;
     }
@@ -188,7 +190,7 @@ public class RecordController {
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/file/download/task")
+    @GetMapping(value = "/file/download/task/add")
     @ResponseBody
     public WVPResult<String> addTaskForDownload(@RequestParam String app,
                                       @RequestParam String stream,
@@ -210,35 +212,63 @@ public class RecordController {
         }
         String id = videoFileService.mergeOrCut(app, stream, startTimeDate, endTimeDate);
         result.setCode(0);
-        result.setMsg(id!= null?"success":"error");
+        result.setMsg(id!= null?"success":"error： 可能未找到视频文件");
         result.setData(id);
         return result;
     }
     /**
-     * 录制完成的通知
+     * 查询视频裁剪合并任务列表
      * @return
      */
-    @GetMapping(value = "/end")
+    @GetMapping(value = "/file/download/task/list")
     @ResponseBody
-    public WVPResult<String> recordEnd(@RequestParam String path
-    ){
-        File file = new File(path);
-        WVPResult<String> result = new WVPResult<>();
-        if (file.exists()) {
-            try {
-                videoFileService.handFile(file);
-                result.setCode(0);
-                result.setMsg("success");
-            } catch (ParseException e) {
-                e.printStackTrace();
-                result.setCode(500);
-                result.setMsg("error");
-            }
-        }else {
-            result.setCode(400);
-            result.setMsg("路径不存在");
+    public WVPResult<List<MergeOrCutTaskInfo>> getTaskListForDownload(@RequestParam Boolean isEnd){
+        if (isEnd == null) {
+            isEnd = false;
         }
+        List<MergeOrCutTaskInfo> taskList = videoFileService.getTaskListForDownload(isEnd);
+        WVPResult<List<MergeOrCutTaskInfo>> result = new WVPResult<>();
+        result.setCode(0);
+        result.setMsg(taskList !=  null?"success":"error");
+        result.setData(taskList);
         return result;
     }
+
+    /**
+     * TODO 中止视频裁剪合并任务列表
+     * @return
+     */
+    @GetMapping(value = "/file/download/task/stop")
+    @ResponseBody
+    public WVPResult<String> stopTaskForDownload(@RequestParam String taskId){
+//        WVPResult<String> result = new WVPResult<>();
+//        if (taskId == null) {
+//            result.setCode(400);
+//            result.setMsg("taskId 不能为空");
+//            return result;
+//        }
+//        boolean stopResult = videoFileService.stopTask(taskId);
+//        result.setCode(0);
+//        result.setMsg(stopResult ? "success": "fail");
+        return null;
+    }
+
+    /**
+     * 录制完成的通知, 对用zlm的hook
+     * @return
+     */
+    @ResponseBody
+    @PostMapping(value = "/on_record_mp4", produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json) {
+        JSONObject ret = new JSONObject();
+        ret.put("code", 0);
+        ret.put("msg", "success");
+        String file_path = json.getString("file_path");
+        logger.debug("ZLM 录制完成，参数：" + file_path);
+        if (file_path == null) return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
+        videoFileService.handFile(new File(file_path));
+
+        return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
+    }
 }
+package top.panll.assist.dto;
+
+import java.util.Date;
+
+public class MergeOrCutTaskInfo {
+    private String id;
+    private String startTime;
+    private String endTime;
+    private String app;
+    private String stream;
+
+    private String percentage;
+
+    private String recordFile;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getApp() {
+        return app;
+    }
+
+    public void setApp(String app) {
+        this.app = app;
+    }
+
+    public String getStream() {
+        return stream;
+    }
+
+    public void setStream(String stream) {
+        this.stream = stream;
+    }
+
+    public String getPercentage() {
+        return percentage;
+    }
+
+    public void setPercentage(String percentage) {
+        this.percentage = percentage;
+    }
+
+    public String getRecordFile() {
+        return recordFile;
+    }
+
+    public void setRecordFile(String recordFile) {
+        this.recordFile = recordFile;
+    }
+}
@@ -51,7 +51,6 @@ public class FFmpegExecUtils {
             return null;
         }
-
         File tempFile = new File(dest.getAbsolutePath() + File.separator + temp);
         if (!tempFile.exists()) {
             tempFile.mkdirs();
@@ -66,14 +65,12 @@ public class FFmpegExecUtils {
                 if (split.length != 3) continue;
                 String durationStr = split[2].replace(".mp4", "");
                 Double duration = Double.parseDouble(durationStr)/1000;
-                System.out.println(duration);
                 bw.write("file " + file.getAbsolutePath());
                 bw.newLine();
                 durationAll += duration;
             }
             bw.flush();
             bw.close();
-            System.out.println(durationAll);
         } catch (IOException e) {
             e.printStackTrace();
             callBack.run("error", 0.0, null);
@@ -91,7 +88,6 @@ public class FFmpegExecUtils {
                 .setFormat("mp4")
                 .done();
-
         double finalDurationAll = durationAll;
         FFmpegJob job = executor.createJob(builder, (Progress progress) -> {
             final double duration_ns = finalDurationAll * TimeUnit.SECONDS.toNanos(1);
@@ -107,6 +103,7 @@ public class FFmpegExecUtils {
 //                    progress.fps.doubleValue(),
 //                    progress.speed
 //            ));
+
             if (progress.status.equals(Progress.Status.END)){
                 callBack.run(progress.status.name(), percentage,dest.getName() + File.separator + temp + File.separator + "record.mp4");
                 System.out.println(System.currentTimeMillis() - startTime);
@@ -114,7 +111,6 @@ public class FFmpegExecUtils {
                 callBack.run(progress.status.name(), percentage, null);
             }
         });
-
         job.run();
         return temp;
     }
 package top.panll.assist.service;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import net.bramp.ffmpeg.FFprobe;
 import net.bramp.ffmpeg.probe.FFmpegProbeResult;
 import net.bramp.ffmpeg.progress.Progress;
@@ -11,12 +11,15 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
-import top.panll.assist.config.RedisUtil;
+import top.panll.assist.utils.RedisUtil;
+import top.panll.assist.dto.MergeOrCutTaskInfo;
 import top.panll.assist.dto.UserSettings;
 import top.panll.assist.utils.DateUtils;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -41,7 +44,9 @@ public class VideoFileService {
     private ThreadPoolExecutor processThreadPool;
     private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat simpleDateFormatForTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private String keyStr = "MERGEORCUT";
     @Bean("threadPoolExecutor")
     private ThreadPoolExecutor iniThreadPool() {
@@ -84,9 +89,9 @@ public class VideoFileService {
      * @param file
      * @throws ParseException
      */
-    public void handFile(File file) throws ParseException {
+    public void handFile(File file) {
         FFprobe ffprobe = FFmpegExecUtils.getInstance().ffprobe;
-        if(file.isFile() && !file.getName().startsWith(".")&& file.getName().endsWith(".mp4") && file.getName().indexOf(":") < 0) {
+        if(file.exists() && file.isFile() && !file.getName().startsWith(".")&& file.getName().endsWith(".mp4") && file.getName().indexOf(":") < 0) {
             try {
                 FFmpegProbeResult in = null;
                 in = ffprobe.probe(file.getAbsolutePath());
@@ -107,8 +112,11 @@ public class VideoFileService {
                         simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4");
                 file.renameTo(new File(newName));
                 System.out.println(newName);
-            } catch (IOException exception) {
-                exception.printStackTrace();
+            } catch (IOException e) {
+                logger.warn("文件可能以损坏[{}]", file.getAbsolutePath());
+//                e.printStackTrace();
+            } catch (ParseException e) {
+                logger.error("时间格式化失败", e.getMessage());
             }
         }
     }
@@ -127,19 +135,30 @@ public class VideoFileService {
                         data.put("app", appFile.getName());
                         data.put("stream", streamFile.getName());
-//                        BasicFileAttributes bAttributes = null;
-//                        try {
-//                            bAttributes = Files.readAttributes(streamFile.toPath(),
-//                                    BasicFileAttributes.class);
-//                        } catch (IOException e) {
-//                            e.printStackTrace();
-//                        }
-//                        data.put("time", simpleDateFormat.format(new Date(bAttributes.lastModifiedTime().toMillis())));
+                        BasicFileAttributes bAttributes = null;
+                        try {
+                            bAttributes = Files.readAttributes(streamFile.toPath(),
+                                    BasicFileAttributes.class);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        data.put("time", simpleDateFormatForTime.format(new Date(bAttributes.lastModifiedTime().toMillis())));
                         result.add(data);
                     }
                 }
             }
         }
+        result.sort((Map f1, Map f2)->{
+            Date time1 = null;
+            Date time2 = null;
+            try {
+                time1 = simpleDateFormatForTime.parse(f1.get("time").toString());
+                time2 = simpleDateFormatForTime.parse(f2.get("time").toString());
+            } catch (ParseException e) {
+                logger.error("时间格式化失败", e.getMessage());
+            }
+            return time1.compareTo(time2) * -1;
+        });
         return result;
     }
@@ -175,14 +194,16 @@ public class VideoFileService {
         }
         File[] dateFiles = streamFile.listFiles((File dir, String name) -> {
             Date fileDate = null;
+            Date startDate = new Date(startTime.getTime() - ((startTime.getTime() + 28800000) % (86400000)));
+            Date endDate = new Date(endTime.getTime() - ((endTime.getTime() + 28800000) % (86400000)));
             try {
                 fileDate = formatterForDate.parse(name);
             } catch (ParseException e) {
                 logger.error("过滤日期文件时异常： {}-{}", name, e.getMessage());
                 return false;
             }
-            return (DateUtils.getStartOfDay(fileDate).compareTo(startTime) >= 0
-                    && DateUtils.getStartOfDay(fileDate).compareTo(endTime) <= 0) ;
+            return (DateUtils.getStartOfDay(fileDate).compareTo(startDate) <= 0
+                    && DateUtils.getStartOfDay(fileDate).compareTo(endDate) >= 0) ;
         });
         if (dateFiles != null && dateFiles.length > 0) {
@@ -235,50 +256,131 @@ public class VideoFileService {
     public String mergeOrCut(String app, String stream, Date startTime, Date endTime) {
         List<File> filesInTime = this.getFilesInTime(app, stream, startTime, endTime);
+        if (filesInTime== null || filesInTime.size() == 0){
+            logger.info("此时间段未未找到视频文件");
+            return null;
+        }
         File recordFile = new File(new File(userSettings.getRecord()).getParentFile().getAbsolutePath()  + File.separator + "recordTemp");
         if (!recordFile.exists()) recordFile.mkdirs();
-        String temp = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
-        processThreadPool.execute(() -> {
-            FFmpegExecUtils.getInstance().mergeOrCutFile(filesInTime, recordFile, temp, (String status, double percentage, String result)->{
-                Map<String, String> data = new HashMap<>();
-                data.put("id", temp);
+        String taskId = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
+        MergeOrCutTaskInfo mergeOrCutTaskInfo = new MergeOrCutTaskInfo();
+        mergeOrCutTaskInfo.setId(taskId);
+        mergeOrCutTaskInfo.setApp(app);
+        mergeOrCutTaskInfo.setStream(stream);
+        mergeOrCutTaskInfo.setStartTime(simpleDateFormatForTime.format(startTime));
+        mergeOrCutTaskInfo.setEndTime(simpleDateFormatForTime.format(endTime));
+
+        Runnable task = () -> {
+            FFmpegExecUtils.getInstance().mergeOrCutFile(filesInTime, recordFile, taskId, (String status, double percentage, String result)->{
+
                 // 发出redis通知
                 if (status.equals(Progress.Status.END.name())) {
-                    data.put("percentage", "1");
-                    data.put("recordFile", result);
-                    redisUtil.set(app + "_" + stream + "_" + temp, data, 3*60*60);
-                    stringRedisTemplate.convertAndSend("topic_mergeorcut_end", JSON.toJSONString(data));
+                    mergeOrCutTaskInfo.setPercentage("1");
+                    mergeOrCutTaskInfo.setRecordFile(result);
+                    stringRedisTemplate.convertAndSend("topic_mergeorcut_end", JSONObject.toJSONString(mergeOrCutTaskInfo));
                 }else {
-                    data.put("percentage", percentage + "");
-                    redisUtil.set(app + "_" + stream + "_" + temp, data, 3*60*60);
-                    stringRedisTemplate.convertAndSend("topic_mergeorcut_continue",  JSON.toJSONString(data));
+                    mergeOrCutTaskInfo.setPercentage(percentage + "");
+                    stringRedisTemplate.convertAndSend("topic_mergeorcut_continue",  JSONObject.toJSONString(mergeOrCutTaskInfo));
                 }
+                String key = String.format("%S_%S_%S_%S", keyStr, app, stream, taskId);
+                redisUtil.set(key, mergeOrCutTaskInfo);
             });
-        });
-        return temp;
+        };
+        processThreadPool.execute(task);
+        return taskId;
     }
-    public List<File> getDateList(String app, String stream) {
+    public List<File> getDateList(String app, String stream, Integer year, Integer month) {
         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: {}]的视频时未找到目录： {}", app, stream, stream);
             return null;
         }
-        File[] dateFiles = streamFile.listFiles();
+        File[] dateFiles = streamFile.listFiles((File dir, String name)->{
+            Date date = null;
+            try {
+                date = simpleDateFormat.parse(name);
+            } catch (ParseException e) {
+                logger.error("格式化时间{}错误", name);
+            }
+            Calendar c = Calendar.getInstance();
+            c.setTime(date);
+            int y = c.get(Calendar.YEAR);
+            int m = c.get(Calendar.MONTH);
+            if (year != null) {
+                if (month != null) {
+                    return  y == year && m == month;
+                }else {
+                    return  y == year;
+                }
+            }else {
+                return true;
+            }
+
+        });
         List<File> dateFileList = Arrays.asList(dateFiles);
+
         dateFileList.sort((File f1, File f2)->{
             int sortResult = 0;
-            SimpleDateFormat formatterForDate = new SimpleDateFormat("yyyy-MM-dd");
+
             try {
-                sortResult = formatterForDate.parse(f1.getName()).compareTo(formatterForDate.parse(f2.getName()));
+                sortResult = simpleDateFormat.parse(f1.getName()).compareTo(simpleDateFormat.parse(f2.getName()));
             } catch (ParseException e) {
-                e.printStackTrace();
+                logger.error("格式化时间{}/{}错误", f1.getName(), f2.getName());
             }
             return sortResult;
         });
         return dateFileList;
     }
+
+    public List<MergeOrCutTaskInfo> getTaskListForDownload(boolean idEnd) {
+        ArrayList<MergeOrCutTaskInfo> result = new ArrayList<>();
+        List<Object> taskCatch = redisUtil.scan(String.format("%S_*_*_*", keyStr));
+        for (int i = 0; i < taskCatch.size(); i++) {
+            String keyItem = taskCatch.get(i).toString();
+            MergeOrCutTaskInfo mergeOrCutTaskInfo = (MergeOrCutTaskInfo)redisUtil.get(keyItem);
+            if (mergeOrCutTaskInfo != null){
+                if (idEnd) {
+                    if (Double.parseDouble(mergeOrCutTaskInfo.getPercentage()) == 1){
+                        result.add(mergeOrCutTaskInfo);
+                    }
+                }else {
+                    if (Double.parseDouble(mergeOrCutTaskInfo.getPercentage()) < 1){
+                        result.add((MergeOrCutTaskInfo)redisUtil.get(keyItem));
+                    }
+                }
+            }
+        }
+        result.sort((MergeOrCutTaskInfo m1, MergeOrCutTaskInfo m2)->{
+            int sortResult = 0;
+            try {
+                sortResult = simpleDateFormatForTime.parse(m1.getStartTime()).compareTo(simpleDateFormatForTime.parse(m2.getStartTime()));
+                if (sortResult == 0) {
+                    sortResult = simpleDateFormatForTime.parse(m1.getEndTime()).compareTo(simpleDateFormatForTime.parse(m2.getEndTime()));
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            return sortResult * -1;
+        });
+        return result;
+    }
+
+    public boolean stopTask(String taskId) {
+//        Runnable task = taskList.get(taskId);
+//        boolean result = false;
+//        if (task != null) {
+//            processThreadPool.remove(task);
+//            taskList.remove(taskId);
+//            List<Object> taskCatch = redisUtil.scan(String.format("%S_*_*_%S", keyStr, taskId));
+//            if (taskCatch.size() == 1) {
+//                redisUtil.del((String) taskCatch.get(0));
+//                result = true;
+//            }
+//        }
+        return false;
+    }
 }
-package top.panll.assist.config;
+package top.panll.assist.utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.*;
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
 public class RedisUtil {
 	@Autowired
-    private RedisTemplate redisTemplate;
+    private RedisTemplate<Object, Object> redisTemplate;
 	/**
      * 指定缓存失效时间
@@ -474,7 +474,7 @@ public class RedisUtil {
      * @param end
      * @return
      */
-    public Set<ZSetOperations.TypedTuple<String>> zRangeWithScore(Object key, int start, int end) {
+    public Set<ZSetOperations.TypedTuple<Object>> zRangeWithScore(Object key, int start, int end) {
         return redisTemplate.opsForZSet().rangeWithScores(key, start, end);
     }
     /**
@@ -487,7 +487,7 @@ public class RedisUtil {
      * @param end
      * @return
      */
-    public Set<String> zRevRange(Object key, int start, int end) {
+    public Set<Object> zRevRange(Object key, int start, int end) {
         return redisTemplate.opsForZSet().reverseRange(key, start, end);
     }
     /**
@@ -498,7 +498,7 @@ public class RedisUtil {
      * @param max
      * @return
      */
-    public Set<String> zSortRange(Object key, int min, int max) {
+    public Set<Object> zSortRange(Object key, int min, int max) {
         return redisTemplate.opsForZSet().rangeByScore(key, min, max);
     }
@@ -666,7 +666,7 @@ public class RedisUtil {
      */
     public List<Object> keys(String key) {
         try {
-            Set<String> set = redisTemplate.keys(key);
+            Set<Object> set = redisTemplate.keys(key);
             return new ArrayList<>(set);
         } catch (Exception e) {
             e.printStackTrace();
@@ -46,8 +46,7 @@ logging:
         max-size: 10MB
         total-size-cap: 300MB
     level:
-        com:
-            genersoft:
-                iot: info
-    net:
-        bramp: warning
 \ No newline at end of file
+        root: WARN
+        top:
+            panll:
+                assist: info
 \ No newline at end of file
@@ -6,7 +6,7 @@ spring:
         # [必须修改] 端口号
         port: 6379
         # [可选] 数据库 DB
-        database: 8
+        database: 10
         # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
         password:
         # [可选] 超时时间
@@ -29,7 +29,7 @@ server:
 # [根据业务需求配置]
 userSettings:
     # [必选 ] zlm配置的录像路径
-    record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
+    record: /home/lin/server/ZLMediaKit/release/linux/Debug/www/record/
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
     recordDay: 7
     # [必选 ] ffmpeg路径
@@ -45,8 +45,7 @@ logging:
         max-size: 10MB
         total-size-cap: 300MB
     level:
-        com:
-            genersoft:
-                iot: info
-    net:
-        bramp: warning
 \ No newline at end of file
+        root: WARN
+        top:
+            panll:
+                assist: debug
 \ No newline at end of file