添加视频和图片关联

src/main/java/com/iden/bms/controller/TraceController.java

@@ -93,16 +93,18 @@ public class TraceController {
     @GetMapping("/getCameraVideoList")
     @ApiOperation(value = "获取摄像机视频列表")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像机ID"),
+            @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像机ID",required = true),
+            @ApiImplicitParam(paramType = "query", name = "uid", value = "唯一生物学标识"),
             @ApiImplicitParam(paramType = "query", name = "beginTime", value = "开始时间(yyyy-MM-dd HH:mm:ss"),
             @ApiImplicitParam(paramType = "query", name = "endTime", value = "结束时间(yyyy-MM-dd HH:mm:ss)")
 
     })
     public Result<List<CameraVideoVO>> getCameraVideoList(HttpServletRequest request, @RequestHeader("token") String token,
-                                                 @RequestParam(value = "cameraId", required = false) Long cameraId,
+                                                 @RequestParam(value = "cameraId", required = true) Long cameraId,
+                                                          @RequestParam(value = "uid", required = false) Long uid,
                                                  @RequestParam(value = "beginTime", required = false) String beginTime,
                                                  @RequestParam(value = "endTime", required = false) String endTime){
-        List<CameraVideoVO> datas = this.traceService.getCameraVideoList(cameraId,beginTime,endTime);
+        List<CameraVideoVO> datas = this.traceService.getCameraVideoList(cameraId,uid,beginTime,endTime);
         return  Result.success("查询成功！",datas);
     }
 

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

@@ -176,7 +176,6 @@ public class TraceService {
                long hitIndex = faceRetrieveResultVO.getIndex();
                IdenFaceImage idenFaceImage = idenFaceImageService.getById(hitIndex);
                if(idenFaceImage != null){
-
                   for(IdenFaceImage idenFaceImage1 : idenFaceImageList){
                       if(idenFaceImage.getUid().equals(idenFaceImage1.getUid())) {
                           TraceVO vo = new TraceVO();
@@ -210,7 +209,7 @@ public class TraceService {
     }
 
 
-    public  List<CameraVideoVO> getCameraVideoList(Long cameraId, String beginTime,String endTime) {
+    public  List<CameraVideoVO> getCameraVideoList(Long cameraId, Long uid, String beginTime,String endTime) {
         Date dateBegin = null;
         if(StringUtils.isNotEmpty(beginTime)){
             dateBegin  = DateUtils.strToDate(beginTime,"yyyy-MM-dd HH:mm:ss");
@@ -247,6 +246,20 @@ public class TraceService {
                         }
                     }
                 }
+                QueryWrapper<IdenFaceImage> idenFaceImageQueryWrapper = new QueryWrapper<>();
+                idenFaceImageQueryWrapper.lambda().eq(IdenFaceImage::getVideoId,vo.getId())
+                        .eq(uid != null,IdenFaceImage::getUid,uid)
+                        .orderByAsc(IdenFaceImage::getPhotographTime);
+                List<IdenFaceImage> idenFaceImageList = this.idenFaceImageService.list(idenFaceImageQueryWrapper);
+                if(CollUtil.isNotEmpty(idenFaceImageList)){
+                    List<FaceImageVO> faceImageVOS = new ArrayList<>();
+                    idenFaceImageList.forEach(item1 -> {
+                        FaceImageVO faceImageVO = new FaceImageVO();
+                        BeanUtil.copyProperties(item1,faceImageVO);
+                        faceImageVOS.add(faceImageVO);
+                    });
+                    vo.setFaceImageVOList(faceImageVOS);
+                }
                 vos.add(vo);
             });
 

src/main/java/com/iden/common/entity/IdenFaceImage.java

@@ -57,6 +57,9 @@ public class IdenFaceImage implements Serializable {
     @TableField("CAMERA_ID")
     private Long cameraId;
 
+    @ApiModelProperty("所属视频ID")
+    @TableField("VIDEO_ID")
+    private Long videoId;
 
     @ApiModelProperty("小区ID")
     @TableField("COMMUNITY_ID")

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

@@ -96,7 +96,7 @@ public class VideoTool {
      * @param video_path    视频路径
      * @return
      */
-    public static int getVideoTime( String ffmpeg_path,String video_path) {
+    private static int getVideoTime( String ffmpeg_path,String video_path) {
         List<String> commands = new java.util.ArrayList<String>();
         commands.add(ffmpeg_path);
         commands.add("-i");

src/main/java/com/iden/common/vo/CameraVideoVO.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 摄像机视频表(IdenCameraVideo)实体类
@@ -74,5 +75,7 @@ public class CameraVideoVO implements Serializable {
     @ApiModelProperty("modifyTime")
     private Date modifyTime;
 
+    @ApiModelProperty("所含人脸图像列表")
+    private List<FaceImageVO> faceImageVOList;
 
 }

src/main/java/com/iden/common/vo/FaceImageVO.java

@@ -37,6 +37,9 @@ public class FaceImageVO implements Serializable {
     private String image;
 
 
+    @ApiModelProperty("所属视频ID")
+    private Long videoId;
+
     @ApiModelProperty("摄像头ID")
     private Long cameraId;