浏览代码

素材分项目上传

yumeng 5 年之前
父节点
当前提交
f2be074579

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -116,8 +116,15 @@ public class ProjectMemberController {
             List<ProjectMember> projectMemberList = new ArrayList<>();
             if (!Check.isNull(projectMembers)) {
                 for (ProjectMember projectMember : projectMembers) {
+                    if (Check.isNull(projectMember)) {
+                        continue;
+                    }
                     Project project = projectService.getById(projectMember.getProjectId());
                     if (!Check.isNull(project)) {
+                        String mediaId = project.getMediaId();
+                        if ("1".equals(mediaId)) {
+                            continue;
+                        }
                         projectMember.setResponsibleName(project.getResponsibleName());
                         projectMember.setDesignResponsibleName(project.getDesignResponsibleName());
                         projectMember.setAdvertiserName(project.getAdvertiserName());

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java

@@ -28,8 +28,8 @@ public class FileController {
     private IMaterialInfoService materialInfoService;
 
     @RequestMapping("file/check")
-    public Map<String, Object> chenckFile(String code) {
-        return materialInfoService.checkMaterialInfo(code);
+    public Map<String, Object> chenckFile(String code, Long projectId) {
+        return materialInfoService.checkMaterialInfo(code, projectId);
     }
 
     @PostMapping("file/insert")

+ 3 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -14,9 +14,11 @@ import java.util.Map;
  * @date 2019-10-11
  */
 public interface IMaterialInfoService extends IService<MaterialInfo> {
+    MaterialInfo getMaterialInfoByCodeAndProjectId(String code, Long projectId);
+
     MaterialInfo getMaterialInfoByCode(String code);
 
-    Map<String, Object> checkMaterialInfo(String code);
+    Map<String, Object> checkMaterialInfo(String code, Long projectId);
 
     Map<String, Object> insert(JSONObject jsonObject);
 

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

@@ -70,6 +70,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         FileInfo fileInfo = (FileInfo) resultObject.get("file");
         ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         resultMap.put("videoId", fileInfo.getFileId());
+        log.info("快手素材同步后台成功,accountId:{}", accountId);
         return resultMap;
     }
 
@@ -348,6 +349,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         List<FileInfo> getFileInfo = getFileInfoByMd5(md5Hex);
         //表示已经上传过服务器
         if (null != getFileInfo && getFileInfo.size() > 0) {
+            log.info("头条文件已上传,accountId:{}", token.getAccountId());
             result.put("code", 0);
             result.put("file", getFileInfo.get(0));
             result.put("message", "视频上传成功");
@@ -362,7 +364,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         //文件上传
         JSONObject bytedanceObject = videoUpload(token, advertiserId, videoPath);
         if (null == bytedanceObject) {
-            log.info("今日头条视频上传失败");
+            log.info("今日头条视频上传失败,accountId:{}", token.getAccountId());
             result.put("code", -1);
             result.put("message", "今日头条视频上传失败");
             return result;

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

@@ -69,16 +69,27 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     }
 
     @Override
+    public MaterialInfo getMaterialInfoByCodeAndProjectId(String code, Long projectId) {
+        QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", code);
+        queryWrapper.eq("project_id", projectId);
+        queryWrapper.orderByDesc("id").last("limit 1");
+        return this.getOne(queryWrapper);
+    }
+
+
+    @Override
     public MaterialInfo getMaterialInfoByCode(String code) {
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", code).orderByDesc("id").last("limit 1");
+        queryWrapper.eq("code", code);
+        queryWrapper.orderByDesc("id").last("limit 1");
         return this.getOne(queryWrapper);
     }
 
     @Override
-    public Map<String, Object> checkMaterialInfo(String code) {
+    public Map<String, Object> checkMaterialInfo(String code, Long projectId) {
         Map<String, Object> result = new HashMap<>();
-        MaterialInfo info = this.getMaterialInfoByCode(code);
+        MaterialInfo info = this.getMaterialInfoByCodeAndProjectId(code, projectId);
         if (null != info) {
             //文件已存在
             ResultMapUtils.setResultMap(result, StatusCode.FILE_HAS_UPLOAD.getCode());
@@ -166,15 +177,16 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
 
     private void insertMaterialInfo(String url, String type, JSONObject jsonObject) {
         MaterialInfo info = new MaterialInfo();
-        info.setId(jsonObject.getString("code"));
-        info.setCode(jsonObject.getString("code"));
-
+        Long projectId = jsonObject.getLong("projectId");
+        String code = jsonObject.getString("code");
+        info.setId(code + projectId);
+        info.setCode(code);
         if (!Check.isNull(jsonObject.getString("watermarkUrl"))) {
             info.setWatermarkUrl(jsonObject.getString("watermarkUrl"));
         }
         info.setUrl(url);
         info.setUserId(jsonObject.getString("userId"));
-        info.setProjectId(jsonObject.getLong("projectId"));
+        info.setProjectId(projectId);
         info.setWatermarkCode(jsonObject.getString("watermarkCode"));
         info.setStatus(0);
         info.setMaterialName(jsonObject.getString("materialName"));
@@ -184,10 +196,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         info.setUpdateTime(new Date());
         info.setType(type);
         this.save(info);
-
         Map<String, Object> deleteMap = new HashMap<>();
         deleteMap.put("material_id", info.getId());
-
         JSONObject ascription = jsonObject.getJSONObject("ascription");
         if (!Check.isNull(ascription)) {
             MaterialAscription materialAscription = new MaterialAscription();

+ 2 - 4
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -91,7 +91,6 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                 continue;
             }
             try {
-
                 for (int i = 0; i < accountArray.size(); i++) {
                     Long accountId = accountArray.getLong(i);
                     QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
@@ -107,7 +106,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                         @Override
                         public void run() {
                             try {
-                                System.err.println(Thread.currentThread().getName());
+                                log.info("头条文件多线程上传:{},accountId:{}", Thread.currentThread().getName(), accountId);
                                 if ("VIDEO".equals(materialInfo.getType())) {
                                     fileInfoService.uploadVideoToBytedance(String.valueOf(accountId), materialInfo.getUrl());
 
@@ -115,7 +114,6 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                                     fileInfoService.uploadImageToBytedance(String.valueOf(accountId), materialInfo.getUrl());
                                 }
 
-
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -169,7 +167,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                         @Override
                         public void run() {
                             try {
-                                System.err.println(Thread.currentThread().getName());
+                                log.info("快手文件多线程上传:{},accountId:{}", Thread.currentThread().getName(), accountId);
                                 String url = "";
                                 if ("VIDEO".equals(materialInfo.getType())) {
                                     url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_UPLOAD;