Bläddra i källkod

自动投放—— 回显标签,添加字段

zhaoxian 3 år sedan
förälder
incheckning
84efbdee62

+ 4 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/ExternalMaterialCollectionController.java

@@ -216,8 +216,8 @@ public class ExternalMaterialCollectionController {
      * 标签回显
      */
     @GetMapping(value = "/getTagDetail")
-    public Result<Object> getTagDetail(String md5) {
-        return externalMaterialCollectionService.getTagDetail(md5);
+    public Result<Object> getTagDetail(String md5, Integer mediaType) {
+        return externalMaterialCollectionService.getTagDetail(md5, mediaType);
     }
 
 
@@ -376,11 +376,12 @@ public class ExternalMaterialCollectionController {
         }
         return Result.ok("文件导入失败!");
     }
+
     /**
      * 导出excel模板
      */
     @GetMapping("/exportTemplate")
-    public Result<Object> exportTemplate(HttpServletResponse response ) {
+    public Result<Object> exportTemplate(HttpServletResponse response) {
         try {
 
             OutputStream os = response.getOutputStream();

+ 3 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/IExternalMaterialCollectionService.java

@@ -1,18 +1,14 @@
 package org.jeecg.modules.fileupload.service;
 
-import cn.com.ctop.common.module.entity.MaterialTagInfo;
 import cn.com.ctop.common.module.utils.ExternalMaterialCollection;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * 外部素材集信息表
+ *
  * @author jeecg-boot
  * 2022-01-12
  * @version V1.0
@@ -31,11 +27,11 @@ public interface IExternalMaterialCollectionService extends IService<ExternalMat
 
     boolean checkMaterialByMd5(String md5) throws Exception;
 
-    Result<Object> addMoreVideosByExcel(MultipartFile file, String materialSource,String userId,Integer mediaType) throws Exception;
+    Result<Object> addMoreVideosByExcel(MultipartFile file, String materialSource, String userId, Integer mediaType) throws Exception;
 
     Result<Object> getIndustryLabel();
 
     Result<Object> createInternalMaterial();
 
-    Result<Object> getTagDetail(String md5);
+    Result<Object> getTagDetail(String md5, Integer mediaType);
 }

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/ExternalMaterialCollectionServiceImpl.java

@@ -441,8 +441,9 @@ public class ExternalMaterialCollectionServiceImpl extends ServiceImpl<ExternalM
     }
 
     @Override
-    public Result<Object> getTagDetail(String md5) {
+    public Result<Object> getTagDetail(String md5, Integer mediaType) {
         QueryWrapper<ExternalMaterialCollection> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("media_type", mediaType);
         queryWrapper.eq("md5", md5).last("limit 1");
         ExternalMaterialCollection one = this.getOne(queryWrapper);
         if (Check.isNull(one)) {