Pārlūkot izejas kodu

修改推荐封面列表展示接口

syh 5 gadi atpakaļ
vecāks
revīzija
cec04bd3af

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialCutFrameController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -49,11 +50,14 @@ public class MaterialCutFrameController {
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
-        Result<IPage<MaterialCutFrame>> result = new Result<IPage<MaterialCutFrame>>();
+        Result<IPage<MaterialCutFrame>> result = new Result<>();
         QueryWrapper<MaterialCutFrame> queryWrapper = QueryGenerator.initQueryWrapper(materialCutFrame, req.getParameterMap());
         queryWrapper.orderByAsc("image_index");
-        Page<MaterialCutFrame> page = new Page<MaterialCutFrame>(pageNo, pageSize);
+        Page<MaterialCutFrame> page = new Page<>(pageNo, pageSize);
+        //TODO 这边代码有bug,先临时紧急处理,后续优化截帧任务
         IPage<MaterialCutFrame> pageList = materialCutFrameService.page(page, queryWrapper);
+        List<MaterialCutFrame> list = materialCutFrameService.getListByVideoSignature(materialCutFrame.getVideoSignature());
+        pageList.setRecords(list);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

+ 0 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/aa.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.performanceappraisal;
-
-public class aa {
-}

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialCutFrameMapper.java

@@ -2,6 +2,9 @@ package cn.com.ctop.common.module.mapper;
 
 import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaterialCutFrameMapper extends BaseMapper<MaterialCutFrame> {
 
+    List<MaterialCutFrame> getListByVideoSignature(@Param(value = "videoSignature") String signature);
 }

+ 22 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialCutFrameMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialCutFrameMapper">
 
-</mapper>
+    <select id="getListByVideoSignature" resultType="cn.com.ctop.common.module.entity.MaterialCutFrame">
+        select a.signature,
+       (select frame.url
+        from ctop_material_cut_frame frame
+        where frame.signature = a.signature
+        order by id desc
+        limit 1) as 'url',
+       (select frame.image_index
+        from ctop_material_cut_frame frame
+        where frame.signature = a.signature
+        order by id desc
+        limit 1) as 'image_index',
+       (select frame.id
+        from ctop_material_cut_frame frame
+        where frame.signature = a.signature
+        order by id desc
+        limit 1) as 'id'
+from (select distinct signature
+      from ctop_material_cut_frame
+      where video_signature = #{videoSignature}) a;
+    </select>
+</mapper>

+ 3 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialCutFrameService.java

@@ -5,6 +5,7 @@ import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * 截屏
@@ -18,4 +19,6 @@ public interface IMaterialCutFrameService extends IService<MaterialCutFrame> {
 
     void loadCutFrame(String jobId, String videoSignature);
 
+    List<MaterialCutFrame> getListByVideoSignature(String signature);
+
 }

+ 8 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialCutFrameServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.List;
 
 
 /**
@@ -50,6 +51,8 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
 
     @Autowired
     private IMaterialCutFrameTaskService cutFrameTaskService;
+    @Autowired
+    private MaterialCutFrameMapper materialCutFrameMapper;
 
     /**
      * 获取素材关键帧
@@ -215,5 +218,10 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
 
     }
 
+    @Override
+    public List<MaterialCutFrame> getListByVideoSignature(String videoSignature) {
+        return materialCutFrameMapper.getListByVideoSignature(videoSignature);
+    }
+
 
 }