Browse Source

Merge remote-tracking branch 'origin/test' into test

zhouzeyu@c-top.com.cn 3 years ago
parent
commit
1168d679a2

+ 4 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -51,8 +51,6 @@ import java.util.Map;
 public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements IFileInfoService {
     @Value("${jeecg.path.image-upload}")
     private String imageUploadPath;
-    @Value("${jeecg.path.video-upload}")
-    private String videoUploadPath;
     @Resource
     FileInfoMapper fileInfoMapper;
     @Resource
@@ -74,23 +72,23 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
             CtopOauthToken token = ctopOauthTokenService.getOauthTokenByAccountId(accountId);
             JSONObject jsonObject = videoUpload(token, videoUrl,materialName);
             if (Check.isNull(jsonObject)) {
-                log.info("头条上传素材返回结果为空,返回信息:{},accountId:{}", jsonObject, accountId);
+                log.info("头条视频素材推送信息==>返回结果为空,返回信息:{},accountId:{}", jsonObject, accountId);
                 String message = messageTemplate.getMaterialSyncTemplate(project.getProjectName(), accountId, userAllocation.getAuthName(), materialName, "头条上传素材返回结果为空");
                 sendMessageService.sendMessage(userId, message);
                 return ;
             }
             Integer code = jsonObject.getInteger("code");
             if (code == 0) {
-                log.info("头条上传素材成功,返回信息:{},accountId:{}", jsonObject, accountId);
+                log.info("头条视频素材推送信息==>上传素材成功,返回信息:{},accountId:{}", jsonObject, accountId);
                 String message = messageTemplate.getMaterialSyncSucessTemplate(project.getProjectName(), accountId, userAllocation.getAuthName(), materialName, jsonObject.getString("message"));
                 sendMessageService.sendMessage(userId, message);
                 return ;
             }
-            log.error("头条上传素材失败,返回信息:{},accountId:{}", jsonObject, accountId);
+            log.error("头条视频素材推送信息==>上传素材失败,返回信息:{},accountId:{}", jsonObject, accountId);
             String message = messageTemplate.getMaterialSyncTemplate(project.getProjectName(), accountId, userAllocation.getAuthName(), materialName, jsonObject.getString("message"));
             sendMessageService.sendMessage(userId, message);
         } catch (Exception e) {
-            log.error("头条上传视频文件失败,accountId:{}", accountId);
+            log.error("头条视频素材推送信息==>上传视频文件异常,accountId:{}", accountId);
             e.printStackTrace();
             String message = messageTemplate.getMaterialSyncTemplate(project.getProjectName(), accountId, userAllocation.getAuthName(), materialName, "头条api上传素材返回结果异常:系统异常,联系研发人员");
             sendMessageService.sendMessage(userId, message);

+ 5 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java

@@ -235,11 +235,11 @@ public class KuaiShouDimensionStrategyController {
             if (Check.isNull(appInfoArray)) {
                 throw new Exception("策略配置应用不能为空");
             }
-
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-
-            kuaiShouDimensionStrategyService.insertStrategy(sysUser.getId(), strategyJson);
+            String userId = strategyJson.getString("userId");
+            if (Check.isNull(userId)) {
+                throw new Exception("userId不能为空");
+            }
+            kuaiShouDimensionStrategyService.insertStrategy(userId, strategyJson);
             result.success("添加成功!");
         } catch (Exception e) {
             log.error(e.getMessage(), e);

+ 11 - 23
jeecg-boot-module-system/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -98,30 +98,18 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                 log.info("头条视频素材推送异常=>id:{};message:{}",materialId,"素材不存在或者未审核通过");
                 continue;
             }
-            try {
-                String url = materialInfo.getUrl();
-                String localUrl = LoadFileUtil.downLoadFromUrl(url, downloadUrl);
-                for (int i = 0; i < accountArray.size(); i++) {
-                    Long accountId = accountArray.getLong(i);
-                    if (Check.isNull(accountId)) {
-                        continue;
-                    }
-                    touTiaoExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                log.info("头条文件多线程上传:{},accountId:{}", Thread.currentThread().getName(), accountId);
-                                if ("VIDEO".equals(materialInfo.getType())) {
-                                    fileInfoService.uploadVideoToBytedance(String.valueOf(accountId), localUrl, userId, materialInfo.getMaterialName());
-                                }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
+
+            String url = materialInfo.getUrl();
+            String localUrl = LoadFileUtil.downLoadFromUrl(url, downloadUrl);
+            for (int i = 0; i < accountArray.size(); i++) {
+                Long accountId = accountArray.getLong(i);
+                if (null == accountId||accountId == 0) {
+                    continue;
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
+                touTiaoExecutorService.submit(()->{
+                    log.info("头条视频素材推送信息==>头条文件多线程上传:{},accountId:{}", Thread.currentThread().getName(), accountId);
+                    fileInfoService.uploadVideoToBytedance(String.valueOf(accountId), localUrl, userId, materialInfo.getMaterialName());
+                });
             }
         }
     }

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

@@ -36,6 +36,7 @@ public class MaterialUploadController {
     @PostMapping(value = "/uploadAccount")
     public Map<String, Object> uploadAccount(@RequestBody JSONObject json) {
         Map<String, Object> returnMap = new HashMap<>();
+        log.info("头条视频素材推送信息=={}",json);
         String mediaId = json.getString("mediaId");
         Boolean shieldBackwardSwitch = json.getBoolean("shieldBackwardSwitch");
         JSONArray materialArray = json.getJSONArray("materialArray");

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

@@ -14,11 +14,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
@@ -212,10 +210,10 @@ public class ProjectMemberController {
 
 
     @GetMapping("/projectList")
-    public Map<String, Object> projectList() {
+    public Map<String, Object> projectList(String userId) {
         Map<String, Object> result = new HashMap<>();
         try {
-            String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
                 List<Project> projects = projectService.list();
@@ -284,24 +282,24 @@ public class ProjectMemberController {
 
     @GetMapping(value = "/participateListV3")
     public Result participateListV3(ProjectMember projectMember,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
+                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                    HttpServletRequest req) {
 
-        Result<IPage<ProjectMember>> result = this.participateListV2(projectMember,pageNo,pageSize,req);
+        Result<IPage<ProjectMember>> result = this.participateListV2(projectMember, pageNo, pageSize, req);
         List<ProjectMember> resultList = new ArrayList<>();
-        if (result.isSuccess()){
+        if (result.isSuccess()) {
             List<ProjectMember> listProject = result.getResult().getRecords();
-            if (!Check.isNull(listProject)){
-                Map<String, List<ProjectMember>> groupByMedia = listProject.stream().filter(p-> (!Check.isNull(p.getMediaId()))).collect(Collectors.groupingBy(ProjectMember::getMediaId));
+            if (!Check.isNull(listProject)) {
+                Map<String, List<ProjectMember>> groupByMedia = listProject.stream().filter(p -> (!Check.isNull(p.getMediaId()))).collect(Collectors.groupingBy(ProjectMember::getMediaId));
                 resultList = groupByMedia.get(projectMember.getMediaId());
-                if (!Check.isNull(resultList)){
+                if (!Check.isNull(resultList)) {
                     resultList.stream().filter(p -> (!Check.isNull(p.getAdvertiserName()))).collect(Collectors.toList());
-                    resultList = resultList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ProjectMember :: getAdvertiserId))), ArrayList::new));
-                    }
+                    resultList = resultList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ProjectMember::getAdvertiserId))), ArrayList::new));
                 }
             }
-        return Result.successMsg("成功。",resultList);
+        }
+        return Result.successMsg("成功。", resultList);
     }
 
 
@@ -512,7 +510,7 @@ public class ProjectMemberController {
      * @return
      */
     @GetMapping("/getProjectAccountByUserId")
-    public Result<List<Map<String, Object>>> getProjectAccountBy(String mediaType,String userId) {
+    public Result<List<Map<String, Object>>> getProjectAccountBy(String mediaType, String userId) {
         Result<List<Map<String, Object>>> resultBody = new Result<>();
         try {
             List<Map<String, Object>> result = projectMemberService.getProjectAccountByUserId(userId, mediaType);