Explorar o código

调整批量跨账户

yumeng %!s(int64=4) %!d(string=hai) anos
pai
achega
a4cd7b0345

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

@@ -226,6 +226,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                 QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
                 indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
                 indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
+                indicatorQueryWrapper.eq("media_type", template.getMediaType());
                 indicatorQueryWrapper.last("limit 1");
                 RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
                 if (!Check.isNull(ruleIndicator)) {
@@ -334,6 +335,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                     QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
                     indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
                     indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
+                    indicatorQueryWrapper.eq("media_type", template.getMediaType());
                     indicatorQueryWrapper.last("limit 1");
                     RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);  // 查询指标的详情信息
                     if (!Check.isNull(ruleIndicator)) {
@@ -396,6 +398,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                          */
                         QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
                         indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
+                        indicatorQueryWrapper.eq("media_type", template.getMediaType());
                         indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
                         indicatorQueryWrapper.last("limit 1");
                         RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper); // 查询基础规则的指标信息
@@ -478,6 +481,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                     QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
                     indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
                     indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
+                    indicatorQueryWrapper.eq("media_type", template.getMediaType());
                     indicatorQueryWrapper.last("limit 1");
                     RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
                     if (!Check.isNull(ruleIndicator)) {
@@ -515,6 +519,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                     QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
                     indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
                     indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
+                    indicatorQueryWrapper.eq("media_type", template.getMediaType());
                     indicatorQueryWrapper.last("limit 1");
                     RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
                     if (!Check.isNull(ruleIndicator)) {

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

@@ -5,8 +5,10 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,8 @@ public class CrossAccountBatchServiceImpl implements ICrossAccountBatchService {
             for (int j = 0; j < unitNames.size(); j++) {
                 String unitName = unitNames.getString(j);
                 if (!Check.isNull(unitName)) {
+                    String s = JSON.toJSONString(createUnitJson, SerializerFeature.DisableCircularReferenceDetect);
+                    createUnitJson = JSON.parseObject(s);
                     createUnitJson.remove("campaign_id");
                     createUnitJson.remove("unit_name");
                     createUnitJson.put("campaign_id", campaignId);
@@ -107,6 +111,9 @@ public class CrossAccountBatchServiceImpl implements ICrossAccountBatchService {
 
                 JSONObject createUnitJson = this.getCreateUnitJson(unitIdenticalJson);// 通用参数组装
                 for (int j = 0; j < unitNames.size(); j++) {
+                    String s = JSON.toJSONString(createUnitJson, SerializerFeature.DisableCircularReferenceDetect);
+                    createUnitJson = JSON.parseObject(s);
+
                     String unitName = unitNames.getString(j);
                     createUnitJson.put("advertiser_id", oauthToken.getAccountId());
                     createUnitJson.put("access_token", oauthToken.getAccessToken());