瀏覽代碼

Merge branch 'master' into V1.1.2

# Conflicts:
#	module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAiAdsNewMaterialCreativityJob.java
yumeng 4 年之前
父節點
當前提交
8aeb40772d
共有 20 個文件被更改,包括 636 次插入299 次删除
  1. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 12 11
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  3. 7 10
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java
  4. 16 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/RuleGroupController.java
  5. 2 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IRuleGroupService.java
  6. 121 43
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java
  7. 24 2
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/AlarmRuleJob.java
  8. 1 1
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouActionBarTextJob.java
  9. 5 4
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAiAdsNewMaterialCreativityJob.java
  10. 22 1
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCreateUnitJob.java
  11. 109 58
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/AiKuaishouAccountTargetTemplate.java
  12. 152 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java
  13. 13 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupTemplateController.java
  14. 2 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupTemplateMapper.java
  15. 7 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupTemplateMapper.xml
  16. 10 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupTemplateService.java
  17. 128 141
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupTemplateServiceImpl.java
  18. 0 13
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouProgramCreativeServiceImpl.java
  19. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouVideoEtlInfoServiceImpl.java
  20. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -184,6 +184,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/kuaishou/material/*", "anon");
         filterChainDefinitionMap.put("/kuaishou/create/*", "anon");
         filterChainDefinitionMap.put("/template/kuaiShouBatchCampaignTemplate/*", "anon");
+        filterChainDefinitionMap.put("/batch/kuaiShouGroupTemplate/*", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 12 - 11
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -502,23 +502,24 @@ public class SampleTest {
 //            return;
 //        }
 
-        AiKuaishouAccountTargetTemplate accountTargetTemplate0 = aiKuaishouAccountTargetTemplateService.getById(1);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate0,50);
-
-        AiKuaishouAccountTargetTemplate accountTargetTemplate1 = aiKuaishouAccountTargetTemplateService.getById(30002);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate1,50);
-
-        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(30001);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2,50);
+//        AiKuaishouAccountTargetTemplate accountTargetTemplate0 = aiKuaishouAccountTargetTemplateService.getById(1);
+//        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate0,50);
+//
+//        AiKuaishouAccountTargetTemplate accountTargetTemplate1 = aiKuaishouAccountTargetTemplateService.getById(30002);
+//        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate1,50);
+
+        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(90005);
+        aiKuaishouNewCreateCampaign.kuaishouAiAdsNewMaterialCreativity(accountTargetTemplate2);
     }
 
     @Test
     public void etlKuaishouProjectData(){
-        String dateString = "2020-03-17";
+        String dateString = "2020-08-07";
         Date startDate = DateUtils.parseDate(dateString,"yyyy-MM-dd");
-        for(int i=0;i<=365;i++){
+        for(int i=0;i<=180;i++){
             Date getDate = DateUtils.addDay(startDate,i);
-            kuaishouVideoEtlInfoService.etlKuaishouVideoInfoGroupByProjectId(getDate);
+            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
+            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
         }
     }
 }

+ 7 - 10
module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java

@@ -68,16 +68,13 @@ public class MatchLogic {
                         return value.equals(thresholds.get(0));
                     } else if ("not_equal".equals(condition)) {
                         return !value.equals(thresholds.get(0));
-                    }
-                    for (String thro : thresholds) {
-                        if ("contain".equals(condition)) {
-                            if (value.contains(thro)) {
-                                return true;
-                            }
-                        } else if ("no_contain".equals(condition)) {
-                            if (!value.contains(thro)) {
-                                return true;
-                            }
+                    } else if ("contain".equals(condition)) {
+                        if (thresholds.toString().contains(value)) {
+                            return true;
+                        }
+                    } else if ("no_contain".equals(condition)) {
+                        if (!thresholds.toString().contains(value)) {
+                            return true;
                         }
                     }
                 } else {

+ 16 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/RuleGroupController.java

@@ -49,6 +49,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 规则组
@@ -71,6 +73,7 @@ public class RuleGroupController {
     @Autowired
     private IRuleTemplateService ruleTemplateService;
 
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     /**
      * 创建规则组
@@ -210,6 +213,19 @@ public class RuleGroupController {
         return result;
     }
 
+    @GetMapping(value = "/checkRulesByAccountId")
+    public Result<RuleGroup> checkRulesByAccountId(Long accountId) {
+        Result<RuleGroup> result = new Result<>();
+        try {
+            executorService.submit(() -> ruleGroupService.checkRulesByAccountId(accountId));
+            result.success("成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
     /**
      * 编辑
      *

+ 2 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IRuleGroupService.java

@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IRuleGroupService extends IService<RuleGroup> {
 
+    public void checkRulesByAccountId(Long accountId);
+
     void checkRules();
 
     JSONObject createRuleGroup(JSONObject requestJson);

+ 121 - 43
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -111,37 +111,67 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     static ExecutorService executorService = Executors.newFixedThreadPool(5);
 
     @Override
-    public void checkRules() {
-        log.info("------start------");
-        Long startTime = System.currentTimeMillis();
-        //查询账户绑定过的规则模板
-        Map<String, Object> map = new HashMap<>();
-        //0状态为启动
-        map.put("template_status", 0);
-        List<RuleAccountTemplate> ruleAccountTemplates = ruleAccountTemplateMapper.selectByMap(map);
-        if (Check.isNull(ruleAccountTemplates)) {
-            log.error("查询账户绑定过的规则模板失败");
-            return;
-        }
-        //获取规则集
-        Map<Long, Object> ruleGroupMap = getRuleGroupMap();
-        if (Check.isNull(ruleGroupMap)) {
-            log.error("获取规则集失败");
-            return;
-        }
-        //获取指标内容
-        JSONObject indicators = getRuleIndicator();
-        if (Check.isNull(indicators)) {
-            log.error("获取指标内容失败");
-            return;
+    public void checkRulesByAccountId(Long accountId) {
+        try {
+            QueryWrapper<RuleAccountTemplate> wrapper = new QueryWrapper<>();
+            //0状态为启动
+            wrapper.eq("account_id", accountId);
+            wrapper.eq("template_status", 0);
+            wrapper.last("limit 1");
+            RuleAccountTemplate ruleAccountTemplate = ruleAccountTemplateMapper.selectOne(wrapper);
+            if (Check.isNull(ruleAccountTemplate)) {
+                log.error("查询账户绑定过的规则模板失败");
+                return;
+            }
+            //获取规则集
+            Map<Long, Object> ruleGroupMap = getRuleGroupMapById(ruleAccountTemplate.getTemplateId());
+            if (Check.isNull(ruleGroupMap)) {
+                log.error("获取规则集失败");
+                return;
+            }
+            //获取指标内容
+            JSONObject indicators = getRuleIndicator();
+            if (Check.isNull(indicators)) {
+                log.error("获取指标内容失败");
+                return;
+            }
+            matchAlarmRules(ruleGroupMap, indicators, ruleAccountTemplate);
+        } catch (Exception e) {
+            log.error("预警触发异常", e);
         }
+    }
 
-        ruleAccountTemplates.forEach(templates -> executorService.submit(() -> {
-            matchAlarmRules(ruleGroupMap, indicators, templates);
-        }));
+    @Override
+    public void checkRules() {
+        try {
+            //查询账户绑定过的规则模板
+            Map<String, Object> map = new HashMap<>();
+            //0状态为启动
+            map.put("template_status", 0);
+            List<RuleAccountTemplate> ruleAccountTemplates = ruleAccountTemplateMapper.selectByMap(map);
+            if (Check.isNull(ruleAccountTemplates)) {
+                log.error("查询账户绑定过的规则模板失败");
+                return;
+            }
+            //获取规则集
+            Map<Long, Object> ruleGroupMap = getRuleGroupMap();
+            if (Check.isNull(ruleGroupMap)) {
+                log.error("获取规则集失败");
+                return;
+            }
+            //获取指标内容
+            JSONObject indicators = getRuleIndicator();
+            if (Check.isNull(indicators)) {
+                log.error("获取指标内容失败");
+                return;
+            }
 
-        Long endTime = System.currentTimeMillis();
-        log.info("------end------共耗时: {} ms", endTime - startTime);
+            ruleAccountTemplates.forEach(templates -> executorService.submit(() -> {
+                matchAlarmRules(ruleGroupMap, indicators, templates);
+            }));
+        } catch (Exception e) {
+            log.error("预警触发异常", e);
+        }
     }
 
     /**
@@ -201,7 +231,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     }
 
     /**
-     * 组合规则匹配逻辑
+     * 规则匹配逻辑
      *
      * @param ruleGroups   规则组集
      * @param thresholdObj 阈值数据
@@ -217,6 +247,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
         for (RuleGroup ruleGroup : ruleGroups) {
             JSONArray complianceList = new JSONArray();
             List<RuleBase> ruleBaseList = ruleGroup.getRuleBaseList();
+            //存储触发预警的数据
+            List<AlarmRuleRecord> recordList = new ArrayList<>();
             if (Check.isNull(ruleBaseList)) {
                 continue;
             }
@@ -226,14 +258,14 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 for (Map.Entry<String, Object> entry : batchNo.entrySet()) {
                     JSONObject thresholdJn = (JSONObject) entry.getValue();
                     if (!Check.isNull(thresholdJn)) {
-                        CombinationRule(ruleGroup, thresholdJn, indicators, matchData, complianceList, type);
+                        CombinationRule(ruleGroup, thresholdJn, indicators, matchData, complianceList, type, recordList);
                     }
                 }
             } else {
                 boolean isGroup = "group".equals(ruleGroup.getRuleType());
                 //匹配组合规则
                 if (isGroup) {
-                    CombinationRule(ruleGroup, thresholdObj, indicators, matchData, complianceList, type);
+                    CombinationRule(ruleGroup, thresholdObj, indicators, matchData, complianceList, type, recordList);
                     //匹配单规则
                 } else {
                     RuleBase ruleBase = ruleBaseList.get(0);
@@ -255,7 +287,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                             JSONObject obj = dimensionData.getJSONObject(i);
                             String value = obj.getString(ruleBase.getIndicatorCode());
                             if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
-                                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
+                                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold, recordList);
                                 complianceList.add(obj);
                             }
                         }
@@ -264,6 +296,13 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             }
             if (!Check.isNull(complianceList)) {
                 getAndSendMessag(complianceList, ruleGroup, accountName, type);
+                Thread thread = new Thread() {
+                    @Override
+                    public void run() {
+                        alarmRuleRecordService.saveBatch(recordList);
+                    }
+                };
+                thread.start();
             }
         }
     }
@@ -276,7 +315,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private void alarmRuleRecord(JSONObject obj, RuleGroup ruleGroup, RuleBase ruleBase, JSONObject indicator, Integer mediaType, String threshold) {
+    private void alarmRuleRecord(JSONObject obj, RuleGroup ruleGroup, RuleBase ruleBase, JSONObject indicator, Integer mediaType, String threshold, List<AlarmRuleRecord> recordList) {
         try {
             Long planId = obj.getLong("planId");
             Long unidId = null;
@@ -304,7 +343,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             alarmRuleRecord.setValueTime(obj.getDate("createTime"));
             alarmRuleRecord.setOperate("PAUSE".equals(ruleGroup.getOperate()) ? "关停" : "仅发送");
             alarmRuleRecord.setMediaType(mediaTypeName);
-            alarmRuleRecordService.save(alarmRuleRecord);
+            recordList.add(alarmRuleRecord);
         } catch (Exception e) {
             log.error("insert ctop_alarm_rule_record error ", e);
         }
@@ -324,7 +363,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private void CombinationRule(RuleGroup ruleGroup, JSONObject thresholdObj, JSONObject indicators, JSONObject matchData, JSONArray complianceList, Integer type) {
+    private void CombinationRule(RuleGroup ruleGroup, JSONObject thresholdObj, JSONObject indicators, JSONObject matchData, JSONArray complianceList, Integer type, List<AlarmRuleRecord> recordList) {
         List<RuleBase> ruleBaseList = ruleGroup.getRuleBaseList();
         //符合规则的数据集
         JSONArray groupDatas = new JSONArray();
@@ -380,7 +419,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 JSONObject accountEntity = dimensionData.getJSONObject(0);
                 if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, accountEntity.getString(ruleBase.getIndicatorCode()), accountEntity, ruleBase.getIndicatorCode())) {
                     if (Check.isNull(accountDatas)) {
-                        alarmRuleRecord(accountEntity, ruleGroup, ruleBase, indicator, type, threshold);
+                        alarmRuleRecord(accountEntity, ruleGroup, ruleBase, indicator, type, threshold, recordList);
                         accountDatas.add(accountEntity);
                     }
                 } else {
@@ -402,7 +441,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (PLAN.equals(ruleBase.getRuleDimension())) {
-                planDatas = getOKData(planDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
+                planDatas = getOKData(planDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type, recordList);
                 if (Check.isNull(planDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -422,7 +461,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (CREATIVE.equals(ruleBase.getRuleDimension())) {
-                creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
+                creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type, recordList);
                 if (Check.isNull(creativeDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -442,7 +481,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if ("target".equals(ruleBase.getRuleDimension())) {
-                targetDatas = getOKData(targetDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
+                targetDatas = getOKData(targetDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type, recordList);
                 if (Check.isNull(targetDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -462,7 +501,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (UNIT.equals(ruleBase.getRuleDimension())) {
-                groupDatas = getOKData(groupDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
+                groupDatas = getOKData(groupDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type, recordList);
                 if (Check.isNull(groupDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -505,14 +544,14 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private JSONArray getOKData(JSONArray ruleDatas, JSONArray dimensionData, RuleBase ruleBase, JSONObject indicator, String threshold, RuleGroup ruleGroup, Integer type) {
+    private JSONArray getOKData(JSONArray ruleDatas, JSONArray dimensionData, RuleBase ruleBase, JSONObject indicator, String threshold, RuleGroup ruleGroup, Integer type, List<AlarmRuleRecord> recordList) {
         if (!Check.isNull(ruleDatas)) {
             JSONArray okData = new JSONArray();
             for (int i = 0; i < ruleDatas.size(); i++) {
                 JSONObject obj = ruleDatas.getJSONObject(i);
                 String value = obj.getString(ruleBase.getIndicatorCode());
                 if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
-                    alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
+                    alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold, recordList);
                     okData.add(obj);
                 }
             }
@@ -522,7 +561,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             JSONObject obj = dimensionData.getJSONObject(i);
             String value = obj.getString(ruleBase.getIndicatorCode());
             if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
-                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
+                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold, recordList);
                 ruleDatas.add(obj);
             }
         }
@@ -858,6 +897,45 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
         return obj;
     }
 
+    private Map<Long, Object> getRuleGroupMapById(Long id) {
+        try {
+            Map<Long, Object> returnMap = new HashMap<>();
+            Map<String, Object> parMap = new HashMap<>();
+            parMap.put("id", id);
+            List<RuleTemplate> ruleTemplates = ruleTemplateMapper.selectByMap(parMap);
+            for (RuleTemplate tem : ruleTemplates) {
+                Map<String, Object> map = new HashMap<>();
+                QueryWrapper<RuleGroup> groupWrapper = new QueryWrapper<>();
+                groupWrapper.eq("template_id", tem.getId());
+                groupWrapper.eq("is_copy", NoEn.NO1.valueInt());
+                List<RuleGroup> copyGroups = ruleGroupMapper.selectList(groupWrapper);
+                for (RuleGroup group : copyGroups) {
+                    QueryWrapper<RuleBase> baseWrapper = new QueryWrapper<>();
+                    baseWrapper.eq("group_id", group.getId());
+                    baseWrapper.orderByDesc("is_unlimited");
+                    group.setRuleBaseList(ruleBaseMapper.selectList(baseWrapper));
+                }
+                map.put("isCopy", copyGroups);
+                groupWrapper = new QueryWrapper<>();
+                groupWrapper.eq("template_id", tem.getId());
+                groupWrapper.eq("is_copy", NoEn.NO0.valueInt());
+                List<RuleGroup> notCopyGroups = ruleGroupMapper.selectList(groupWrapper);
+                for (RuleGroup group : notCopyGroups) {
+                    QueryWrapper<RuleBase> baseWrapper = new QueryWrapper<>();
+                    baseWrapper.eq("group_id", group.getId());
+                    baseWrapper.orderByDesc("is_unlimited");
+                    group.setRuleBaseList(ruleBaseMapper.selectList(baseWrapper));
+                }
+                map.put("notCopy", notCopyGroups);
+                map.put("type", tem.getMediaType());
+                returnMap.put(tem.getId(), map);
+            }
+            return returnMap;
+        } catch (Exception e) {
+            log.error("获取模板规则组集合异常", e);
+        }
+        return null;
+    }
 
     /**
      * 整理规则模板的数据,根据模板ID获取模板具体规则内容

+ 24 - 2
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/AlarmRuleJob.java

@@ -1,17 +1,29 @@
 package cn.com.ctop.job.bytedance.handler;
 
 
+import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
+import cn.com.ctop.alarm.modules.mapper.RuleAccountTemplateMapper;
 import cn.com.ctop.alarm.modules.service.IRuleGroupService;
-import com.xxl.job.core.biz.model.ReturnT;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Component
 public class AlarmRuleJob {
     @Autowired
     private IRuleGroupService ruleGroupService;
 
+    @Autowired
+    private RuleAccountTemplateMapper ruleAccountTemplateMapper;
+
+    String URLPREFIX = "http://api.tjyourong.com.cn/jeecg-boot/ruleGroup/checkRulesByAccountId?accountId=";
+
     /**
      * 定时任务
      *
@@ -22,6 +34,16 @@ public class AlarmRuleJob {
      */
     @XxlJob("alarmRuleJob")
     public void execute() throws Exception {
-        ruleGroupService.checkRules();
+        //查询账户绑定过的规则模板
+        Map<String, Object> map = new HashMap<>();
+        //0状态为启动
+        map.put("template_status", 0);
+        List<RuleAccountTemplate> ruleAccountTemplates = ruleAccountTemplateMapper.selectByMap(map);
+        if (!Check.isNull(ruleAccountTemplates)) {
+            ruleAccountTemplates.forEach(template -> {
+                String url = URLPREFIX + template.getAccountId();
+                HttpUtils.httpGet(url, null, null);
+            });
+        }
     }
 }

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouActionBarTextJob.java

@@ -11,7 +11,7 @@ public class KuaishouActionBarTextJob {
     @Autowired
     private IKuaiShouActionBarTextService actionBarTextService;
 
-    @XxlJob("KuaishouActionBarTextJob")
+    @XxlJob("kuaishouActionBarTextJob")
     public void execute() {
         actionBarTextService.getActionBarText();
         XxlJobHelper.log("快手行动号召按钮同步完成");

+ 5 - 4
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAiAdsNewMaterialCreativityJob.java

@@ -16,10 +16,11 @@ public class KuaishouAiAdsNewMaterialCreativityJob {
     IAiKuaishouNewCreateCampaign aiKuaishouNewCreateCampaign;
     @Autowired
     private IAiKuaishouAccountTargetTemplateService aiKuaishouAccountTargetTemplateService;
+
     @XxlJob("kuaishouAiAdsNewMaterialCreativityJob")
     public void kuaishouAiAdsNewMaterialCreativityJob() {
         List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
-        if(null==accountTargetTemplates||accountTargetTemplates.isEmpty()){
+        if (null == accountTargetTemplates || accountTargetTemplates.isEmpty()) {
             return;
         }
         accountTargetTemplates.forEach(targetTemplate -> aiKuaishouNewCreateCampaign.kuaishouAiAdsNewMaterialCreativity(targetTemplate));
@@ -29,16 +30,16 @@ public class KuaishouAiAdsNewMaterialCreativityJob {
     @XxlJob("kuaishouAiAddNewMaterialCreativityJob")
     public void kuaishouAiAddNewMaterialCreativityJob() {
         List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
-        if(null==accountTargetTemplates||accountTargetTemplates.isEmpty()){
+        if (null == accountTargetTemplates || accountTargetTemplates.isEmpty()) {
             return;
         }
-        accountTargetTemplates.forEach(targetTemplate -> aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(targetTemplate,1));
+        accountTargetTemplates.forEach(targetTemplate -> aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(targetTemplate, 10));
     }
 
     @XxlJob("kuaishouAiAdsHotMaterialCreativityJob")
     public void kuaishouAiAdsHotMaterialCreativityJob() {
         List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
-        if(null==accountTargetTemplates||accountTargetTemplates.isEmpty()){
+        if (null == accountTargetTemplates || accountTargetTemplates.isEmpty()) {
             return;
         }
         accountTargetTemplates.forEach(targetTemplate -> aiKuaishouNewCreateCampaign.kuaishouAiAdsHotMaterialCreativity(targetTemplate));

+ 22 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCreateUnitJob.java

@@ -1,10 +1,17 @@
 package cn.com.ctop.job.kuaishou.handler;
 
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils2;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupTemplateService;
+import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Component
 public class KuaishouCreateUnitJob {
 
@@ -14,6 +21,20 @@ public class KuaishouCreateUnitJob {
 
     @XxlJob("kuaihouCreateUnit")
     public void execute() {
-        groupTemplateService.createUnit();
+
+        List<Long> idList = groupTemplateService.getIdList();
+        if (Check.isNull(idList)) {
+            XxlJobHelper.log("批量2.0暂时没有未创建的组");
+            return;
+        }
+        String url = "http://api.tjyourong.com.cn/jeecg-boot/batch/kuaiShouGroupTemplate/createUnit";
+        for (int i = 0; i < idList.size(); i++) {
+            Long id = idList.get(i);
+            Map<String, Object> requestMap = new HashMap<>();
+            requestMap.put("id", id);
+            HttpUtils2.httpGet(url, requestMap, null);
+        }
+
+
     }
 }

+ 109 - 58
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/AiKuaishouAccountTargetTemplate.java

@@ -3,75 +3,126 @@ package cn.com.ctop.kuaishou.modules.ai.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
 
 /**
  * 账户自动投放定向模板
+ *
  * @author jeecg-boot
- * @date   2021-01-07
  * @version V1.0
+ * @date 2021-01-07
  */
 @Data
 @TableName("ctop_ai_kuaishou_auto_creative_account_info")
 public class AiKuaishouAccountTargetTemplate {
 
-	/**id*/
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	/**账户ID*/
-	private Long accountId;
-	/**营销目标{1应用安装},{2电商下单},{3推广品牌},{4营销线上},{5应用活跃}*/
-	private String marketingGoal;
-	/**请勾选投放应用已上架的应用商店*/
-	private String appStore;
-	/**是否优先从应用商店下载 true false*/
-	private String useAppMarket;
-	/**应用id集*/
-	private String appIds;
-	/**地域*/
-	private String region;
-	/**年龄段:{[]:不限}{18:18-23岁}{24:24-30岁}{31:31-40岁}{41:41-49岁}{50:50岁+*/
-	private String agesRange;
-	/**性别 1:女性, 2:男性, 0:不限*/
-	private Integer gender;
-	/**操作系统 1: Android, 2: iOS, 0:不限*/
-	private Integer platformOs;
-	/**自定义人群 0不限,1:定向,:2:排除,:3同时定向排除*/
-	private String customCrowd;
-	/**定向人群包*/
-	private String population;
-	/**排除人群包*/
-	private String excludePopulation;
-	/**出价类型(优化目标) 2点击数(CPC),10转化数(OCPM)*/
-	private Integer bidType;
-	/**封面点击出价*/
-	private Integer bid;
-	/**转化目标,2:行为数,180:激活数,53:表单数,190: 付费,191:首日ROI 。。。*/
-	private Integer ocpxActionType;
-	/**转化目标出价*/
-	private Integer cpaBid;
-	/**广告位 1:优选广告位;*/
-	private String sceneId;
-	/**下载详情页ID,建站id*/
-	private String siteId;
-	/**第三方开始播放监测链接*/
-	private String impressionUrl;
-	/**第三方点击检测链接*/
-	private String clickTrackUrl;
-	/**第三方点击按钮监测链接*/
-	private String actionbarClickUrl;
-	/**状态*/
-	private Integer status;
-	/**单个视频搭配图片个数*/
-	private Integer imageNumber;
-	/**创建时间*/
-	private Date createTime;
-	/**updateTime*/
-	private Date updateTime;
-	private String titlePrefix;
-	private String titleMiddle;
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 账户ID
+     */
+    private Long accountId;
+    /**
+     * 营销目标{1应用安装},{2电商下单},{3推广品牌},{4营销线上},{5应用活跃}
+     */
+    private String marketingGoal;
+    /**
+     * 请勾选投放应用已上架的应用商店
+     */
+    private String appStore;
+    /**
+     * 是否优先从应用商店下载 true false
+     */
+    private String useAppMarket;
+    /**
+     * 应用id集
+     */
+    private String appIds;
+    /**
+     * 地域
+     */
+    private String region;
+    /**
+     * 年龄段:{[]:不限}{18:18-23岁}{24:24-30岁}{31:31-40岁}{41:41-49岁}{50:50岁+
+     */
+    private String agesRange;
+    /**
+     * 性别 1:女性, 2:男性, 0:不限
+     */
+    private Integer gender;
+    /**
+     * 操作系统 1: Android, 2: iOS, 0:不限
+     */
+    private Integer platformOs;
+    /**
+     * 自定义人群 0不限,1:定向,:2:排除,:3同时定向排除
+     */
+    private String customCrowd;
+    /**
+     * 定向人群包
+     */
+    private String population;
+    /**
+     * 排除人群包
+     */
+    private String excludePopulation;
+    /**
+     * 出价类型(优化目标) 2点击数(CPC),10转化数(OCPM)
+     */
+    private Integer bidType;
+    /**
+     * 封面点击出价
+     */
+    private Integer bid;
+    /**
+     * 转化目标,2:行为数,180:激活数,53:表单数,190: 付费,191:首日ROI 。。。
+     */
+    private Integer ocpxActionType;
+    /**
+     * 转化目标出价
+     */
+    private Integer cpaBid;
+    /**
+     * 广告位 1:优选广告位;
+     */
+    private String sceneId;
+    /**
+     * 下载详情页ID,建站id
+     */
+    private String siteId;
+    /**
+     * 第三方开始播放监测链接
+     */
+    private String impressionUrl;
+    /**
+     * 第三方点击检测链接
+     */
+    private String clickTrackUrl;
+    /**
+     * 第三方点击按钮监测链接
+     */
+    private String actionbarClickUrl;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 单个视频搭配图片个数
+     */
+    private Integer imageNumber;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    private Date updateTime;
+    private String titlePrefix;
+    private String titleMiddle;
 }

+ 152 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -3,8 +3,7 @@ package cn.com.ctop.kuaishou.modules.ai.service.impl;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.HttpUtils2;
+import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.ai.service.IKuaiShouCreateService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
@@ -18,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -41,6 +41,13 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
     @Value("${ai.callback.callback-creative-url}")
     private String creativeUrl;
 
+    /**
+     * 创建 组 && 创意
+     *
+     * @param oauthToken
+     * @param campaign_id
+     * @param group_list
+     */
     @Override
     public void createUnitAndCreative(CtopOauthToken oauthToken, Long campaign_id, JSONArray group_list) {
         JSONArray returnArr = new JSONArray();
@@ -86,9 +93,11 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 if (!Check.isNull(groupCreateJson.getJSONArray("scene_id"))) {
                     createJson.put("scene_id", groupCreateJson.getJSONArray("scene_id")); //资源位置
                 }
-                if (!Check.isNull(groupCreateJson.getInteger("unit_type"))) {
-                    createJson.put("unit_type", groupCreateJson.getInteger("unit_type")); //创意制作方式
+                Integer unit_type = groupCreateJson.getInteger("unit_type");
+                if (Check.isNull(unit_type)) {
+                    throw new Exception("请选择创意制作方式");
                 }
+                createJson.put("unit_type", groupCreateJson.getInteger("unit_type")); //创意制作方式
                 if (!Check.isNull(groupCreateJson.getString("begin_time"))) {
                     createJson.put("begin_time", groupCreateJson.getString("begin_time")); //投放开始时间
                 }
@@ -172,6 +181,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnJson.put("unit_id", unitId);
                     returnJson.put("code", 0);
                     returnJson.put("message", "广告组创建成功");
+                    returnJson.put("type", 1);
                     KuaiShouGroup group = groupService.selectGroupByUnitId(oauthToken.getAccountId(), unitId);
                     if (!Check.isNull(group)) {
                         returnJson.put("group_create_time", group.getGroupCreateTime());
@@ -179,13 +189,18 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     Thread thread = new Thread() {
                         @Override
                         public void run() {
-                            createCreative(oauthToken, unitId, groupCreateJson.getJSONArray("creative_list"));
+                            if (unit_type == 4) { //  自定义2.0创意
+                                createCreative(oauthToken, unitId, groupCreateJson.getJSONArray("creative_list"));
+                            } else if (unit_type == 7) { // 程序化创意
+                                createProgramCreative(oauthToken, unitId, groupCreateJson.getJSONObject("programCreative"));
+                            }
                         }
                     };
                     thread.start();
                 } else {
                     returnJson.put("code", -1);
                     returnJson.put("message", unitMap.get("message"));
+                    returnJson.put("type", 1);
                 }
                 returnArr.add(returnJson);
             } catch (Exception e) {
@@ -193,6 +208,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 returnJson.put("group_uuid", group_uuid);
                 returnJson.put("code", -1);
                 returnJson.put("message", e.getMessage());
+                returnJson.put("type", 1);
                 returnArr.add(returnJson);
             }
         }
@@ -201,7 +217,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
 
 
     /**
-     * 创建广告创意
+     * 创建自定义广告创意
      *
      * @param oauthToken
      * @param unit_id
@@ -311,14 +327,137 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
 
     }
 
+
+    /**
+     * 创建程序化创意
+     *
+     * @param oauthToken
+     * @param unit_id
+     * @param programCreativeJson
+     */
+    private void createProgramCreative(CtopOauthToken oauthToken, Long unit_id, JSONObject programCreativeJson) {
+        JSONArray returnArray = new JSONArray();
+        String creative_uuid = programCreativeJson.getString("creative_uuid");
+        try {
+            JSONObject programJson = new JSONObject();
+            programJson.put("advertiser_id", oauthToken.getAccountId());
+            programJson.put("unit_id", unit_id);
+            if (!Check.isNull(programCreativeJson.getString("package_name"))) {
+                programJson.put("package_name", programCreativeJson.getString("package_name"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("horizontal_photo_ids"))) {
+                programJson.put("horizontal_photo_ids", programCreativeJson.getJSONArray("horizontal_photo_ids"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("vertical_photo_ids"))) {
+                programJson.put("vertical_photo_ids", programCreativeJson.getJSONArray("vertical_photo_ids"));
+            }
+            JSONArray cover_image_tokens = new JSONArray();
+            JSONArray image_md5s = programCreativeJson.getJSONArray("image_md5s");
+            if (!Check.isNull(image_md5s)) {
+                for (int i = 0; i < image_md5s.size(); i++) {
+                    String image_md5 = (String) image_md5s.get(i);
+                    if (!Check.isNull(image_md5)) {
+                        String imageToken = getImageToken(image_md5, oauthToken.getAccountId(), oauthToken.getAccessToken());
+                        if (!Check.isNull(imageToken)) {
+                            cover_image_tokens.add(imageToken);
+                        }
+                    }
+                }
+                programJson.put("cover_image_tokens", cover_image_tokens);
+            }
+            if (!Check.isNull(programCreativeJson.getLong("site_id"))) {
+                programJson.put("site_id", programCreativeJson.getLong("site_id"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("sticker_styles"))) {
+                programJson.put("sticker_styles", programCreativeJson.getJSONArray("sticker_styles"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("cover_slogans"))) {
+                programJson.put("cover_slogans", programCreativeJson.getJSONArray("cover_slogans"));
+            }
+            if (!Check.isNull(programCreativeJson.getString("action_bar"))) {
+                programJson.put("action_bar", programCreativeJson.getString("action_bar"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("captions"))) {
+                programJson.put("captions", programCreativeJson.getJSONArray("captions"));
+            }
+            if (!Check.isNull(programCreativeJson.getString("click_url"))) {
+                programJson.put("click_url", programCreativeJson.getString("click_url"));
+            }
+            if (!Check.isNull(programCreativeJson.getString("actionbar_click_url"))) {
+                programJson.put("actionbar_click_url", programCreativeJson.getString("actionbar_click_url"));
+            }
+            if (!Check.isNull(programCreativeJson.getInteger("creative_category"))) {
+                programJson.put("creative_category", programCreativeJson.getInteger("creative_category"));
+            }
+            if (!Check.isNull(programCreativeJson.getJSONArray("creative_tag"))) {
+                programJson.put("creative_tag", programCreativeJson.getJSONArray("creative_tag"));
+            }
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Content-Type", "application/json");
+            headers.put("Access-Token", oauthToken.getAccessToken());
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.PROGRAM_CREATE;
+            String result = HttpUtils.kuaiShouhttpPostRequest(url, programJson.toJSONString(), headers);
+            JSONObject resultJson = JSONObject.parseObject(result);
+            JSONObject returnJson = new JSONObject();
+            returnJson.put("creative_uuid", creative_uuid);
+            if (!Check.isNull(resultJson)) {
+                if (resultJson.getInteger("code") == 0) {
+                    returnJson.put("unit_id", unit_id);
+                    returnJson.put("type", 2);
+                    returnJson.put("code", 0);
+                    returnJson.put("message", "程序化创意创建成功");
+                } else {
+                    returnJson.put("code", -1);
+                    returnJson.put("type", 2);
+                    returnJson.put("message", resultJson.getString("message"));
+                }
+            }
+            returnArray.add(returnJson);
+        } catch (Exception e) {
+            e.printStackTrace();
+            JSONObject returnJson = new JSONObject();
+            returnJson.put("creative_uuid", creative_uuid);
+            returnJson.put("message", e.getMessage());
+            returnJson.put("type", 2);
+            returnJson.put("code", -1);
+            returnArray.add(returnJson);
+        }
+        callback(creativeUrl, returnArray, "program_create");
+    }
+
+
+    /**
+     * 回调
+     *
+     * @param url
+     * @param requestArr
+     * @param type
+     */
     private void callback(String url, JSONArray requestArr, String type) {
         JSONObject requestJson = new JSONObject();
         requestJson.put("callbackData", requestArr);
         String s = HttpUtils2.httpPostRequest(url, requestJson, null);
         JSONObject jsonObject = JSONObject.parseObject(s);
-        log.info("{},回调数据返回结果:{}", type, jsonObject);
+        if (!Check.isNull(jsonObject)) {
+            Integer code = jsonObject.getInteger("code");
+            if (code == 0) {
+                log.info("{},回调成功", type);
+            } else {
+                log.info("{},回调失败,入参:{}", type, requestJson);
+            }
+        } else {
+            log.info("{},回调返回结果为空,入参:{}", type, requestJson);
+        }
     }
 
+    /**
+     * 根据封面MD5 获取imageToken
+     *
+     * @param md5
+     * @param accountId
+     * @param accessToken
+     * @return
+     */
     private String getImageToken(String md5, Long accountId, String accessToken) {
         String imageToken = null;
         QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
@@ -337,6 +476,12 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
         return imageToken;
     }
 
+    /**
+     * 获取定向包
+     *
+     * @param unitJson
+     * @return
+     */
     private JSONObject getTarget(JSONObject unitJson) {
         JSONObject target = new JSONObject();
         if (!Check.isNull(unitJson.getJSONArray("region"))) {

+ 13 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupTemplateController.java

@@ -35,6 +35,8 @@ import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 创建组模板
@@ -50,7 +52,7 @@ import java.util.Map;
 public class KuaiShouGroupTemplateController {
     @Autowired
     private IKuaiShouGroupTemplateService kuaiShouGroupTemplateService;
-
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     /**
      * 批量创建广告组
@@ -78,11 +80,19 @@ public class KuaiShouGroupTemplateController {
 
     }
 
+
     @GetMapping(value = "/createUnit")
-    public Result<JSONObject> createUnit() {
+    public Result<JSONObject> createUnit(Long id) {
         Result<JSONObject> result = new Result<>();
         try {
-            kuaiShouGroupTemplateService.createUnit();
+            KuaiShouGroupTemplate template = kuaiShouGroupTemplateService.getById(id);
+            if (!Check.isNull(template)) {
+                KuaiShouGroupTemplate updateTemplate = new KuaiShouGroupTemplate();
+                updateTemplate.setId(template.getId());
+                updateTemplate.setTaskStatus(1);
+                kuaiShouGroupTemplateService.updateById(updateTemplate);   // 修改状态为创建中
+                executorService.submit(() -> kuaiShouGroupTemplateService.createUnit(template));
+            }
             result.setSuccess(true);
         } catch (Exception e) {
             e.printStackTrace();

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupTemplateMapper.java

@@ -25,4 +25,6 @@ public interface KuaiShouGroupTemplateMapper extends BaseMapper<KuaiShouGroupTem
     JSONObject getUrlByPhotoId(@Param("photoId") Long photoId);
 
     JSONObject getImageJsonByMd5(String md5);
+
+    List<Long> getIdList();
 }

+ 7 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupTemplateMapper.xml

@@ -48,4 +48,11 @@
      limit 1
     </select>
 
+    <select id="getIdList" resultType="java.lang.Long">
+    select id  from ctop_kuaishou_group_template
+    where  task_status = 0
+    order by create_time desc
+    limit 70
+    </select>
+
 </mapper>

+ 10 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupTemplateService.java

@@ -4,6 +4,8 @@ import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupTemplate;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 创建组模板
  * @Author: jeecg-boot
@@ -14,7 +16,7 @@ public interface IKuaiShouGroupTemplateService extends IService<KuaiShouGroupTem
 
     JSONObject submitUnitTask(JSONObject requestJson) throws Exception;
 
-    void createUnit();
+    void createUnit(KuaiShouGroupTemplate template);
 
     /**
      * 获取api创建数
@@ -35,4 +37,11 @@ public interface IKuaiShouGroupTemplateService extends IService<KuaiShouGroupTem
     void createCreative(String accessToken, Long unitId, KuaiShouGroupTemplate template);
 
     JSONObject getUnionJson(Long templateId);
+
+    /**
+     * 获取待创建2.0Id列表
+     *
+     * @return
+     */
+    List<Long> getIdList();
 }

+ 128 - 141
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupTemplateServiceImpl.java

@@ -275,153 +275,135 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
      * 创建组
      */
     @Override
-    public void createUnit() {
-        QueryWrapper<KuaiShouGroupTemplate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("task_status", 0);
-        queryWrapper.orderByAsc("create_time");
-        queryWrapper.last("limit 45");
-        List<KuaiShouGroupTemplate> list = this.list(queryWrapper);
-        if (Check.isNull(list)) {
-            log.error("暂未未创建的组");
+    public void createUnit(KuaiShouGroupTemplate template) {
+        Long accountId = template.getAccountId();
+        CtopOauthToken token = tokenService.getTokenByAccountId(accountId);
+        KuaiShouGroupTemplate updateTemplate = new KuaiShouGroupTemplate();
+        if (Check.isNull(token)) {
+            updateTemplate.setTaskStatus(3);
+            updateTemplate.setReviewDetail("未获取到授权信息");
+            updateTemplate.setCreativeStatus(3);
+            updateTemplate.setCreativeReviewDetail("未获取到授权信息");
+            updateById(updateTemplate);
+            return;
+        }
+        JSONObject createUnitJson = new JSONObject();
+        JSONArray sceneIdArr = JSONArray.parseArray(template.getSceneId());
+        if (Check.isNull(sceneIdArr)) {
+            updateTemplate.setTaskStatus(3);
+            updateTemplate.setReviewDetail("scene_id不能为空");
+            updateTemplate.setCreativeStatus(3);
+            updateTemplate.setCreativeReviewDetail("组创建失败");
+            updateById(updateTemplate);
             return;
         }
-        for (KuaiShouGroupTemplate template : list) {
-            executorService.submit(new Runnable() {
+        createUnitJson.put("scene_id", sceneIdArr); //资源位置
+        Integer sceneId = (Integer) sceneIdArr.get(0);
+        if (sceneId != 5) {
+            if (!Check.isNull(template.getTemplateId())) {
+                createUnitJson.put("template_id", template.getTemplateId());
+            }
+        } else {
+            if (!Check.isNull(template.getTemplateId())) {
+                JSONObject unionJson = getUnionJson(template.getTemplateId());
+                if (unionJson.getInteger("code") != 0) {
+                    updateTemplate.setTaskStatus(3);
+                    updateTemplate.setReviewDetail(unionJson.getString("message"));
+                    updateTemplate.setCreativeStatus(3);
+                    updateTemplate.setCreativeReviewDetail("组创建失败");
+                    updateById(updateTemplate);
+                    return;
+                } else {
+                    createUnitJson.put("target", unionJson.getJSONObject("target"));
+                }
+            }
+        }
+        createUnitJson.put("campaign_id", template.getCampaignId());
+        createUnitJson.put("unit_name", template.getUnitName());
+        if (!Check.isNull(template.getBidType())) {
+            createUnitJson.put("bid_type", template.getBidType()); // 优化目标类型
+        }
+        if (!Check.isNull(template.getUseAppMarket())) {
+            createUnitJson.put("use_app_market", template.getUseAppMarket()); //优先从系统应用商店下载
+        }
+        if (!Check.isNull(template.getAppStore())) {
+            createUnitJson.put("app_store", JSONArray.parseArray(template.getAppStore())); //应用商店列表
+        }
+        if (!Check.isNull(template.getBid())) {
+            createUnitJson.put("bid", template.getBid()); //出价
+        }
+        if (!Check.isNull(template.getCpaBid())) {
+            createUnitJson.put("cpa_bid", template.getCpaBid()); //出价
+        }
+        if (!Check.isNull(template.getOcpxActionType())) {
+            createUnitJson.put("ocpx_action_type", template.getOcpxActionType()); //优化目标
+        }
+        if (!Check.isNull(template.getDeepConversionType())) {
+            createUnitJson.put("deep_conversion_type", template.getDeepConversionType()); //深度转化目标
+        }
+        if (!Check.isNull(template.getDeepConversionBid())) {
+            createUnitJson.put("deep_conversion_bid", template.getDeepConversionBid()); //深度转化目标出价
+        }
+        if (!Check.isNull(template.getUnitType())) {
+            createUnitJson.put("unit_type", template.getUnitType()); //创意制作方式
+        }
+        if (!Check.isNull(template.getBeginTime())) {
+            createUnitJson.put("begin_time", template.getBeginTime()); //投放开始时间
+        }
+        if (!Check.isNull(template.getEndTime())) {
+            createUnitJson.put("end_time", template.getEndTime()); //投放结束时间
+        }
+        if (!Check.isNull(template.getScheduleTime())) {
+            createUnitJson.put("schedule_time", template.getScheduleTime()); //投放时间段
+        }
+        if (!Check.isNull(template.getDayBudget())) {
+            createUnitJson.put("day_budget", template.getDayBudget()); //单日预算金额
+        }
+        if (!Check.isNull(template.getConvertId())) {
+            createUnitJson.put("convert_id", template.getConvertId()); //转化目标ID
+        }
+        if (!Check.isNull(template.getUrlType())) {
+            createUnitJson.put("url_type", template.getUrlType()); //url类型
+        }
+        if (!Check.isNull(template.getUrl())) {
+            createUnitJson.put("url", template.getUrl()); // 投放链接
+        }
+        if (!Check.isNull(template.getAppId())) {
+            createUnitJson.put("app_id", template.getAppId()); // 应用ID
+        }
+        if (!Check.isNull(template.getShowMode())) {
+            createUnitJson.put("show_mode", template.getShowMode()); // 创意展现方式
+        }
+        if (!Check.isNull(template.getSpeed())) {
+            createUnitJson.put("speed", template.getSpeed()); // 投放方式
+        }
+        Map<String, Object> groupMap = iKuaishouInterfaceService.adUnitCreate(token.getAccessToken(), accountId, createUnitJson, 1);
+        updateTemplate = new KuaiShouGroupTemplate();
+        updateTemplate.setId(template.getId());
+        Integer code = (Integer) groupMap.get("code");
+        if (code == 0) {
+            updateTemplate.setTaskStatus(2);
+            Long unit = (Long) groupMap.get("unitId");
+            updateTemplate.setUnitId((unit));
+            Thread thread = new Thread() {
                 @Override
                 public void run() {
-
-                    Long accountId = template.getAccountId();
-                    CtopOauthToken token = tokenService.getTokenByAccountId(accountId);
-                    if (Check.isNull(token)) {
-                        return;
-                    }
-                    KuaiShouGroupTemplate updateTemplate = new KuaiShouGroupTemplate();
-                    updateTemplate.setId(template.getId());
-                    updateTemplate.setTaskStatus(1);
-                    updateById(updateTemplate);   // 修改状态为创建中
-                    JSONObject createUnitJson = new JSONObject();
-
-                    JSONArray sceneIdArr = JSONArray.parseArray(template.getSceneId());
-                    if (Check.isNull(sceneIdArr)) {
-                        updateTemplate.setTaskStatus(3);
-                        updateTemplate.setReviewDetail("scene_id不能为空");
-                        updateTemplate.setCreativeStatus(3);
-                        updateTemplate.setCreativeReviewDetail("组创建失败");
-                        updateById(updateTemplate);
-                        return;
-                    }
-                    createUnitJson.put("scene_id", sceneIdArr); //资源位置
-                    Integer sceneId = (Integer) sceneIdArr.get(0);
-                    if (sceneId != 5) {
-                        if (!Check.isNull(template.getTemplateId())) {
-                            createUnitJson.put("template_id", template.getTemplateId());
-                        }
-                    } else {
-                        if (!Check.isNull(template.getTemplateId())) {
-                            JSONObject unionJson = getUnionJson(template.getTemplateId());
-                            if (unionJson.getInteger("code") != 0) {
-                                updateTemplate.setTaskStatus(3);
-                                updateTemplate.setReviewDetail(unionJson.getString("message"));
-                                updateTemplate.setCreativeStatus(3);
-                                updateTemplate.setCreativeReviewDetail("组创建失败");
-                                updateById(updateTemplate);
-                                return;
-                            } else {
-                                createUnitJson.put("target", unionJson.getJSONObject("target"));
-                            }
-                        }
-                    }
-                    createUnitJson.put("campaign_id", template.getCampaignId());
-                    createUnitJson.put("unit_name", template.getUnitName());
-                    if (!Check.isNull(template.getBidType())) {
-                        createUnitJson.put("bid_type", template.getBidType()); // 优化目标类型
-                    }
-                    if (!Check.isNull(template.getUseAppMarket())) {
-                        createUnitJson.put("use_app_market", template.getUseAppMarket()); //优先从系统应用商店下载
-                    }
-                    if (!Check.isNull(template.getAppStore())) {
-                        createUnitJson.put("app_store", JSONArray.parseArray(template.getAppStore())); //应用商店列表
-                    }
-                    if (!Check.isNull(template.getBid())) {
-                        createUnitJson.put("bid", template.getBid()); //出价
-                    }
-                    if (!Check.isNull(template.getCpaBid())) {
-                        createUnitJson.put("cpa_bid", template.getCpaBid()); //出价
-                    }
-                    if (!Check.isNull(template.getOcpxActionType())) {
-                        createUnitJson.put("ocpx_action_type", template.getOcpxActionType()); //优化目标
-                    }
-                    if (!Check.isNull(template.getDeepConversionType())) {
-                        createUnitJson.put("deep_conversion_type", template.getDeepConversionType()); //深度转化目标
-                    }
-                    if (!Check.isNull(template.getDeepConversionBid())) {
-                        createUnitJson.put("deep_conversion_bid", template.getDeepConversionBid()); //深度转化目标出价
-                    }
-                    if (!Check.isNull(template.getUnitType())) {
-                        createUnitJson.put("unit_type", template.getUnitType()); //创意制作方式
-                    }
-                    if (!Check.isNull(template.getBeginTime())) {
-                        createUnitJson.put("begin_time", template.getBeginTime()); //投放开始时间
-                    }
-                    if (!Check.isNull(template.getEndTime())) {
-                        createUnitJson.put("end_time", template.getEndTime()); //投放结束时间
-                    }
-                    if (!Check.isNull(template.getScheduleTime())) {
-                        createUnitJson.put("schedule_time", template.getScheduleTime()); //投放时间段
-                    }
-                    if (!Check.isNull(template.getDayBudget())) {
-                        createUnitJson.put("day_budget", template.getDayBudget()); //单日预算金额
-                    }
-                    if (!Check.isNull(template.getConvertId())) {
-                        createUnitJson.put("convert_id", template.getConvertId()); //转化目标ID
-                    }
-                    if (!Check.isNull(template.getUrlType())) {
-                        createUnitJson.put("url_type", template.getUrlType()); //url类型
-                    }
-                    if (!Check.isNull(template.getUrl())) {
-                        createUnitJson.put("url", template.getUrl()); // 投放链接
-                    }
-                    if (!Check.isNull(template.getAppId())) {
-                        createUnitJson.put("app_id", template.getAppId()); // 应用ID
-                    }
-                    if (!Check.isNull(template.getShowMode())) {
-                        createUnitJson.put("show_mode", template.getShowMode()); // 创意展现方式
-                    }
-                    if (!Check.isNull(template.getSpeed())) {
-                        createUnitJson.put("speed", template.getSpeed()); // 投放方式
-                    }
-                    Map<String, Object> groupMap = iKuaishouInterfaceService.adUnitCreate(token.getAccessToken(), accountId, createUnitJson, 1);
-                    updateTemplate = new KuaiShouGroupTemplate();
-                    updateTemplate.setId(template.getId());
-                    Integer code = (Integer) groupMap.get("code");
-                    if (code == 0) {
-                        updateTemplate.setTaskStatus(2);
-                        Long unit = (Long) groupMap.get("unitId");
-                        updateTemplate.setUnitId((unit));
-                        Thread thread = new Thread() {
-                            @Override
-                            public void run() {
-                                createCreative(token.getAccessToken(), unit, template);
-                            }
-                        };
-                        thread.start();
-                    } else {
-                        updateTemplate.setTaskStatus(3);
-                        updateTemplate.setReviewDetail((String) groupMap.get("message"));
-                        updateTemplate.setCreativeStatus(3);
-                        updateTemplate.setCreativeReviewDetail("组创建失败");
-                    }
-                    updateById(updateTemplate);
-                    try {
-                        Thread.sleep(2 * 1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-
+                    createCreative(token.getAccessToken(), unit, template);
                 }
-            });
+            };
+            thread.start();
+        } else {
+            updateTemplate.setTaskStatus(3);
+            updateTemplate.setReviewDetail((String) groupMap.get("message"));
+            updateTemplate.setCreativeStatus(3);
+            updateTemplate.setCreativeReviewDetail("组创建失败");
+        }
+        updateById(updateTemplate);
+        try {
+            Thread.sleep(2 * 1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
-
     }
 
 
@@ -513,6 +495,11 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
         return returnJson;
     }
 
+    @Override
+    public List<Long> getIdList() {
+        return groupTemplateMapper.getIdList();
+    }
+
     /**
      * 获取当天api创建创意数
      *

+ 0 - 13
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouProgramCreativeServiceImpl.java

@@ -122,8 +122,6 @@ public class KuaishouProgramCreativeServiceImpl extends ServiceImpl<KuaishouProg
 
         JSONObject returnJson = new JSONObject();
         try {
-
-
             JSONObject pramsJson = new JSONObject();
             pramsJson.put("advertiser_id", oauthToken.getAccountId());
             pramsJson.put("unit_id", requestJson.getLong("unitId"));
@@ -134,7 +132,6 @@ public class KuaishouProgramCreativeServiceImpl extends ServiceImpl<KuaishouProg
             if (!Check.isNull(requestJson.getLong("siteId"))) {
                 pramsJson.put("site_id", requestJson.getLong("siteId"));
             }
-
             if (!Check.isNull(requestJson.getJSONArray("stickerStyles"))) {
                 pramsJson.put("sticker_styles", requestJson.getJSONArray("stickerStyles"));
             }
@@ -166,14 +163,12 @@ public class KuaishouProgramCreativeServiceImpl extends ServiceImpl<KuaishouProg
             JSONArray cover_image_tokens = new JSONArray();
             requestJson.remove(coverImageTokens);
             if (!Check.isNull(coverImageTokens)) {
-
                 for (int i = 0; i < coverImageTokens.size(); i++) {
                     String signature = coverImageTokens.getString(i);
                     if (Check.isNull(signature)) {
                         continue;
                     }
                     String imageToken = null;
-
                     if (!Check.isNull(signature)) {
                         QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
                         queryWrapper.eq("account_id", oauthToken.getAccountId());
@@ -188,15 +183,9 @@ public class KuaishouProgramCreativeServiceImpl extends ServiceImpl<KuaishouProg
                         }
                         cover_image_tokens.add(imageToken);
                     }
-
-
                 }
-
-
             }
-
             pramsJson.put("cover_image_tokens", cover_image_tokens);
-
             String result = HttpUtils.kuaiShouhttpPostRequest(url, pramsJson.toJSONString(), headers);
             JSONObject jsonObject = JSONObject.parseObject(result);
             log.info("创建程序化创意返回结果:{}", jsonObject);
@@ -220,8 +209,6 @@ public class KuaishouProgramCreativeServiceImpl extends ServiceImpl<KuaishouProg
             returnJson.put("message", "系统错误");
 
         }
-
-
         return returnJson;
     }
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouVideoEtlInfoServiceImpl.java

@@ -110,7 +110,7 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                                 etlInfo.setEffectDate(date);
                                 etlInfo.setEffectDayNum(days);
                             }
-                            if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                            if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                 //此刻成为爆款
                                 etlInfo.setFaddishDate(date);
                                 etlInfo.setFaddishDayNum(days);
@@ -145,7 +145,7 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                                 }
                             }
                             if(null == etlInfo.getFaddishDayNum()){
-                                if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                                if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                     //此刻成为爆款
                                     etlInfo.setFaddishDate(date);
                                     etlInfo.setFaddishDayNum(days);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java

@@ -110,7 +110,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                                 etlInfo.setEffectDate(date);
                                 etlInfo.setEffectDayNum(days);
                             }
-                            if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                            if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                 //此刻成为爆款
                                 etlInfo.setFaddishDate(date);
                                 etlInfo.setFaddishDayNum(days);
@@ -145,7 +145,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                                 }
                             }
                             if(null == etlInfo.getFaddishDayNum()){
-                                if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                                if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                     //此刻成为爆款
                                     etlInfo.setFaddishDate(date);
                                     etlInfo.setFaddishDayNum(days);