Merge #18 into master from pingkang

rebackPromotionInfo、rebackProjectInfo

* pingkang: (1 commits)
  rebackPromotionInfo、rebackProjectInfo

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-bytedance/change/18

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/controller/BytedanceController.java

@@ -1,19 +1,17 @@
 package cn.com.ctop.job.bytedance.controller;
 
-import cn.com.ctop.job.bytedance.data.service.*;
 import cn.com.ctop.job.bytedance.data.entity.AdvertiserAccount;
 import cn.com.ctop.job.bytedance.data.enums.AccountTypeEnum;
 import cn.com.ctop.job.bytedance.data.service.*;
 import cn.com.ctop.job.bytedance.data.utils.Check;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -52,14 +50,13 @@ public class BytedanceController {
     @Autowired
     private IBytedanceCdpProjectService cdpProjectService;
 
+
     @GetMapping("/accountReport")
     public void getChannel() {
 
         List<JSONObject> infos = adminAdvertiserListService.getAdvertiserInfosByAdminIds();
 
 
-
-
         for (int i = 0; i < infos.size(); i++) {
             JSONObject jsonObject = infos.get(i);
             Long advertiserId = jsonObject.getLong("advertiserId");
@@ -73,8 +70,8 @@ public class BytedanceController {
                         /*cdpProjectService.getProjectList(advertiserId, null);
                         cdpProjectService.getpromotionList(advertiserId, null);*/
 
-                   //     accountReportService.getBytedanceAccountDaily(advertiserId,accessToken,"2025-06-01","2025-06-03",1,1);
-                        promoterReportService.getBytedancePromoterDaily(advertiserId,accessToken,"2025-06-01","2025-06-03",1,1);
+                        //     accountReportService.getBytedanceAccountDaily(advertiserId,accessToken,"2025-06-01","2025-06-03",1,1);
+                        promoterReportService.getBytedancePromoterDaily(advertiserId, accessToken, "2025-06-01", "2025-06-03", 1, 1);
 
 
                     }
@@ -142,11 +139,63 @@ public class BytedanceController {
 
         });
     }
-    @Autowired
-    IBytedanceCdpProjectService bytedanceCdpProjectService;
+
+    /**
+     * 回调补全字节项目数据
+     */
+    @RequestMapping("/rebackProjectInfo")
+    public void rebackProjectInfo(@RequestBody JSONObject obj) {
+        log.info(obj.toJSONString());
+        if (!Check.isNull(obj)) {
+            Long advertiserId = obj.getLong("advertiser_id");
+            if (Check.isNull(advertiserId)) {
+                log.info("advertiser_id is null");
+                return;
+            }
+            String idsStr = obj.getString("ids");
+            if (Check.isNull(idsStr)) {
+                log.info("ids is null");
+                return;
+            }
+            JSONArray ids = new JSONArray(Arrays.asList(idsStr.split(",")));
+            if (ids.size() > 100) {
+                log.info("项目ID数不能超过100");
+                return;
+            }
+            cdpProjectService.getProjectList(advertiserId, ids, null, null);
+            cdpProjectService.getProjectList(advertiserId, ids, "del", null);
+        }
+    }
+
+    /**
+     * 回调补全字节广告数据
+     */
+    @RequestMapping("/rebackPromotionInfo")
+    public void rebackPromotionInfo(@RequestBody JSONObject obj) {
+        if (!Check.isNull(obj)) {
+            Long advertiserId = obj.getLong("advertiser_id");
+            if (Check.isNull(advertiserId)) {
+                log.info("advertiser_id is null");
+                return;
+            }
+            String idsStr = obj.getString("ids");
+            if (Check.isNull(idsStr)) {
+                log.info("ids is null");
+                return;
+            }
+            JSONArray ids = new JSONArray(Arrays.asList(idsStr.split(",")));
+            if (ids.size() > 100) {
+                log.info("项目ID数不能超过100");
+                return;
+            }
+            cdpProjectService.getpromotionList(advertiserId, ids, null);
+        }
+    }
+
+
     @GetMapping("/testB")
     public void testB(Long id) {
-        bytedanceCdpProjectService.getAdqCreatives(id, "2025-02-15");
+        cdpProjectService.getAdqCreatives(id, "2025-02-15");
     }
 
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/IBytedanceCdpProjectService.java

@@ -1,5 +1,7 @@
 package cn.com.ctop.job.bytedance.data.service;
 
+import com.alibaba.fastjson.JSONArray;
+
 import java.util.List;
 
 /**
@@ -10,9 +12,9 @@ import java.util.List;
  */
 public interface IBytedanceCdpProjectService {
 
-    void getpromotionList(Long advertiserId, String date);
+    void getpromotionList(Long advertiserId, JSONArray ids, String date);
 
-    void getProjectList(Long advertiserId, String date);
+    void getProjectList(Long advertiserId, JSONArray ids,String type, String date);
 
     List<Long> queryAllAdverIdList(String type);
 

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceCdpProjectServiceImpl.java

@@ -4,11 +4,7 @@ import cn.com.ctop.job.bytedance.data.entity.BytedanceCdpProject;
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceCdpProjectMapper;
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceRefreshTokenMapper;
 import cn.com.ctop.job.bytedance.data.service.IBytedanceCdpProjectService;
-import cn.com.ctop.job.bytedance.data.utils.Check;
-import cn.com.ctop.job.bytedance.data.utils.DateUtils;
-import cn.com.ctop.job.bytedance.data.utils.HttpUtils;
-import cn.com.ctop.job.bytedance.data.utils.Okhttp3Utils;
-import cn.com.ctop.job.bytedance.data.utils.RandomStringGenerator;
+import cn.com.ctop.job.bytedance.data.utils.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -77,11 +73,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
     }
 
     @Override
-    public void getpromotionList(Long advertiserId, String date) {
-        this.getpromotionListVo(advertiserId, date, 1, 1);
+    public void getpromotionList(Long advertiserId, JSONArray ids, String date) {
+        this.getpromotionListVo(advertiserId, ids, date, 1, 1);
     }
 
-    private void getpromotionListVo(Long advertiserId, String date, Integer page, int count) {
+    private void getpromotionListVo(Long advertiserId, JSONArray ids, String date, Integer page, int count) {
         try {
             log.info("执行id:{}", advertiserId);
             boolean nextPage = false;
@@ -97,6 +93,9 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                 filtering.put("promotion_modify_time", date);
             }
             filtering.put("status_first", "PROMOTION_STATUS_ALL");
+            if (!Check.isNull(ids)) {
+                filtering.put("ids", ids);
+            }
             params.put("filtering", filtering);
             params.put("page", page);
             params.put("page_size", 20);//最大20
@@ -116,11 +115,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         checkPromotionInfo(array.getJSONObject(i), advertiserId);
                     }
 
-                    if (!Check.isNull(array)){
+                    if (!Check.isNull(array)) {
                         try {
                             bytedanceCdpProjectMapper.replaceBytedancePromotionListSD(array);
-                        }catch (Exception e){
-                            log.error("",e);
+                        } catch (Exception e) {
+                            log.error("", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceBytedancePromotionList(array) > 0)
                             log.info("---账户（{}）广告更新成功", advertiserId);
@@ -129,14 +128,14 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                     //40100请求超频
                     if (40100 == code && count <= 5) {
                         Thread.sleep(800);
-                        getpromotionListVo(advertiserId, date, page, count + 1);
+                        getpromotionListVo(advertiserId, ids, date, page, count + 1);
                     } else {
                         log.error("获取广告列表失败(url:{}),入参：{}\n结果：{}", url, JSONObject.toJSONString(params), obj);
                     }
                 }
             }
             if (nextPage) {
-                getpromotionListVo(advertiserId, date, page + 1, 1);
+                getpromotionListVo(advertiserId, ids, date, page + 1, 1);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -159,13 +158,14 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
     }
 
     @Override
-    public void getProjectList(Long advertiserId, String date) {
-        this.getProjectListVo(advertiserId, null, date, 1, 1);
+    public void getProjectList(Long advertiserId, JSONArray ids, String type, String date) {
+        this.getProjectListVo(advertiserId, ids, type, date, 1, 1);
 //        this.getProjectListVo(advertiserId, "del", date, 1, 1);
     }
 
-    private void getProjectListVo(Long advertiserId, String type, String date, Integer page, int count) {
+    private void getProjectListVo(Long advertiserId, JSONArray ids, String type, String date, Integer page, int count) {
         try {
+            System.out.println("advertiserId:" + advertiserId);
             boolean nextPage = false;
             String accessToken = tokenMapper.onlyGetToken(advertiserId);
             if (Check.isNull(accessToken)) {
@@ -183,11 +183,15 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                 filtering.put("project_modify_time", date);
             }
 
+            if (!Check.isNull(ids)) {
+                filtering.put("ids", ids);
+            }
             params.put("filtering", filtering);
             params.put("page", page);
             params.put("page_size", 100);//最大100
             String url = "https://api.oceanengine.com/open_api/v3.0/project/list/";
             String results = HttpUtils.httpGet(url, params, HttpUtils.postMHeaders(accessToken));
+            System.out.println(results);
             JSONObject obj = JSONObject.parseObject(results);
             if (!Check.isNull(obj)) {
                 Integer code = obj.getInteger("code");
@@ -203,11 +207,12 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         BytedanceCdpProject advertiserToolsSite = new BytedanceCdpProject(array.getJSONObject(i));
                         projectList.add(advertiserToolsSite);
                     }
-                    if (!Check.isNull(projectList)){
+                    if (!Check.isNull(projectList)) {
+                        System.out.println(projectList);
                         try {
                             bytedanceCdpProjectMapper.replaceBytedanceCdpProjectListSD(projectList);
-                        }catch (Exception e) {
-                            log.error("replaceBytedanceCdpProjectListSD",e);
+                        } catch (Exception e) {
+                            log.error("replaceBytedanceCdpProjectListSD", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceBytedanceCdpProjectList(projectList) > 0)
                             log.info("---账户（{}）项目信息更新成功", advertiserId);
@@ -216,14 +221,14 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                     //40100请求超频
                     if (40100 == code && count <= 5) {
                         Thread.sleep(800);
-                        getProjectListVo(advertiserId, type, date, page, count + 1);
+                        getProjectListVo(advertiserId, ids, type, date, page, count + 1);
                     } else {
                         log.error("获取项目列表失败(url:{}),入参：{}\n结果：{}", url, JSONObject.toJSONString(params), obj);
                     }
                 }
             }
             if (nextPage) {
-                getProjectListVo(advertiserId, type, date, page + 1, 1);
+                getProjectListVo(advertiserId, ids, type, date, page + 1, 1);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -326,11 +331,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         nextPage = true;
                     }
                     JSONArray list = data.getJSONArray("list");
-                    if (!Check.isNull(list)){
+                    if (!Check.isNull(list)) {
                         try {
                             bytedanceCdpProjectMapper.replaceBytedanceByteAppLinkInfoSD(list);
-                        }catch (Exception e) {
-                            log.error("",e);
+                        } catch (Exception e) {
+                            log.error("", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceBytedanceByteAppLinkInfo(list) > 0)
                             log.info("---账户（{}）抖小详情信息更新成功", advertiserId);
@@ -394,11 +399,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         nextPage = true;
                     }
                     JSONArray list = data.getJSONArray("list");
-                    if (!Check.isNull(list)){
+                    if (!Check.isNull(list)) {
                         try {
                             bytedanceCdpProjectMapper.replaceBytedanceWxAppInfoSD(list, advertiserId);
-                        }catch (Exception e) {
-                            log.error("",e);
+                        } catch (Exception e) {
+                            log.error("", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceBytedanceWxAppInfo(list, advertiserId) > 0)
                             log.info("---账户（{}）微小信息更新成功", advertiserId);
@@ -502,11 +507,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         JSONObject object = array.getJSONObject(i);
                         getAppId(object);
                     }
-                    if (!Check.isNull(array)){
+                    if (!Check.isNull(array)) {
                         try {
                             bytedanceCdpProjectMapper.replaceAdqDynamicCreateivesSD(array, accountId);
-                        }catch (Exception e) {
-                            log.error("",e);
+                        } catch (Exception e) {
+                            log.error("", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceAdqDynamicCreateives(array, accountId) > 0)
                             log.info("---账户（{}）广点通创意更新成功", accountId);
@@ -578,11 +583,11 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
                         JSONObject object = array.getJSONObject(i);
                         getPageAppId(object);
                     }
-                    if (!Check.isNull(array)){
+                    if (!Check.isNull(array)) {
                         try {
                             bytedanceCdpProjectMapper.replaceAdqDynamicPagesSD(array, accountId);
-                        }catch (Exception e) {
-                            log.error("",e);
+                        } catch (Exception e) {
+                            log.error("", e);
                         }
                         if (bytedanceCdpProjectMapper.replaceAdqDynamicPages(array, accountId) > 0)
                             log.info("---账户（{}）广点通落地页更新成功", accountId);

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceCdpProjectJob.java

@@ -42,7 +42,7 @@ public class BytedanceCdpProjectJob {
         List<Long> ids = cdpProjectService.queryAllAdverIdList("");
         if (!Check.isNull(ids)) {
             log.info("总数：{}", ids.size());
-            ids.forEach(id -> allService.submit(() -> cdpProjectService.getProjectList(id, null)
+            ids.forEach(id -> allService.submit(() -> cdpProjectService.getProjectList(id, null, null, null)
             ));
         }
     }
@@ -73,8 +73,8 @@ public class BytedanceCdpProjectJob {
             String today = DateUtils.getNowDate("yyyy-MM-dd");
             List<Long> nowAdIds = cdpProjectService.queryAdvertiserIds("bytedance_advertiser_report_hour", DateUtils.getYYMMDDTime(today));
             if (!Check.isNull(nowAdIds)) {
-                nowAdIds.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, today)));
-                nowAdIds.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, today)));
+                nowAdIds.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, null, null, today)));
+                nowAdIds.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, null, today)));
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -90,15 +90,15 @@ public class BytedanceCdpProjectJob {
             String yesterday = DateUtils.getNowAddDate("yyyy-MM-dd", -1);
             List<Long> adIds = cdpProjectService.queryAdvertiserIds("bytedance_advertiser_report_daily", DateUtils.getYYMMDDTime(yesterday));
             if (!Check.isNull(adIds)) {
-                adIds.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, yesterday)));
-                adIds.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, yesterday)));
+                adIds.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, null, null, yesterday)));
+                adIds.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, null, yesterday)));
             }
             //拉取前天数据
             String yesterday2 = DateUtils.getNowAddDate("yyyy-MM-dd", -2);
             List<Long> adIds2 = cdpProjectService.queryAdvertiserIds("bytedance_advertiser_report_daily", DateUtils.getYYMMDDTime(yesterday2));
             if (!Check.isNull(adIds2)) {
-                adIds2.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, yesterday2)));
-                adIds2.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, yesterday2)));
+                adIds2.forEach(id -> projectExecutorService.submit(() -> cdpProjectService.getProjectList(id, null, null, yesterday2)));
+                adIds2.forEach(id -> promExecutorService.submit(() -> cdpProjectService.getpromotionList(id, null, yesterday2)));
             }
         } catch (Exception e) {
             e.printStackTrace();