|
@@ -74,7 +74,6 @@ public class MaterialInfoController {
|
|
private IKuaiShouUploadService uploadService;
|
|
private IKuaiShouUploadService uploadService;
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@PostMapping("/correlationUpload")
|
|
@PostMapping("/correlationUpload")
|
|
public Map<String, Object> insertFile(@RequestBody JSONObject json) {
|
|
public Map<String, Object> insertFile(@RequestBody JSONObject json) {
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject()
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject()
|
|
@@ -85,10 +84,10 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/supplementFrameUrl")
|
|
@PostMapping("/supplementFrameUrl")
|
|
- public Result<Object> supplementFrameUrl(@RequestParam String videoMD5){
|
|
|
|
- Result<Object> result=new Result<>();
|
|
|
|
|
|
+ public Result<Object> supplementFrameUrl(@RequestParam String videoMD5) {
|
|
|
|
+ Result<Object> result = new Result<>();
|
|
boolean bool = materialCutFrameService.updateTencentCutFrame(videoMD5);
|
|
boolean bool = materialCutFrameService.updateTencentCutFrame(videoMD5);
|
|
- if(!bool){
|
|
|
|
|
|
+ if (!bool) {
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.error500("补全截帧url失败");
|
|
result.error500("补全截帧url失败");
|
|
return result;
|
|
return result;
|
|
@@ -131,7 +130,6 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@GetMapping("/excellent/list")
|
|
@GetMapping("/excellent/list")
|
|
public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
|
|
public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@@ -277,6 +275,82 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ @AutoLog(value = "素材信息-分页列表查询")
|
|
|
|
+ @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
|
|
|
|
+ @GetMapping(value = "/supplierList")
|
|
|
|
+ public Result<IPage<MaterialInfo>> supplierList(MaterialInfo materialInfo,
|
|
|
|
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
+ HttpServletRequest req) {
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ Result<IPage<MaterialInfo>> result = new Result<>();
|
|
|
|
+ String materialName = materialInfo.getMaterialName();
|
|
|
|
+ materialInfo.setMaterialName(null);
|
|
|
|
+ QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ Object createTime = materialInfo.getCreateTime();
|
|
|
|
+ materialInfo.setCreateTime(null);
|
|
|
|
+ if (!Check.isNull(materialInfo.getUserId())) {
|
|
|
|
+ String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
|
|
|
|
+ if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
|
|
|
|
+ materialInfo.setUserId(null);
|
|
|
|
+ } else {
|
|
|
|
+ result.setResult(null);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
|
+
|
|
|
|
+ if (!Check.isNull(createTime)) {
|
|
|
|
+ try {
|
|
|
|
+ String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
|
|
+ queryWrapper.ge("create_time", map.get("start"));
|
|
|
|
+ queryWrapper.lt("create_time", map.get("end"));
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ result.setResult(null);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ if (!Check.isNull(materialName)) {
|
|
|
|
+ queryWrapper.like("material_name", materialName);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
|
|
|
|
+ IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
|
|
|
|
+ List<MaterialInfo> materialInfoList = pageList.getRecords();
|
|
|
|
+ if (materialInfoList.size() != 0) {
|
|
|
|
+ for (MaterialInfo material : materialInfoList) {
|
|
|
|
+ Project project = projectService.getById(material.getProjectId());
|
|
|
|
+ if (!Check.isNull(project)) {
|
|
|
|
+ material.setMediaId(project.getMediaId());
|
|
|
|
+ material.setProjectName(project.getProjectName());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ QueryWrapper<MaterialImageInfo> imageInfoQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ imageInfoQueryWrapper.eq("video_id", material.getCode());
|
|
|
|
+ imageInfoQueryWrapper.eq("status", 0);
|
|
|
|
+ List<MaterialImageInfo> imageInfoList = iMaterialImageInfoService.list(imageInfoQueryWrapper);
|
|
|
|
+ if (Check.isNull(imageInfoList)) {
|
|
|
|
+ material.setWhetherUnaudited(false);
|
|
|
|
+ } else {
|
|
|
|
+ material.setWhetherUnaudited(true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ result.setResult(pageList);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 添加
|
|
* 添加
|
|
*
|
|
*
|