yumeng 1 éve
szülő
commit
43f8eb5d93

+ 7 - 3
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/OauthTokenMapper.xml

@@ -30,10 +30,14 @@
     </select>
 
     <select id="getAgentTokens" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT access_token
+        SELECT account_id as 'accountId', access_token as  'accessToken'
         from `jeecg-boot`.ctop_oauth_token
-        WHERE media_id =1
-          AND update_time > DATE_FORMAT(now(),'%Y%m%d')
+        WHERE media_id = 1
+          and account_id in (
+                             73970348172,
+                             1640370875427848
+            )
+          AND update_time > DATE_FORMAT(now(), '%Y%m%d')
     </select>
 
 </mapper>

+ 2 - 1
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/IByteDanceAdvertiserDataService.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.job.bytedance.data.service;
 
 import cn.com.ctop.job.bytedance.data.entity.OauthToken;
+import com.alibaba.fastjson.JSONObject;
 
 import java.util.Map;
 
@@ -18,7 +19,7 @@ public interface IByteDanceAdvertiserDataService {
 
     void getPositionAdvertiserReport(OauthToken oauthToken, String yesterda, String yesterda1, String bytedanceReportTypeDaily);
 
-    void getAgentReport(OauthToken oauthToken, String startDate, String endDate);
+    void getAgentReport(JSONObject oauthToken, String startDate, String endDate);
 
     void getV3AdvertiserConfig(OauthToken oauthToken);
 

+ 7 - 7
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -633,10 +633,10 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
      */
     @Override
     public void getAgentReport(
-            OauthToken token, String startDate, String endDate) {
+            JSONObject token, String startDate, String endDate) {
         JSONObject jsonObject = new JSONObject();
         // 日报
-        jsonObject.put("agent_id", token.getAccountId());
+        jsonObject.put("agent_id", token.getLong("accountId"));
         jsonObject.put("start_date", startDate);
         jsonObject.put("end_date", endDate);
         jsonObject.put("page_size", 1000);
@@ -647,7 +647,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     /**
      * 获取代理商
      */
-    private void getAgentReportByPage(OauthToken token, JSONObject conditions, Integer page) {
+    private void getAgentReportByPage(JSONObject token, JSONObject conditions, Integer page) {
         conditions.put("page", page);
         SerializeConfig config = new SerializeConfig();
         config.propertyNamingStrategy = PropertyNamingStrategy.SnakeCase;
@@ -683,8 +683,8 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 e.printStackTrace();
                 log.info("获取代理商数据错误:{}", e.toString());
             }
-        }else{
-            log.error("获取代理商获取失败,结果:{}",getObject.getString("message"));
+        } else {
+            log.error("获取代理商获取失败,结果:{}", getObject.getString("message"));
             return;
         }
         page++;
@@ -703,10 +703,10 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
      * @param conditions
      * @return
      */
-    public JSONObject getAgentStat(OauthToken token, JSONObject conditions) {
+    public JSONObject getAgentStat(JSONObject token, JSONObject conditions) {
         // 请求地址
         String url = bytedanceApiUrl + BytedanceConstant.BYTEDANCE_V2_REPORT_AGENT_GET_V2;
-        return HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, conditions);
+        return HttpUtils.bytedanceGetRequest(token.getString("accessToken"), url, conditions);
     }
 
 

+ 4 - 12
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAgentLoadJob.java

@@ -47,18 +47,10 @@ public class BytedanceAgentLoadJob {
         String yesterda2 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
         String yesterda3 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
         for (JSONObject obj : tokens) {
-            OauthToken oauthToken = new OauthToken();
-            oauthToken.setAccessToken(obj.getString("access_token"));
-            oauthToken.setAccountId(73970348172L);
-            dailyExecutorService.submit(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            advertiserDataService.getAgentReport(oauthToken, yesterda, yesterda);
-                            advertiserDataService.getAgentReport(oauthToken, yesterda2, yesterda2);
-                            advertiserDataService.getAgentReport(oauthToken, yesterda3, yesterda3);
-                        }
-                    });
+            advertiserDataService.getAgentReport(obj, yesterda, yesterda);
+            advertiserDataService.getAgentReport(obj, yesterda2, yesterda2);
+            advertiserDataService.getAgentReport(obj, yesterda3, yesterda3);
+
         }
 
     }