Forráskód Böngészése

Merge remote-tracking branch 'origin/V1.1.3' into V1.1.3

syh 4 éve
szülő
commit
5e03ef5228

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

@@ -1,16 +1,27 @@
 package cn.com.ctop.job.kuaishou.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 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 KuaiShouAlarmRuleJob {
     @Autowired
     private IRuleGroupService ruleGroupService;
 
+    @Autowired
+    private RuleAccountTemplateMapper ruleAccountTemplateMapper;
+    String URLPREFIX = "http://jiaoyangapi.shyouteng.com.cn/jeecg-boot/ruleGroup/checkRulesByAccountId?accountId=";
     /**
      * 定时任务
      *
@@ -21,6 +32,16 @@ public class KuaiShouAlarmRuleJob {
      */
     @XxlJob("kuaiShoualarmRuleJob")
     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);
+            });
+        }
     }
 }

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

@@ -181,7 +181,6 @@ 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());
@@ -200,7 +199,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 } else {
                     returnJson.put("code", -1);
                     returnJson.put("message", unitMap.get("message"));
-                    returnJson.put("type", 1);
+
                 }
                 returnArr.add(returnJson);
             } catch (Exception e) {
@@ -208,7 +207,6 @@ 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);
             }
         }
@@ -303,10 +301,11 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 Map<String, Object> creativeMap = iKuaishouInterfaceService.creativeCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
                 JSONObject returnJson = new JSONObject();
                 returnJson.put("creative_uuid", creative_uuid);
+                returnJson.put("unit_id", unit_id);
+                returnJson.put("type", 1);
                 if ((Integer) creativeMap.get("code") == 0) {
                     Long creativeId = (Long) creativeMap.get("creativeId");
                     returnJson.put("creative_id", creativeId);
-                    returnJson.put("unit_id", unit_id);
                     returnJson.put("code", 0);
                     returnJson.put("message", "广告创意创建成功");
                 } else {
@@ -320,6 +319,8 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 returnJson.put("creative_uuid", creative_uuid);
                 returnJson.put("message", e.getMessage());
                 returnJson.put("code", -1);
+                returnJson.put("unit_id", unit_id);
+                returnJson.put("type", 1);
                 returnArr.add(returnJson);
             }
         }
@@ -400,15 +401,14 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             JSONObject resultJson = JSONObject.parseObject(result);
             JSONObject returnJson = new JSONObject();
             returnJson.put("creative_uuid", creative_uuid);
+            returnJson.put("unit_id", unit_id);
+            returnJson.put("type", 2);
             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"));
                 }
             }
@@ -418,8 +418,9 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             JSONObject returnJson = new JSONObject();
             returnJson.put("creative_uuid", creative_uuid);
             returnJson.put("message", e.getMessage());
-            returnJson.put("type", 2);
             returnJson.put("code", -1);
+            returnJson.put("unit_id", unit_id);
+            returnJson.put("type", 2);
             returnArray.add(returnJson);
         }
         callback(creativeUrl, returnArray, "program_create");