Переглянути джерело

Merge remote-tracking branch 'origin/master'

liyuyi@c-top.com.cn 4 роки тому
батько
коміт
1ca23c05c2

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/service/impl/AiStrategyServiceImpl.java

@@ -87,7 +87,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
         // {'highQualityMaterial':{'days':7, 'num':5},'newMaterialNum':5}
         // TODO 更新该账户下的 ctop_kuaishou_video_get 数据
 
-        kuaishouInterfaceService.getSuZaoList(token.getAccessToken(),accountId,1,DateUtils.date2Str(),DateUtils.date2Str());
+        kuaishouInterfaceService.getVideoList(token,DateUtils.date2Str(),DateUtils.date2Str());
 
         JSONObject MaterialSelectMethod = JSONObject.parseObject(strategyTemplate.getMaterialSelectMethod());
         List<KuaiShouVideoGet> newVideos = new ArrayList<KuaiShouVideoGet>();

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

@@ -344,6 +344,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                         ruleJson.put("dataUnit", ruleIndicator.getDataUnit());
                         ruleJson.put("name", ruleIndicator.getName());
                         ruleJson.put("modelType", ruleIndicator.getModelType());
+                        ruleJson.put("requestUrl", ruleIndicator.getRequestUrl());
                     }
 
                     ruleDetail.add(ruleJson);
@@ -490,6 +491,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                         ruleJson.put("dataUnit", ruleIndicator.getDataUnit());
                         ruleJson.put("name", ruleIndicator.getName());
                         ruleJson.put("modelType", ruleIndicator.getModelType());
+                        ruleJson.put("requestUrl", ruleIndicator.getRequestUrl());
                     }
 
                     ruleDetail.add(ruleJson);