Ver código fonte

项目自动化调试

zhaoxian 4 anos atrás
pai
commit
8563b59333

+ 6 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouProjectCreateCreativeController.java

@@ -2,12 +2,9 @@ package cn.com.ctop.kuaishou.modules.ai.controller;
 
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAdvertiserStrategy;
 import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouProjectStrategy;
-import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAdvertiserStrategyService;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouProjectCreateCreativeService;
 import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouProjectStrategyService;
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -16,7 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -29,17 +25,12 @@ public class AiKuaishouProjectCreateCreativeController {
     @Autowired
     private IAiKuaishouProjectCreateCreativeService projectCreateCreativeService;
     @Autowired
-    private IAiKuaishouAdvertiserStrategyService strategyService;
-    @Autowired
     private IKuaishouProjectStrategyService kuaishouProjectStrategyService;
     @Autowired
     private IUserAllocationService userAllocationService;
 
 
-    static ExecutorService executorService = Executors.newFixedThreadPool(2);
-    static ExecutorService kuaishouCustomCreativeSupplementExecutorService = Executors.newFixedThreadPool(2);
-    static ExecutorService kuaishouProgramCreativeAutoService = Executors.newFixedThreadPool(2);
-    static ExecutorService kuaishouProgramTopCreativeAutoService = Executors.newFixedThreadPool(2);
+    static ExecutorService executorService = Executors.newFixedThreadPool(5);
 
     /**
      * 项目自动创建
@@ -48,10 +39,10 @@ public class AiKuaishouProjectCreateCreativeController {
      * @return
      */
     @GetMapping(value = "/projectAutomaticCreates")
-    public Result<Object> projectAutomaticCreates(String id) {
+    public Result<Object> projectAutomaticCreates(String id, Integer operationType) {
         try {
-            if (Check.isNull(id)) {
-                throw new Exception("主键id不能为空");
+            if (Check.isNull(id) || Check.isNull(operationType)) {
+                throw new Exception("参数为空");
             }
             KuaishouProjectStrategy strategy = kuaishouProjectStrategyService.getById(id);
             if (Check.isNull(strategy)) {
@@ -66,7 +57,8 @@ public class AiKuaishouProjectCreateCreativeController {
                 Boolean unitOverrun = projectCreateCreativeService.getUnitOverrun(projectId.toString().concat(accountId.toString()));
                 if (!unitOverrun) {
                     strategy.setAccountId(accountId);
-                    projectCreateCreativeService.projectAutomaticCreates(strategy,1);
+                    // operationType 1检查反馈,2创建时信息
+                    projectCreateCreativeService.projectAutomaticCreates(strategy, operationType);
                 }
             }));
             return Result.ok("异步创建中...");
@@ -75,7 +67,4 @@ public class AiKuaishouProjectCreateCreativeController {
             return Result.error(e.getMessage());
         }
     }
-
-
-
 }

+ 9 - 34
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouProjectCreateCreativeServiceImpl.java

@@ -76,8 +76,6 @@ import java.util.concurrent.Executors;
 @Service
 public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouProjectCreateCreativeService {
     @Autowired
-    private IKuaiShouGroupService groupService;
-    @Autowired
     private IKuaiShouGroupTemplateService groupTemplateService;
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -98,8 +96,6 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
     @Autowired
     private IAiKuaishouAccountLevelOperationRecordService kuaishouAccountLevelOperationRecordService;
     @Autowired
-    private IAiKuaiShouAppInfoService appInfoService;
-    @Autowired
     private IAiKuaishouUnitLevelOperationRecordService unitLevelOperationRecordService;
     @Autowired
     private IAiKuaishouCreativeLevelOperationRecordService creativeLevelOperationRecordService;
@@ -115,6 +111,14 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
     private IKuaishouDirectionalPackageService directionalPackageService;
     @Autowired
     private IKuaiShouCreativeService kuaiShouCreativeService;
+    @Autowired
+    private IKuaiShouUpdateService updateService;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private IKuaiShouAppListService appListService;
+    @Autowired
+    private IKuaiShouCampaignService campaignService;
 
     static ExecutorService executorService = Executors.newFixedThreadPool(2);
 
@@ -422,10 +426,6 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
         insertAccountOperationRecord(strategy, "success", operationType, 1);
     }
 
-
-    @Autowired
-    private IKuaiShouUpdateService updateService;
-
     private void createProgramCreative(CtopOauthToken token, JSONObject creativeParams, KuaishouProjectStrategy strategy) {
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/json");
@@ -636,10 +636,6 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
      * @param startTime  开始时间
      * @param endTime    结束时间
      */
-    @Autowired
-    private IKuaiShouCampaignService campaignService;
-
-
     private List<KuaiShouVideoGet> getVideosByParams(KuaishouProjectStrategy strategy, String startTime, String endTime, AiKuaiShouAppInfo appInfo, Integer createType, Long videoCnt) {
         try {
             if (createType == 1) {
@@ -1131,20 +1127,6 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
         return Long.valueOf(bidString);
     }
 
-    private JSONArray cleanPramgramErrorScence(JSONArray scenceArray) {
-        JSONArray result = new JSONArray();
-        if (null == scenceArray || scenceArray.isEmpty()) {
-            return result;
-        }
-        for (int i = 0; i < scenceArray.size(); i++) {
-            Integer senceId = scenceArray.getInteger(i);
-            if (senceId != 5 && senceId != 3) {
-                result.add(senceId);
-            }
-        }
-        return result;
-    }
-
     private void createCreativeByImage(List<MaterialCutFrame> cutFrameList, CtopOauthToken token, JSONObject creativeParams,
                                        Long campaignId, Long unitId, KuaiShouVideoGet videoItem,
                                        int imageNumber, KuaishouProjectStrategy strategy, String uuid, String appVersion) {
@@ -1276,14 +1258,6 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
      * @param wildcard 计划名称/组名称
      * @param strategy 账户id
      * @return
-     */
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private IKuaiShouAppListService appListService;
-
-
-    /**
      * 通配符命名规则
      * 日期、渠道号、横竖版(视频素材的横版竖版)、时分、广告位置、素材名称、应用包名、创意制作方式(自定义、程序化)
      */
@@ -1456,6 +1430,7 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
                 accountOperationRecord.setMessage(msg);
             }
             if (status == 0) {
+                accountOperationRecord.setAiStrategyUuid(strategy.getStrategyUuid());
                 accountOperationRecord.setStatus(status);
                 accountOperationRecord.setMessage(msg);
             }