添加接口

panlinlin
1 parent 43c6122d
Showing 9 changed files with 332 additions and 18 deletions
.gitignore
pom.xml
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/UserSettings.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/java/top/panll/assist/utils/PageInfo.java
src/main/resources/application-dev.yml
src/main/resources/application-local.yml
+/.idea/
@@ -14,6 +14,7 @@
     <description></description>
     <properties>
         <java.version>1.8</java.version>
+<!--        <pagehelper.version>5.2.0</pagehelper.version>-->
     </properties>
     <repositories>
@@ -60,6 +61,12 @@
             <version>1.2.73</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
+<!--            <version>1.2.10</version>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+package top.panll.assist.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 top.panll.assist.service.VideoFileService;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@Configuration
+@EnableScheduling
+public class TaskConfig {
+
+    private final static Logger logger = LoggerFactory.getLogger(TaskConfig.class);
+
+    @Autowired
+    private VideoFileService videoFileService;
+
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    private void configureTasks() {
+        logger.info("录像过期自检任务执行");
+        List<File> appList = videoFileService.getAppList();
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, - 7);
+        Date monday = calendar.getTime();
+        if (appList != null && appList.size() > 0) {
+            for (File appFile : appList) {
+                List<File> streamList = videoFileService.getStreamList(appFile.getName());
+                if (streamList != null && streamList.size() > 0) {
+                    for (File streamFile : streamList) {
+                        File[] recordDateFileList = streamFile.listFiles();
+                        if (recordDateFileList != null && recordDateFileList.length > 0) {
+                            for (File recordDateFile : recordDateFileList) {
+                                try {
+                                    Date fileDaye = simpleDateFormat.parse(recordDateFile.getName());
+                                    if (fileDaye.before(monday)){
+                                        logger.debug("移除文件[{}]", recordDateFile.getAbsolutePath());
+                                        recordDateFile.delete();
+                                    }
+                                } catch (ParseException e) {
+                                    logger.error("无法格式化[{}]为日期, 直接移除", recordDateFile.getName());
+                                    recordDateFile.delete();
+                                }
+                            }
+                        }
+                        if (streamFile.listFiles().length == 0) {
+                            streamFile.delete();
+                        }
+                    }
+                }
+                if (appFile.listFiles().length == 0) {
+                    appFile.delete();
+                }
+            }
+        }
+    }
+}
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import top.panll.assist.controller.bean.WVPResult;
 import top.panll.assist.service.VideoFileService;
+import top.panll.assist.utils.PageInfo;
 import java.io.File;
 import java.text.ParseException;
@@ -13,6 +14,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 @CrossOrigin
 @RestController
@@ -26,14 +28,35 @@ public class RecordController {
     private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    /**
+     * 获取app文件夹列表
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ResponseBody
+    public WVPResult<PageInfo<Map<String, String>>> getList(@RequestParam int page,
+                                                  @RequestParam int count){
+        WVPResult<PageInfo<Map<String, String>>> result = new WVPResult<>();
+        List<Map<String, String>> appList = videoFileService.getList();
+        result.setCode(0);
+        result.setMsg("success");
+
+        PageInfo<Map<String, String>> stringPageInfo = new PageInfo<>(appList);
+        stringPageInfo.startPage(page, count);
+        result.setData(stringPageInfo);
+        return result;
+    }
+
     /**
      * 获取app文件夹列表
      * @return
      */
     @GetMapping(value = "/app/list")
     @ResponseBody
-    public WVPResult<List<String>> getAppList(){
-        WVPResult<List<String>> result = new WVPResult<>();
+    public WVPResult<PageInfo<String>> getAppList(@RequestParam int page,
+                                                  @RequestParam int count){
+        WVPResult<PageInfo<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         List<File> appList = videoFileService.getAppList();
         for (File file : appList) {
@@ -41,7 +64,10 @@ public class RecordController {
         }
         result.setCode(0);
         result.setMsg("success");
-        result.setData(resultData);
+
+        PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
+        stringPageInfo.startPage(page, count);
+        result.setData(stringPageInfo);
         return result;
     }
@@ -51,8 +77,10 @@ public class RecordController {
      */
     @GetMapping(value = "/stream/list")
     @ResponseBody
-    public WVPResult<List<String>> getStreamList(@RequestParam String app ){
-        WVPResult<List<String>> result = new WVPResult<>();
+    public WVPResult<PageInfo<String>> getStreamList(@RequestParam int page,
+                                                     @RequestParam int count,
+                                                     @RequestParam String app ){
+        WVPResult<PageInfo<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         if (app == null) {
             result.setCode(400);
@@ -65,7 +93,43 @@ public class RecordController {
         }
         result.setCode(0);
         result.setMsg("success");
-        result.setData(resultData);
+        PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
+        stringPageInfo.startPage(page, count);
+        result.setData(stringPageInfo);
+        return result;
+    }
+
+    /**
+     * 获取日期文件夹列表
+     * @return
+     */
+    @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<>();
+        List<String> resultData = new ArrayList<>();
+        if (app == null) {
+            result.setCode(400);
+            result.setMsg("app不能为空");
+            return result;
+        };
+        if (stream == null) {
+            result.setCode(400);
+            result.setMsg("stream不能为空");
+            return result;
+        }
+        List<File> dateList = videoFileService.getDateList(app, stream);
+        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);
         return result;
     }
@@ -75,13 +139,15 @@ public class RecordController {
      */
     @GetMapping(value = "/file/list")
     @ResponseBody
-    public WVPResult<List<String>> getRecordList(@RequestParam String app,
-                                      @RequestParam String stream,
-                                      @RequestParam String startTime,
-                                      @RequestParam String endTime
+    public WVPResult<PageInfo<String>> getRecordList(@RequestParam int page,
+                                                     @RequestParam int count,
+                                                     @RequestParam String app,
+                                                     @RequestParam String stream,
+                                                     @RequestParam String startTime,
+                                                     @RequestParam String endTime
     ){
-        WVPResult<List<String>> result = new WVPResult<>();
+        WVPResult<PageInfo<String>> result = new WVPResult<>();
         // TODO 暂时开始时间与结束时间为必传， 后续可不传或只传其一
         List<String> recordList = new ArrayList<>();
         try {
@@ -102,7 +168,9 @@ public class RecordController {
             }
             result.setCode(0);
             result.setMsg("success");
-            result.setData(recordList);
+            PageInfo<String> stringPageInfo = new PageInfo<>(recordList);
+            stringPageInfo.startPage(page, count);
+            result.setData(stringPageInfo);
         } catch (ParseException e) {
             logger.error("错误的开始时间[{}]或结束时间[{}]", startTime, endTime);
             result.setCode(400);
@@ -9,6 +9,9 @@ public class UserSettings {
     @Value("${userSettings.record}")
     private String record;
+    @Value("${userSettings.recordDay}")
+    private int recordDay;
+
     @Value("${userSettings.ffmpeg}")
     private String ffmpeg;
@@ -38,4 +41,12 @@ public class UserSettings {
     public void setFfprobe(String ffprobe) {
         this.ffprobe = ffprobe;
     }
+
+    public int getRecordDay() {
+        return recordDay;
+    }
+
+    public void setRecordDay(int recordDay) {
+        this.recordDay = recordDay;
+    }
 }
 package top.panll.assist.service;
+import com.alibaba.fastjson.JSON;
 import net.bramp.ffmpeg.FFprobe;
 import net.bramp.ffmpeg.probe.FFmpegProbeResult;
 import net.bramp.ffmpeg.progress.Progress;
@@ -8,7 +9,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 import top.panll.assist.config.RedisUtil;
@@ -40,8 +40,10 @@ public class VideoFileService {
     private ThreadPoolExecutor processThreadPool;
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-    @Bean("iniThreadPool")
+
+    @Bean("threadPoolExecutor")
     private ThreadPoolExecutor iniThreadPool() {
         int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;
@@ -57,7 +59,9 @@ public class VideoFileService {
         File recordFile = new File(userSettings.getRecord());
         if (recordFile != null) {
             File[] files = recordFile.listFiles();
-            return Arrays.asList(files);
+            List<File> result = Arrays.asList(files);
+            Collections.sort(result);
+            return result;
         }else {
             return null;
         }
@@ -67,7 +71,9 @@ public class VideoFileService {
         File appFile = new File(userSettings.getRecord() + File.separator + app);
         if (appFile != null) {
             File[] files = appFile.listFiles();
-            return Arrays.asList(files);
+            List<File> result = Arrays.asList(files);
+            Collections.sort(result);
+            return result;
         }else {
             return null;
         }
@@ -107,6 +113,36 @@ public class VideoFileService {
         }
     }
+    public List<Map<String, String>> getList() {
+
+        List<Map<String, String>> result = new ArrayList<>();
+
+        List<File> appList = getAppList();
+        if (appList != null && appList.size() > 0) {
+            for (File appFile : appList) {
+                List<File> streamList = getStreamList(appFile.getName());
+                if (streamList != null && streamList.size() > 0) {
+                    for (File streamFile : streamList) {
+                        Map<String, String> data = new HashMap<>();
+                        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())));
+                        result.add(data);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * 获取制定推流的指定时间段内的推流
      * @param app
@@ -212,14 +248,37 @@ public class VideoFileService {
                     data.put("percentage", "1");
                     data.put("recordFile", result);
                     redisUtil.set(app + "_" + stream + "_" + temp, data, 3*60*60);
-                    stringRedisTemplate.convertAndSend("topic_mergeorcut_end",  data);
+                    stringRedisTemplate.convertAndSend("topic_mergeorcut_end", JSON.toJSONString(data));
                 }else {
                     data.put("percentage", percentage + "");
                     redisUtil.set(app + "_" + stream + "_" + temp, data, 3*60*60);
-                    stringRedisTemplate.convertAndSend("topic_mergeorcut_continue",  data);
+                    stringRedisTemplate.convertAndSend("topic_mergeorcut_continue",  JSON.toJSONString(data));
                 }
             });
         });
         return temp;
     }
+
+
+    public List<File> getDateList(String app, String stream) {
+        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();
+        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()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            return sortResult;
+        });
+        return dateFileList;
+    }
 }
+package top.panll.assist.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PageInfo<T> {
+    //当前页
+    private int pageNum;
+    //每页的数量
+    private int pageSize;
+    //当前页的数量
+    private int size;
+    //总页数
+    private int pages;
+    //总数
+    private int total;
+
+    private List<T> resultData;
+
+    private List<T> list;
+
+    public PageInfo(List<T> resultData) {
+        this.resultData = resultData;
+    }
+
+    public void startPage(int page, int count) {
+        if (page <= 0) page = 1;
+        this.pageNum = page;
+        this.pageSize = count;
+        this.total = resultData.size();
+
+        this.pages = total%count == 0 ? total/count : total/count + 1;
+        int fromIndx = (page - 1) * count;
+        if ( fromIndx > this.total - 1) {
+            this.list = new ArrayList<>();
+            this.size = 0;
+            return;
+        }
+
+        int toIndx = page * count;
+        if (toIndx > this.total) {
+            toIndx = this.total;
+        }
+        this.list = this.resultData.subList(fromIndx, toIndx);
+        this.size = this.list.size();
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+    public void setPages(int pages) {
+        this.pages = pages;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+}
@@ -30,11 +30,14 @@ server:
 userSettings:
     # [必选 ] zlm配置的录像路径
     record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
+    # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
+    recordDay: 7
     # [必选 ] ffmpeg路径
     ffmpeg: /usr/bin/ffmpeg
     # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
     ffprobe: /usr/bin/ffprobe
+
 # [可选] 日志配置, 一般不需要改
 logging:
     file:
@@ -30,6 +30,8 @@ server:
 userSettings:
     # [必选 ] zlm配置的录像路径
     record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
+    # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
+    recordDay: 7
     # [必选 ] ffmpeg路径
     ffmpeg: /usr/bin/ffmpeg
     # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息