xufei 8 maanden geleden
bovenliggende
commit
85416ab49f
2 gewijzigde bestanden met toevoegingen van 36 en 110 verwijderingen
  1. 2 2
      src/main/java/com/winhc/bigdata/udf/DataToStr.java
  2. 34 108
      src/main/resources/table_schema.json

+ 2 - 2
src/main/java/com/winhc/bigdata/udf/DataToStr.java

@@ -33,7 +33,7 @@ public class DataToStr extends UDF {
         return odps;
     }
 
-    static List<String> tns = Arrays.asList("company", "company_holder", "company_staff", "private_enterprise", /*"finance_info_v3",*/ "company_liquidating_info",
+    static List<String> tns = Arrays.asList("company", "company_holder", "company_staff", "private_enterprise", "company_liquidating_info",
             "company_change", "company_annual_report", "company_annual_report_out_investment", "company_annual_report_out_guarantee",
             "company_annual_report_change", "company_annual_report_equity_change", "company_annual_report_holder", "company_annual_report_webinfo",
             "company_annual_report_social_security", "company_dishonest_info", "company_zxr", "company_zxr_restrict", "company_zxr_final_case",
@@ -43,7 +43,7 @@ public class DataToStr extends UDF {
             "company_equity_info", "company_mortgage_info", "company_mortgage_pawn", "company_mortgage_change", "company_mortgage_people",
             "company_env_punishment", "company_tax_contravention", "company_own_tax", "company_illegal_info", "company_brief_cancel_announcement",
             "company_brief_cancel_announcement_objection", "company_brief_cancel_announcement_result", "company_equity_pledge", "company_ipr_pledge",
-            "cancellation_announcement", "company_bid_new", "company_employment", "company_certificate", "company_customs_credit",
+            "cancellation_announcement", "company_bid_all", "company_employment", "company_certificate", "company_customs_credit",
             "company_customs_credit_administrative_penalty", "company_customs_credit_rating", "company_license_creditchina_new", "company_land_publicity",
             "company_land_announcement", "company_land_transfer", "company_land_mortgage", "company_tax", "company_finance", "company_check_info",
             "property_rights_transaction", "company_double_random_check_info", "company_double_random_check_result_info", "company_tm", "company_tm_notice",

+ 34 - 108
src/main/resources/table_schema.json

@@ -1303,6 +1303,10 @@
     {
       "name": "area_info",
       "type": "STRING"
+    },
+    {
+      "name": "case_reason",
+      "type": "STRING"
     }
   ],
   "company_certificate": [
@@ -2393,9 +2397,17 @@
     {
       "name": "deleted",
       "type": "BIGINT"
+    },
+    {
+      "name": "party_info_new",
+      "type": "STRING"
+    },
+    {
+      "name": "area_info",
+      "type": "STRING"
     }
   ],
-  "company_bid_new": [
+  "company_bid_all": [
     {
       "name": "rowkey",
       "type": "STRING"
@@ -2438,7 +2450,7 @@
     },
     {
       "name": "industry",
-      "type": "STRING"
+      "type": "BIGINT"
     },
     {
       "name": "type",
@@ -2449,12 +2461,12 @@
       "type": "STRING"
     },
     {
-      "name": "wtbamtes",
-      "type": "STRING"
+      "name": "budget",
+      "type": "DOUBLE"
     },
     {
-      "name": "budget",
-      "type": "STRING"
+      "name": "wtbamtes",
+      "type": "DOUBLE"
     },
     {
       "name": "province_code",
@@ -2473,14 +2485,6 @@
       "type": "STRING"
     },
     {
-      "name": "phone",
-      "type": "STRING"
-    },
-    {
-      "name": "items",
-      "type": "STRING"
-    },
-    {
       "name": "create_time",
       "type": "DATETIME"
     },
@@ -2491,6 +2495,22 @@
     {
       "name": "deleted",
       "type": "BIGINT"
+    },
+    {
+      "name": "main_type",
+      "type": "STRING"
+    },
+    {
+      "name": "notice_type_sub",
+      "type": "STRING"
+    },
+    {
+      "name": "content_url",
+      "type": "STRING"
+    },
+    {
+      "name": "winner_candidate",
+      "type": "STRING"
     }
   ],
   "company_annual_report_out_guarantee": [
@@ -5849,100 +5869,6 @@
       "type": "BIGINT"
     }
   ],
-  "finance_info_v3": [
-    {
-      "name": "rowkey",
-      "type": "STRING"
-    },
-    {
-      "name": "company_id",
-      "type": "STRING"
-    },
-    {
-      "name": "company_name",
-      "type": "STRING"
-    },
-    {
-      "name": "year",
-      "type": "STRING"
-    },
-    {
-      "name": "assgro",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "assgro_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "liagro",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "liagro_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "vendinc",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "vendinc_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "maibusinc",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "maibusinc_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "progro",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "progro_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "netinc",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "netinc_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "ratgro",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "ratgro_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "totequ",
-      "type": "DOUBLE"
-    },
-    {
-      "name": "totequ_dis",
-      "type": "STRING"
-    },
-    {
-      "name": "create_time",
-      "type": "DATETIME"
-    },
-    {
-      "name": "update_time",
-      "type": "DATETIME"
-    },
-    {
-      "name": "deleted",
-      "type": "BIGINT"
-    }
-  ],
   "company_mortgage_pawn": [
     {
       "name": "rowkey",