push

src/main/java/com/winhc/task/common/SummaryArgs.java

@@ -777,6 +777,74 @@ public class SummaryArgs {
                         , "online_retailers_del_1"))
                 , (j) -> Collections.singletonList(j.getString("company_id"))
         ));
+        a.put("finance_info_v3", new SummaryArgs(
+                "ng_rt_finance_info_v3"
+                , Arrays.asList(
+                new ArgsInfo(
+                        "company_id"
+                        , ""
+                        , "deleted"
+                ),
+                new ArgsInfo(
+                        "company_id"
+                        , ""
+                        , "deleted"
+                        , " and vendinc_dis = '1' "
+                        , "dis"
+                )
+        )
+                , Arrays.asList(new ValueAlias(
+                        ""
+                        , "0"
+                        , "finance_info_v3_del_0"),
+                new ValueAlias(
+                        ""
+                        , "1"
+                        , "finance_info_v3_del_1"),
+                new ValueAlias(
+                        ""
+                        , "0"
+                        , "finance_info_v3_dis_0"),
+                new ValueAlias(
+                        ""
+                        , "1"
+                        , "finance_info_v3_dis_1")
+
+        )
+                , (j) -> Collections.singletonList(j.getString("company_id"))
+        ));
+        a.put("private_enterprise", new SummaryArgs(
+                "ng_rt_private_enterprise"
+                , Collections.singletonList(new ArgsInfo(
+                "company_id"
+                , ""
+                , "deleted"))
+                , Arrays.asList(new ValueAlias(
+                        ""
+                        , "0"
+                        , "private_enterprise_del_0"),
+                new ValueAlias(
+                        ""
+                        , "1"
+                        , "private_enterprise_del_1"))
+                , (j) -> Collections.singletonList(j.getString("company_id"))
+        ));
+        a.put("company_annual_report", new SummaryArgs(
+                "ng_rt_company_annual_report"
+                , Collections.singletonList(new ArgsInfo(
+                "company_id"
+                , ""
+                , "deleted"))
+                , Arrays.asList(new ValueAlias(
+                        ""
+                        , "0"
+                        , "company_annual_report_del_0"),
+                new ValueAlias(
+                        ""
+                        , "1"
+                        , "company_annual_report_del_1"))
+                , (j) -> Collections.singletonList(j.getString("company_id"))
+        ));
         return a;
     }
 
@@ -786,6 +854,8 @@ public class SummaryArgs {
         public String filterField;
         private String category;
         private String groupField;
+        private String condition = "";
+        private String type = "del";
 
 
         public ArgsInfo(String filterField, String category, String groupField) {
@@ -793,6 +863,14 @@ public class SummaryArgs {
             this.category = category;
             this.groupField = groupField;
         }
+
+        public ArgsInfo(String filterField, String category, String groupField, String condition, String type) {
+            this.filterField = filterField;
+            this.category = category;
+            this.groupField = groupField;
+            this.condition = condition;
+            this.type = type;
+        }
     }
 
     @Data

src/main/java/com/winhc/task/job/CalcSummaryJob.java

@@ -50,7 +50,7 @@ public class CalcSummaryJob {
             multipleSynHoloJob.start(tnList, jobArgs);
         }
         //切换个人,公司索引到生产
-        //switch_index(jobArgs, summary_company, summary_person, tnList);
+        switch_index(jobArgs, summary_company, summary_person, tnList);
 
     }
 
@@ -112,7 +112,9 @@ public class CalcSummaryJob {
                             m.put("category", "");
                         }
                         m.put("groupField", a.getGroupField());
-                        m.put("condition", "in ('0','1')");
+                        m.put("condition", a.getCondition());
+                        m.put("condition2", "in ('0','1')");
+                        m.put("type", a.getType());
                         return freeMarkUtil.genStr("agg_sample_v1.ftl", m);
                     }).collect(Collectors.joining("\nUNION ALL\n"));
                     Map<String, String> m2 = new HashMap<>();

src/main/resources/application.yml

@@ -23,8 +23,8 @@ spring:
 es:
   username: elastic
   password: elastic_168
-  #host: es-cn-oew22t8bw002iferu.public.elasticsearch.aliyuncs.com #new
-  host: es-cn-0pp0r32zf000ipovd.public.elasticsearch.aliyuncs.com
+  host: es-cn-oew22t8bw002iferu.public.elasticsearch.aliyuncs.com #new
+  #host: es-cn-0pp0r32zf000ipovd.public.elasticsearch.aliyuncs.com
 
 hbase:
   config:

src/main/resources/templates/agg_sample_v1.ftl

@@ -6,9 +6,10 @@ FROM    (
                     ,COUNT(1) AS cnt
             FROM    (
                         SELECT  unnest(${keyno}) AS id
-                                ,CONCAT('${tn}_del_',${groupField},'${category}') AS groupField
+                                ,CONCAT('${tn}_${type}_',${groupField},'${category}') AS groupField
                         FROM    ng_rt_${tn}
-                       WHERE   ${groupField} ${condition}
+                       WHERE   ${groupField} ${condition2}
+                               ${condition}
                     ) a
             WHERE   LENGTH(id) >= 32
             GROUP BY id

src/test/java/com/winhc/task/DataWorksSummaryJob.java

@@ -37,7 +37,11 @@ public class DataWorksSummaryJob {
         //List<String> add = Arrays.asList("high_tech_enterprise");
         //List<String> add = Arrays.asList("company_brief_cancel_announcement");
         //List<String> add = Arrays.asList("online_retailers");
-        List<String> add = Arrays.asList("company_change");
+        //List<String> add = Arrays.asList("company_change");
+        //List<String> add = Arrays.asList("finance_info_v3", "private_enterprise");
+        //List<String> add = Arrays.asList("finance_info_v3");
+        List<String> add = Arrays.asList("private_enterprise");
+        //List<String> add = Arrays.asList("company_annual_report");
         //List<String> add = Arrays.asList("cancellation_announcement");
         //List<String> add = Arrays.asList("bankruptcy_open_case");
         //List<String> add = Arrays.asList("company_double_random_check_info");