添加视频和图片关联

src/main/java/com/iden/bms/service/FaceIdenService.java

@@ -224,6 +224,10 @@ public class FaceIdenService {
                                 String photographTime = imgFileName.substring(0, imgFileName.indexOf("_"));
                                 idenFaceImage.setPhotographTime(DateUtils.strToDate(photographTime, "yyyyMMddHHmmss"));
                                 idenFaceImage.setDataDate(photographTime.substring(0, 8));
+                                if(imgFileName.contains("@")){
+                                    String videoId = imgFileName.substring(imgFileName.lastIndexOf("@") + 1, imgFileName.lastIndexOf("."));
+                                    idenFaceImage.setVideoId(Long.valueOf(videoId));
+                                }
 
                                 File finalDir = new File(imgFile.getParentFile().getAbsolutePath().replace("origin", "final"));
                                 if (!finalDir.exists()) {

src/main/java/com/iden/bms/service/VideoService.java

@@ -3,6 +3,8 @@ package com.iden.bms.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iden.common.cache.RedisKeyConstant;
+import com.iden.common.cache.RedisUtil;
 import com.iden.common.entity.*;
 import com.iden.common.service.*;
 import com.iden.common.util.DateUtils;
@@ -40,6 +42,8 @@ public class VideoService {
     @Value("${ffmpeg.path:#{null}}")
     private String ffmpegPath;
 
+    @Resource
+    private RedisUtil redisUtil;
 
     private static final Logger logger = LogManager.getLogger(VideoService.class);
 
@@ -89,8 +93,10 @@ public class VideoService {
                                 }
                                 logger.info("FaceIdenService.handleCameraVideo ...originImageDir == " + originImageDir.getAbsolutePath());
 
+                                Long videoId = redisUtil.generate(RedisKeyConstant.VIDEO_KEY);
+
                                 //先把分解图片放入临时目录,临时目录下的文件重命名后移到原始目录等待图像识别
-                                Long duration = VideoTool.fetchAllPic(ffmpegPath, videoFile.getAbsolutePath(),finalDirTmp.getAbsolutePath(),originImageDir.getAbsolutePath(), shootEndTime);
+                                Long duration = VideoTool.fetchAllPic(videoId,ffmpegPath, videoFile.getAbsolutePath(),finalDirTmp.getAbsolutePath(),originImageDir.getAbsolutePath(), shootEndTime);
 
                                 File finalVideoDir = new File(videoFile.getParentFile().getAbsolutePath().replace("origin","final"));
                                 if(!finalVideoDir.exists()){
@@ -104,6 +110,7 @@ public class VideoService {
 
                                 //保存数据库
                                 IdenCameraVideo idenCameraVideo = new IdenCameraVideo();
+                                idenCameraVideo.setId(videoId);
                                 idenCameraVideo.setVideoUrl(fileUrl + "camera/video/" + cameraCode + "/" + videoFileName);
                                 idenCameraVideo.setCameraId(idenCamera.getId());
                                 idenCameraVideo.setCommunityId(idenCamera.getCommunityId());

src/main/java/com/iden/common/cache/RedisKeyConstant.java

@@ -32,6 +32,6 @@ public class RedisKeyConstant {
     public static final String PERSON_UPDATE = "PERSON:UPDATE";
 
     public static final String UID_KEY = "UID_KEY";
-
+    public static final String VIDEO_KEY = "VIDEO_KEY";
 
 }

src/main/java/com/iden/common/videotool/VideoTool.java

@@ -24,7 +24,7 @@ public class VideoTool {
      * @return
      * @throws Exception
      */
-    public static Long fetchAllPic(String ffmpegPath,String videoFilePath, String saveTmpDir,String targetDir, Date shootEndTime) throws Exception {
+    public static Long fetchAllPic(Long videoId, String ffmpegPath,String videoFilePath, String saveTmpDir,String targetDir, Date shootEndTime) throws Exception {
         Long endTime = shootEndTime.getTime() ;
 
         //ms
@@ -40,12 +40,12 @@ public class VideoTool {
         Process proc = Runtime.getRuntime().exec(cmd);
         proc.waitFor();
         log.info("fetchAllPic end");
-        moveFile(beginTime,saveTmpDir,targetDir,framRate);
+        moveFile(videoId,beginTime,saveTmpDir,targetDir,framRate);
 
         return duration;
     }
 
-    private static void moveFile(Long beginTime,String saveTmpDir,String targetDir, int framRate){
+    private static void moveFile(Long videoId, Long beginTime,String saveTmpDir,String targetDir, int framRate){
         log.info("moveFile start");
         File saveTmpDirFile = new File(saveTmpDir);
         File[] tmpFiles = FileUtil.sortByName(saveTmpDirFile.listFiles());
@@ -57,10 +57,10 @@ public class VideoTool {
                 String tmpFileName =  tmpFile.getName();
                 String tmpFileExt = tmpFileName.substring(tmpFileName.lastIndexOf(".") + 1);
                 long time = beginTime + (i * (1000/framRate));
-                String tmpFileNameNew = DateUtils.formatToDateStr(new Date(time),"yyyyMMddHHmmss") + "_" + UUID.randomUUID().toString() + "." + tmpFileExt;
-                File tmpNewFile = new File(targetDir,tmpFileNameNew);
-                log.info("tmpNewFile==" + tmpNewFile.getAbsolutePath());
-                tmpFile.renameTo(tmpNewFile);
+                String targetFileNam = DateUtils.formatToDateStr(new Date(time),"yyyyMMddHHmmss") + "_" + UUID.randomUUID().toString() + "@" + videoId + "." + tmpFileExt;
+                File targetFile = new File(targetDir,targetFileNam);
+                log.info("tmpNewFile ==" + targetFile.getAbsolutePath());
+                tmpFile.renameTo(targetFile);
             }
 
         }