yumeng 4 rokov pred
rodič
commit
a9848c2cbf

+ 79 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -74,7 +74,6 @@ public class MaterialInfoController {
     private IKuaiShouUploadService uploadService;
 
 
-
     @PostMapping("/correlationUpload")
     public Map<String, Object> insertFile(@RequestBody JSONObject json) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject()
@@ -85,10 +84,10 @@ public class MaterialInfoController {
     }
 
     @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);
-        if(!bool){
+        if (!bool) {
             result.setSuccess(false);
             result.error500("补全截帧url失败");
             return result;
@@ -131,7 +130,6 @@ public class MaterialInfoController {
     }
 
 
-
     @GetMapping("/excellent/list")
     public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
                                                      @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;
+    }
+
+
     /**
      * 添加
      *

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierListController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.SupplierList;
 import cn.com.ctop.common.module.service.ISupplierListService;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierWatermarkController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.SupplierWatermark;
 import cn.com.ctop.common.module.service.ISupplierWatermarkService;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -101,6 +101,7 @@ public class Project {
     private Long maxBid;
 
     //供应商
+    @Dict(dicCode = "supplier_code", dictTable = "ctop_supplier_list", dicText = "supplier_name")
     private String supplierCode;
 
     // 销售

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/enums/MaterialSupplierEnum.java

@@ -27,7 +27,7 @@ public enum MaterialSupplierEnum {
         for (MaterialSupplierEnum material : MaterialSupplierEnum.values()) {
             Integer width = material.getWidth();
             Integer height = material.getHeight();
-            if (widthStr == width && heightStr == height) {
+            if (widthStr.equals(width)  && heightStr.equals(height)) {
                 return material.getTemplateId();
             }
         }

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -140,7 +140,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                         String url = taskDetailResponse.getWorkflowTask().getMediaProcessResultSet()[0].getTranscodeTask().getOutput().getPath();
                         SupplierWatermark supplierWatermark = new SupplierWatermark();
                         supplierWatermark.setVideoSignature(videoSignature);
-                        supplierWatermark.setWatermarkUrl(url);
+                        supplierWatermark.setWatermarkUrl("https://media-1301855440.cos.ap-chongqing.myqcloud.com" + url);
                         supplierWatermarkService.save(supplierWatermark);
                     }
                 }