fix: etl add app company category

3 files changed, 15 insertions, 2 deletions

diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/common/AppSketchLabel.java b/platform-etl/src/main/java/com/zdjizhi/etl/common/AppSketchLabel.java
index 82333c6..265e823 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/common/AppSketchLabel.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/common/AppSketchLabel.java
@@ -5,6 +5,7 @@ public class AppSketchLabel {
     private String category;
     private String subCategory;
     private String appCompany;
+    private String appCompanyCategory;
 
     public String getAppName() {
         return appName;
@@ -38,12 +39,22 @@ public class AppSketchLabel {
         this.subCategory = subCategory;
     }
 
+    public String getAppCompanyCategory() {
+        return appCompanyCategory;
+    }
+
+    public void setAppCompanyCategory(String appCompanyCategory) {
+        this.appCompanyCategory = appCompanyCategory;
+    }
+
     @Override
     public String toString() {
         return "AppSketchLabel{" +
                 "appName='" + appName + '\'' +
                 ", category='" + category + '\'' +
+                ", subCategory='" + subCategory + '\'' +
                 ", appCompany='" + appCompany + '\'' +
+                ", appCompanyCategory='" + appCompanyCategory + '\'' +
                 '}';
     }
 }
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
index 4779bbb..b191723 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
@@ -185,9 +185,8 @@ public class KnowledgeManager {
                 needColumns.add("app_name");
                 needColumns.add("app_category");
                 needColumns.add("app_subcategory");
-                needColumns.add("app_risk");
-                needColumns.add("app_is_protocol");
                 needColumns.add("app_company");
+                needColumns.add("app_company_category");
                 HighCsvReader highCsvReader = new HighCsvReader(reader, needColumns);
                 AppUtils.readCsv(highCsvReader);
             }
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
index da7695f..a8350f8 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
@@ -24,12 +24,14 @@ public class AppUtils {
                 String category = line.get("app_category");
                 String subCategory = line.get("app_subcategory");
                 String appCompany = line.get("app_company");
+                String appCompanyCategory = line.get("app_company_category");
 
                 AppSketchLabel appSketchLabel = new AppSketchLabel();
                 appSketchLabel.setAppName(appName);
                 appSketchLabel.setCategory(category);
                 appSketchLabel.setSubCategory(subCategory);
                 appSketchLabel.setAppCompany(appCompany);
+                appSketchLabel.setAppCompanyCategory(appCompanyCategory);
 
                 newAppMap.put(appSketchLabel.getAppName(), appSketchLabel);
             } catch (Exception lineException) {
@@ -48,6 +50,7 @@ public class AppUtils {
                     entity.setApp_subcategory(appSketchLabel.getSubCategory());
                     entity.setApp_category(appSketchLabel.getCategory());
                     entity.setApp_company(appSketchLabel.getAppCompany());
+                    entity.setApp_company_category(appSketchLabel.getAppCompanyCategory());
                 }
             }else {
                 entity.setCommon_app_label(null);