会员标签4.0

src/main/java/com/gic/spark/datasource/entity/DataSourceSharding.java

@@ -21,12 +21,13 @@ import java.util.List;
 public class DataSourceSharding extends DataSourceEntity {
     private ShardingConfig shardingConfig;
     private String targetTable;
+    private String configName;
+    public DataSourceSharding(String configName, String targetTable) {
 
-    public DataSourceSharding(String shardingConfig, String targetTable) {
-
-        System.out.println("shardingConfig==>"+shardingConfig+" ,targetTable==>"+targetTable);
+        System.out.println("configName==>"+configName+" ,targetTable==>"+targetTable);
+        this.configName=configName;
         sourceType = DataSourceType.MYSQL_SHARDING;
-        this.shardingConfig = ShardingConfigManager.getInstance().getCurrentShardingConfig(shardingConfig);
+        this.shardingConfig = ShardingConfigManager.getInstance().getCurrentShardingConfig(configName);
         this.targetTable = targetTable;
     }
 
@@ -40,7 +41,7 @@ public class DataSourceSharding extends DataSourceEntity {
 
     private void checkShardingConfigInit(){
         if(null==getShardingConfig()){
-            throw new RuntimeException("configName ["+shardingConfig+"] create ShardingConfig fail !");
+            throw new RuntimeException("configName ["+this.configName+"] create ShardingConfig fail !");
         }
     }
     @Override

src/main/java/com/gic/spark/filter/TagCurrentCouponNumFilter.java

@@ -24,7 +24,8 @@ import java.util.Set;
  */
 public class TagCurrentCouponNumFilter implements TagFilter {
 
-    private DataSourceSharding dataSourceSharding=new DataSourceSharding(AppEnvUtil.MARKETING_SHARDING, ConstantUtil.TAB_COUPON_LOG);
+    private DataSourceSharding dataSourceSharding=new DataSourceSharding(AppEnvUtil.MARKETING_SHARDING, ConstantUtil.TAB_MEMBER_USER);
+//    private DataSourceSharding dataSourceSharding=new DataSourceSharding(AppEnvUtil.MARKETING_SHARDING, ConstantUtil.TAB_COUPON_LOG);
     private static TagCurrentCouponNumFilter instance;
     public static TagCurrentCouponNumFilter getInstance() {
         if(null==instance){

src/main/java/com/gic/spark/tag/TagProcess.java

@@ -16,6 +16,7 @@ import com.gic.spark.entity.request.AbstractFilterRequest;
 import com.gic.spark.entity.table.TabSceneCrowd;
 import com.gic.spark.filter.*;
 import com.gic.spark.util.AppEnvUtil;
+import com.gic.spark.util.ConstantUtil;
 import com.gic.spark.util.DingtalkMessageUtil;
 import com.gic.spark.util.EsRequestUtil;
 import com.google.common.base.Joiner;
@@ -69,19 +70,17 @@ public class TagProcess {
     public void init(boolean isProd){
         this.isProduction=isProd;
         MysqlDatasource member4Datasource = new MysqlDatasource();
-
         if(isProduction){
             member4Datasource.setJdbcUrl("jdbc:mysql://10.0.0.6:3306/gic-member4.0" + JDBC_OPTIONS);
             member4Datasource.setUser("cdb_outerroot");
             member4Datasource.setPassword("@09ui%sbc09");
-            memberDatasource = new DataSourceSharding("member_sharding_4.0_prod", "tab_member_user");
         }else{
             member4Datasource.setJdbcUrl("jdbc:mysql://10.0.0.6:3306/gic-member4.0" + JDBC_OPTIONS);
             member4Datasource.setUser("cdb_outerroot");
             member4Datasource.setPassword("@09ui%sbc09");
-            memberDatasource = new DataSourceSharding("member_sharding_4.0_test", "tab_member_user");
         }
         mysqlRddManager=member4Datasource.buildRddManager();
+        memberDatasource = new DataSourceSharding(AppEnvUtil.MEMBER_SHARDING_4, ConstantUtil.TAB_MEMBER_USER);
 
         Dataset<TabSceneCrowd>sceneCrowdDataset=mysqlRddManager.getPojo("tab_scene_crowd", TabSceneCrowd.class,null)
                                                                 .filter(new Column("valid_flag").equalTo(1))
@@ -111,10 +110,10 @@ public class TagProcess {
 
     public void process(boolean extractData){
 
-        if(null!=memberDatasource){
-            System.out.println("memberDatasource==>"+memberDatasource.getHiveTableName());
-            System.out.println("memberDatasource==>"+memberDatasource.getSourceKey());
-        }
+//        if(null!=memberDatasource){
+//            System.out.println("memberDatasource==>"+memberDatasource.getHiveTableName());
+//            System.out.println("memberDatasource==>"+memberDatasource.getSourceKey());
+//        }
 
         Map<Integer, List<TagProcessEntity>> tagGroupByEnterpriseMap = new HashMap<>();
         Map<Long, TagFilter> tagIdToFilterMap = new HashMap();

src/main/java/com/gic/spark/util/ConstantUtil.java

@@ -7,7 +7,8 @@ package com.gic.spark.util;
  */
 public class ConstantUtil {
 
-    public static final String TAB_INTEGRAL_CU_CHANGE_LOG="tab_integral_cu_change_log";
+    public static final String TAB_MEMBER_USER="tab_member_user";
     public static final String TAB_COUPON_LOG="tab_coupon_log";
+    public static final String TAB_INTEGRAL_CU_CHANGE_LOG="tab_integral_cu_change_log";
     public static final String ADS_GIC_TRD_ECU_SALES_LABEL_D="demoads.ads_gic_trd_ecu_sales_label_d";
 }