|
@@ -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;
|