Explorar el Código

Merge branch 'test' into test-report

# Conflicts:
#	jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
#	module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
yumeng hace 5 años
padre
commit
427d0d090e

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -251,6 +251,7 @@ public class CallbackController {
             if (code == 0) {
             if (code == 0) {
                 return "授权绑定成功";
                 return "授权绑定成功";
             }
             }
+            logger.info("返回信息:{}", map.toString());
         }
         }
         return "授权绑定失败";
         return "授权绑定失败";
     }
     }
@@ -345,7 +346,6 @@ public class CallbackController {
             int i = allocationMapper.insert(userAllocation);
             int i = allocationMapper.insert(userAllocation);
             if (i > 0) {
             if (i > 0) {
                 logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, token.getAccountId());
                 logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, token.getAccountId());
-
             }
             }
             //账号绑定
             //账号绑定
             bindAccountAuthService.addBindAccount(token.getAccountId(), KuaishouInterfaceConstant.LOGIN_TYPE_BYTEDANCE, advertiserId);
             bindAccountAuthService.addBindAccount(token.getAccountId(), KuaishouInterfaceConstant.LOGIN_TYPE_BYTEDANCE, advertiserId);

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/ByteDanceCleanMaterialJob.java

@@ -40,8 +40,6 @@ public class ByteDanceCleanMaterialJob implements Job {
                         }
                         }
                     });
                     });
                 }
                 }
-
-
             }
             }
         };
         };
         thread.start();
         thread.start();

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceCreativeDailyReportLoadJob.java

@@ -44,7 +44,7 @@ public class BytedanceCreativeDailyReportLoadJob implements Job {
             executorService.submit(new Runnable() {
             executorService.submit(new Runnable() {
                 @Override
                 @Override
                 public void run() {
                 public void run() {
-                    //4: 获取广告创意信息数据
+                    //获取广告创意信息数据
                     reportService.getAdvertiserCreativeReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
                     reportService.getAdvertiserCreativeReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
                 }
                 }
             });
             });

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanDailyReportLoadJob.java

@@ -51,6 +51,7 @@ public class BytedancePlanDailyReportLoadJob implements Job {
         planDailyReportService.cleanChannelCodeData(222, getDate);
         planDailyReportService.cleanChannelCodeData(222, getDate);
         planDailyReportService.cleanYzData(151);
         planDailyReportService.cleanYzData(151);
         planDailyReportService.cleanChannelCodeData(235, getDate);
         planDailyReportService.cleanChannelCodeData(235, getDate);
+        planDailyReportService.cleanChannelCodeData(270, getDate);
     }
     }
 
 
     private void formatZybData(Integer projectId, Date getDate) {
     private void formatZybData(Integer projectId, Date getDate) {

+ 21 - 18
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyCreativeReportLoadJob.java

@@ -51,31 +51,33 @@ public class KuaishouDailyCreativeReportLoadJob implements Job {
                     log.info("定时获取快手数据异常:未获取到可用的token");
                     log.info("定时获取快手数据异常:未获取到可用的token");
                     return;
                     return;
                 }
                 }
-                log.info("开始分天创意报表拉去完成");
                 for (CtopOauthToken token : tokens) {
                 for (CtopOauthToken token : tokens) {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
+                    try {
+                        log.info("获取创意分天报表开始,accountId:{}", token.getAccountId());
+                        kuaishouInterfaceService.getCampaignList(token, null, null);
+                        sleep(5 * 100);
+                        List<JSONArray> campaigns = campaignService.getJsonArrByAccount(token.getAccountId(), 50);
+                        if (!Check.isNull(campaigns) && campaigns.size() > 0) {
+                            for (int i = 0; i < campaigns.size(); i++) {
+                                JSONArray campaignIds = (JSONArray) JSONArray.parse(campaigns.get(i).toJSONString());
+                                executorService.submit(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        try {
+                                            kuaishouInterfaceService.getAdvertiserCreativeReportDaily(token, getDate, getDate, campaignIds);
+                                        } catch (Exception e) {
+                                            log.info("获取创意日报失败,accountId:{}", token.getAccountId());
+                                        }
 
 
-                            try {
-                                log.info("获取创意分天报表开始,accountId:{}", token.getAccountId());
-                                kuaishouInterfaceService.getCampaignList(token, null, null);
-                                sleep(5 * 100);
-                                List<JSONArray> campaigns = campaignService.getJsonArrByAccount(token.getAccountId(), 20);
-                                if (!Check.isNull(campaigns) && campaigns.size() > 0) {
-                                    for (int i = 0; i < campaigns.size(); i++) {
-                                        JSONArray campaignIds = (JSONArray) JSONArray.parse(campaigns.get(i).toJSONString());
-                                        kuaishouInterfaceService.getAdvertiserCreativeReportDaily(token, getDate, getDate, campaignIds);
                                     }
                                     }
+                                });
 
 
-                                }
-                            } catch (Exception e) {
-                                e.printStackTrace();
                             }
                             }
 
 
-
                         }
                         }
-                    });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 
 
 
 
                 }
                 }
@@ -84,4 +86,5 @@ public class KuaishouDailyCreativeReportLoadJob implements Job {
         thread.start();
         thread.start();
 
 
     }
     }
+
 }
 }

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceConfig.java

@@ -29,9 +29,9 @@ public class PerformanceConfig {
     /**
     /**
      * id
      * id
      */
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
     /**
      * year
      * year
      */
      */