فهرست منبع

添加转化目标字段;
添加删除历史数据的逻辑

syh 4 سال پیش
والد
کامیت
84eaf6c0fb
12فایلهای تغییر یافته به همراه82 افزوده شده و 22 حذف شده
  1. 16 1
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/ByteDancePlanRuleDataJob.java
  2. 8 5
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/RuleDataAccountCleanJob.java
  3. 8 1
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataAccountCleanJob.java
  4. 8 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataPlanCleanJob.java
  5. 11 4
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataTargetCleanJob.java
  6. 11 1
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataUnitCleanJob.java
  7. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IRuleKuaiShouAccountService.java
  8. 4 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IRuleKuaiShouPlanService.java
  9. 3 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouAccountServiceImpl.java
  10. 3 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java
  11. 4 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IRuleByteDanceAccountService.java
  12. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/RuleByteDanceAccountServiceImpl.java

+ 16 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/ByteDancePlanRuleDataJob.java

@@ -2,6 +2,8 @@ package cn.com.ctop.job.bytedance.handler;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IRuleDataPlanService;
+import cn.com.ctop.common.module.service.IRuleDataTargetService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -9,7 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -19,11 +23,22 @@ public class ByteDancePlanRuleDataJob {
     private ICtopOauthTokenService tokenService;
     @Autowired
     private IReportService reportService;
+    @Autowired
+    private IRuleDataPlanService ruleDataPlanService;
+    @Autowired
+    private IRuleDataTargetService ruleDataTargetService;
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
     @XxlJob("bytedancePlanRuleLoadJob")
     public void execute() throws Exception {
         Date date = new Date();
         List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
-        tokens.forEach(token -> executorService.submit(()->reportService.getAdvertiserPlanRuleData(token,date,date,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY)));
+        tokens.forEach(token -> executorService.submit(()->{
+            //1:删除历史数据
+            Map<String,Object> params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleDataPlanService.removeByMap(params);
+            ruleDataTargetService.removeByMap(params);
+            reportService.getAdvertiserPlanRuleData(token,date,date, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+        }));
     }
 }

+ 8 - 5
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/RuleDataAccountCleanJob.java

@@ -12,25 +12,28 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 @Component
 public class RuleDataAccountCleanJob {
-
     @Autowired
     private ICtopOauthTokenService oauthTokenService;
-
     @Autowired
     private IRuleByteDanceAccountService ruleByteDanceAccountService;
-
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
-
     @XxlJob("ruleDataAccountCleanJob")
     public void execute() throws Exception {
         XxlJobHelper.log("规则预警账户维度数据开始清洗");
         List<CtopOauthToken> tokens = oauthTokenService.selectToutiaoToken();
-        tokens.forEach(token -> executorService.submit(()->ruleByteDanceAccountService.cleanRuleDataAccount(token.getAccountId())));
+        tokens.forEach(token -> executorService.submit(()->{
+            Map<String,Object> params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleByteDanceAccountService.removeByMap(params);
+            ruleByteDanceAccountService.cleanRuleDataAccount(token.getAccountId());
+        }));
     }
 }

+ 8 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataAccountCleanJob.java

@@ -8,7 +8,9 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -26,6 +28,11 @@ public class RuleKuaiShouDataAccountCleanJob {
     public void execute() throws Exception {
         XxlJobHelper.log("规则预警账户维度数据开始清洗");
         List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
-        tokens.forEach(token -> executorService.submit(()->ruleKuaiShouAccountService.cleanRuleDataAccount(token.getAccountId())));
+        tokens.forEach(token -> executorService.submit(()->{
+            Map<String,Object> params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleKuaiShouAccountService.removeByMap(params);
+            ruleKuaiShouAccountService.cleanRuleDataAccount(token.getAccountId());
+        }));
     }
 }

+ 8 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataPlanCleanJob.java

@@ -8,7 +8,9 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -16,16 +18,19 @@ import java.util.concurrent.Executors;
 public class RuleKuaiShouDataPlanCleanJob {
     @Autowired
     private ICtopOauthTokenService oauthTokenService;
-
     @Autowired
     private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
-
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     @XxlJob("ruleKuaiShouDataPlanCleanJob")
     public void execute() throws Exception {
         XxlJobHelper.log("规则预警计划维度数据开始清洗");
         List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
-        tokens.forEach(token -> executorService.submit(()->ruleKuaiShouPlanService.cleanRuleDataPlan(token.getAccountId(),1)));
+        tokens.forEach(token -> executorService.submit(()->{
+            Map<String,Object> params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleKuaiShouPlanService.removeByMap(params);
+            ruleKuaiShouPlanService.cleanRuleDataPlan(token.getAccountId(),1);
+        }));
     }
 }

+ 11 - 4
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataTargetCleanJob.java

@@ -2,14 +2,16 @@ package cn.com.ctop.job.kuaishou.handler;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IRuleDataTargetKuaishouService;
 import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouPlanService;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -17,17 +19,22 @@ import java.util.concurrent.Executors;
 public class RuleKuaiShouDataTargetCleanJob {
     @Autowired
     private ICtopOauthTokenService oauthTokenService;
-
     @Autowired
     private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
-
+    @Autowired
+    private IRuleDataTargetKuaishouService ruleDataTargetKuaishouService;
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     @XxlJob("ruleKuaiShouDataTargetCleanJob")
     public void execute() throws Exception {
         XxlJobHelper.log("规则预警定向维度数据开始清洗");
         List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
-        tokens.forEach(token -> executorService.submit(() -> ruleKuaiShouPlanService.cleanRuleDataTarget(token.getAccountId(), 1)));
+        tokens.forEach(token -> executorService.submit(() ->{
+            Map<String,Object>params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleDataTargetKuaishouService.removeByMap(params);
+            ruleKuaiShouPlanService.cleanRuleDataTarget(token.getAccountId(), 1);
+        }));
     }
 
 }

+ 11 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataUnitCleanJob.java

@@ -2,6 +2,7 @@ package cn.com.ctop.job.kuaishou.handler;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IRuleDataUnitKuaishouService;
 import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouPlanService;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -9,7 +10,9 @@ import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 @Component
@@ -19,6 +22,8 @@ public class RuleKuaiShouDataUnitCleanJob {
 
     @Autowired
     private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
+    @Autowired
+    private IRuleDataUnitKuaishouService ruleDataUnitKuaishouService;
 
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
 
@@ -26,7 +31,12 @@ public class RuleKuaiShouDataUnitCleanJob {
     public void execute() throws Exception {
         XxlJobHelper.log("规则预警组维度数据开始清洗");
         List<CtopOauthToken> tokens = oauthTokenService.selectKuaiShouToken();
-        tokens.forEach(token -> executorService.submit(() -> ruleKuaiShouPlanService.cleanRuleDataUnit(token.getAccountId(), DateUtils.date2Str(), DateUtils.date2Str(), 1)));
+        tokens.forEach(token -> executorService.submit(() -> {
+            Map<String,Object>params = new HashMap<>();
+            params.put("account_id",token.getAccountId());
+            ruleDataUnitKuaishouService.removeByMap(params);
+            ruleKuaiShouPlanService.cleanRuleDataUnit(token.getAccountId(), DateUtils.date2Str(), DateUtils.date2Str(), 1);
+        }));
     }
 
 }

+ 3 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IRuleKuaiShouAccountService.java

@@ -1,7 +1,8 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
-public interface IRuleKuaiShouAccountService {
+import cn.com.ctop.common.module.entity.RuleDataAccountKuaishou;
+import com.baomidou.mybatisplus.extension.service.IService;
 
+public interface IRuleKuaiShouAccountService extends IService<RuleDataAccountKuaishou> {
     void cleanRuleDataAccount(Long accountId);
-
 }

+ 4 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IRuleKuaiShouPlanService.java

@@ -1,9 +1,12 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
+import cn.com.ctop.common.module.entity.RuleDatePlanKuaishou;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 /**
  *  快手规则引擎数据清洗;计划、组、定向
  */
-public interface IRuleKuaiShouPlanService {
+public interface IRuleKuaiShouPlanService extends IService<RuleDatePlanKuaishou> {
 
     /**
      *  计划

+ 3 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouAccountServiceImpl.java

@@ -2,17 +2,19 @@ package cn.com.ctop.kuaishou.modules.report.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.RuleDataAccountKuaishou;
+import cn.com.ctop.common.module.mapper.RuleDataAccountKuaishouMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.IRuleDataAccountKuaishouService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouGetAccountFundService;
 import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouAccountService;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RuleKuaiShouAccountServiceImpl implements IRuleKuaiShouAccountService {
+public class RuleKuaiShouAccountServiceImpl extends ServiceImpl<RuleDataAccountKuaishouMapper, RuleDataAccountKuaishou> implements IRuleKuaiShouAccountService {
 
     @Autowired
     IKuaiShouGetAccountFundService kuaiShouGetAccountFundService;

+ 3 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.ctop.kuaishou.modules.report.service.impl;
 import cn.com.ctop.common.module.entity.RuleDataTargetKuaishou;
 import cn.com.ctop.common.module.entity.RuleDatePlanKuaishou;
 import cn.com.ctop.common.module.entity.RuleDateUnitKuaishou;
+import cn.com.ctop.common.module.mapper.RuleDatePlanKuaishouMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.IRuleDataTargetKuaishouService;
 import cn.com.ctop.common.module.service.IRuleDataUnitKuaishouService;
@@ -15,6 +16,7 @@ import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouPlanService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.context.XxlJobHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class RuleKuaiShouPlanServiceImpl implements IRuleKuaiShouPlanService {
+public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaishouMapper, RuleDatePlanKuaishou>  implements IRuleKuaiShouPlanService {
 
     @Autowired
     ICtopOauthTokenService oauthTokenService;

+ 4 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IRuleByteDanceAccountService.java

@@ -1,6 +1,9 @@
 package cn.com.ctop.toutiao.modules.report.service;
 
-public interface IRuleByteDanceAccountService {
+import cn.com.ctop.common.module.entity.RuleDataAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IRuleByteDanceAccountService extends IService<RuleDataAccount> {
 
     void cleanRuleDataAccount(Long accountId);
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/RuleByteDanceAccountServiceImpl.java

@@ -2,16 +2,18 @@ package cn.com.ctop.toutiao.modules.report.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.RuleDataAccount;
+import cn.com.ctop.common.module.mapper.RuleDataAccountMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.IRuleDataAccountService;
 import cn.com.ctop.toutiao.modules.report.service.IRuleByteDanceAccountService;
 import cn.com.ctop.toutiao.modules.tool.service.IByteDanceGetAccountFundService;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RuleByteDanceAccountServiceImpl implements IRuleByteDanceAccountService {
+public class RuleByteDanceAccountServiceImpl extends ServiceImpl<RuleDataAccountMapper, RuleDataAccount> implements IRuleByteDanceAccountService {
 
     @Autowired
     IByteDanceGetAccountFundService byteDanceGetAccountFundService;