Explorar o código

Merge #2 into master from pingkang

adq产品报表

* pingkang: (2 commits)
  adq产品报表
  adq产品报表

Signed-off-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-adq/change/2
huangpingkang hai 1 ano
pai
achega
6905419588

+ 0 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqAssetReportDaily.java

@@ -15,7 +15,6 @@ public class AdqAssetReportDaily {
     private Long adgroupId; // 广告组ID
     private String adgroupName; // 广告组名称
     private Long marketingAssetId; // 产品ID
-    private String siteSet; // 广告版位
     private String marketingTargetType; // 产品类型
     private BigDecimal cost; // 消耗
     private Long viewCount; // 展示

+ 0 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAssetReportMapper.xml

@@ -9,7 +9,6 @@
         adgroup_id,
         adgroup_name,
         marketing_asset_id,
-        site_set,
         marketing_target_type,
         cost,
         view_count,
@@ -33,7 +32,6 @@
             #{item.adgroupId},
             #{item.adgroupName},
             #{item.marketingAssetId},
-            #{item.siteSet},
             #{item.marketingTargetType},
             #{item.cost},
             #{item.viewCount},

+ 2 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAssetReportServiceImpl.java

@@ -39,8 +39,8 @@ public class AdqAssetReportServiceImpl implements IAdqAssetReportService {
             paramsMap.put("account_id", advertiserId);
             paramsMap.put("level", "REPORT_LEVEL_MARKETING_ASSET");
             paramsMap.put("date_range", new JSONObject().fluentPut("start_date", startDate).fluentPut("end_date", endDate));
-            paramsMap.put("group_by", new JSONArray(Arrays.asList("date", "adgroup_id", "marketing_target_type", "marketing_asset_id", "site_set")));
-            paramsMap.put("fields", new JSONArray(Arrays.asList("date", "account_id", "adgroup_id", "adgroup_name", "marketing_target_type", "marketing_asset_id", "site_set", "cost", "view_count", "valid_click_count", "conversions_count", "deep_conversions_count", "activated_count", "reg_pv", "retention_count", "video_outer_play_count", "video_outer_play100_count", "key_behavior_conversions_count", "purchase_pv", "purchase_amount", "first_pay_count")));
+            paramsMap.put("group_by", new JSONArray(Arrays.asList("date", "adgroup_id", "marketing_target_type", "marketing_asset_id")));
+            paramsMap.put("fields", new JSONArray(Arrays.asList("date", "account_id", "adgroup_id", "adgroup_name", "marketing_target_type", "marketing_asset_id", "cost", "view_count", "valid_click_count", "conversions_count", "deep_conversions_count", "activated_count", "reg_pv", "retention_count", "video_outer_play_count", "video_outer_play100_count", "key_behavior_conversions_count", "purchase_pv", "purchase_amount", "first_pay_count")));
             List<AdqAssetReportDaily> dailies = new ArrayList<>();
             HashMap<String, Set<String>> assetIdsMap = new HashMap<>();
             String s = HttpUtils.httpGet("https://api.e.qq.com/v3.0/daily_reports/get", paramsMap, null);

+ 0 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqRetryReportServiceImpl.java

@@ -29,8 +29,6 @@ import java.util.concurrent.Executors;
 public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
     @Autowired
     private AdqCreativeReportMapper adqReportMapper;
-    private static String sendUrl = "http://172.16.0.108:8765/webhook/media_report";
-    private static ExecutorService sendExecutorService = Executors.newFixedThreadPool(5);
     @Autowired
     private AdqAccountReportMapper accountReportMapper;
     @Autowired