|
@@ -4,69 +4,18 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
import cn.com.ctop.common.module.enums.MaterialEnum;
|
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
|
-import cn.com.ctop.common.module.utils.Check;
|
|
|
-import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
-import cn.com.ctop.common.module.utils.HttpUtils;
|
|
|
-import cn.com.ctop.common.module.utils.JsonUtil;
|
|
|
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
|
-import cn.com.ctop.common.module.utils.PropertiesUtils;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionInfos;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionTypes;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDailyFlows;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListChildren;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListParent;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouTargetingTags;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouPopulation;
|
|
|
+import cn.com.ctop.common.module.utils.*;
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.entity.*;
|
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.vo.ConvertVo;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouAdvertiserBaseInfoMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouAppListMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouConversionInfosMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouConversionTypesMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouRegionListChildrenMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouRegionListParentMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouTargetingTagsMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAdvertiserBaseInfoService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyFlowsService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouOverRunSendMessageService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouPopulationService;
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IWarningOperationService;
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.mapper.*;
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.*;
|
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
|
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreative;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreativeStatistic;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyGroup;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyAccount;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCampaign;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreative;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreativeStatistic;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyGroup;
|
|
|
+import cn.com.ctop.kuaishou.modules.report.entity.*;
|
|
|
import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
|
|
|
import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
|
|
|
import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyGroupMapper;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCampaignService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCreativeService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCreativeStatisticService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyAccountService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyCampaignService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyCreativeService;
|
|
|
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyGroupService;
|
|
|
+import cn.com.ctop.kuaishou.modules.report.service.*;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -100,11 +49,7 @@ import java.io.IOException;
|
|
|
import java.lang.reflect.ParameterizedType;
|
|
|
import java.lang.reflect.Type;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
|
|
@@ -1016,9 +961,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
returnMap.put("success", true);
|
|
|
// 创建成功 拉取广告组信息
|
|
|
|
|
|
- Thread thread = new Thread(){
|
|
|
+ Thread thread = new Thread() {
|
|
|
@Override
|
|
|
- public void run(){
|
|
|
+ public void run() {
|
|
|
try {
|
|
|
Thread.sleep(500);
|
|
|
} catch (InterruptedException e) {
|
|
@@ -1291,7 +1236,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
String bidTypeStr = json.getString("bidType"); // 出价方式
|
|
|
JSONArray bidTypeArr = JSONArray.parseArray(bidTypeStr);
|
|
|
String ocpxActionTypeStr = json.getString("ocpxActionType"); // 优化目标
|
|
|
- JSONArray bidArr = JSONArray.parseArray(ocpxActionTypeStr);
|
|
|
+ JSONArray ocpxArr = JSONArray.parseArray(ocpxActionTypeStr);
|
|
|
if (!Check.isNull(details)) {
|
|
|
List<KuaiShouGroup> groups = new ArrayList<>();
|
|
|
for (int i = 0; i < details.size(); i++) {
|
|
@@ -1308,14 +1253,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
Integer put_status = detail.getInteger("put_status");
|
|
|
if (put_status == 1) { // 组状态为 投放中的
|
|
|
if (status != 15) { // 广告组状态为非暂停
|
|
|
- Boolean ocpxTrueOrFalse = false;
|
|
|
- for (int j = 0; j < bidArr.size(); j++) {
|
|
|
- Integer ocpxActionType = (Integer) bidArr.get(j);
|
|
|
- if (ocpxActionType.equals(ocpx_action_type)) {
|
|
|
- ocpxTrueOrFalse = true;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
Boolean bidTypeTrueOrFalse = false;
|
|
|
for (int j = 0; j < bidTypeArr.size(); j++) {
|
|
|
Integer bidType = (Integer) bidTypeArr.get(j);
|
|
@@ -1324,6 +1261,20 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ Boolean ocpxTrueOrFalse = false;
|
|
|
+ if (ocpx_action_type == 0) {
|
|
|
+ ocpxTrueOrFalse = true;
|
|
|
+ } else {
|
|
|
+ for (int j = 0; j < ocpxArr.size(); j++) {
|
|
|
+ Integer ocpxActionType = (Integer) ocpxArr.get(j);
|
|
|
+ if (ocpxActionType.equals(ocpx_action_type)) {
|
|
|
+ ocpxTrueOrFalse = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if (!bidTypeTrueOrFalse || !ocpxTrueOrFalse) { // 出价方式设置非法
|
|
|
if (day_budget > 500 * 1000 || day_budget == 0) { // 预算大于500 或者不限制预算 需要发送通知 并且进行暂停操作
|
|
|
executorBidTypeService.submit(new Runnable() {
|