增加IP vertex属性COMMON_LINK_INFO

4 files changed, 24 insertions, 4 deletions

diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/dao/BaseArangoData.java b/IP-learning-graph/src/main/java/cn/ac/iie/dao/BaseArangoData.java
index c0334e4..45cebee 100644
--- a/IP-learning-graph/src/main/java/cn/ac/iie/dao/BaseArangoData.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/dao/BaseArangoData.java
@@ -10,6 +10,8 @@ import com.arangodb.entity.BaseEdgeDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -49,6 +51,23 @@ public class BaseArangoData {
         LOG.info("读取ArangoDb时间："+(lastA - startA));
     }
 
+    public static void main(String[] args) {
+        new BaseArangoData().readHistoryData("IP", v_Ip_Map);
+        threadPool.shutdown();
+        threadPool.awaitThreadTask();
+        ArrayList<BaseEdgeDocument> baseEdgeDocuments = new ArrayList<>();
+        Enumeration<String> keys = v_Ip_Map.keys();
+        while (keys.hasMoreElements()){
+            String key = keys.nextElement();
+            BaseEdgeDocument baseEdgeDocument = v_Ip_Map.get(key);
+            baseEdgeDocument.addAttribute("COMMON_LINK_INFO","");
+            baseEdgeDocuments.add(baseEdgeDocument);
+        }
+        arangoDBConnect.overwrite(baseEdgeDocuments,"IP");
+        arangoDBConnect.clean();
+
+    }
+
     private void readHistoryData(String table, ConcurrentHashMap<String, BaseEdgeDocument> map){
         try {
             long[] timeRange = getTimeRange(table);
diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadClickhouseData.java b/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadClickhouseData.java
index a07e907..d75742e 100644
--- a/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadClickhouseData.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadClickhouseData.java
@@ -59,6 +59,7 @@ public class ReadClickhouseData {
                 newDoc.addAttribute("CLIENT_BYTES_SUM",0L);
                 break;
         }
+        newDoc.addAttribute("COMMON_LINK_INFO","");
         return newDoc;
     }
 
diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadHistoryArangoData.java b/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadHistoryArangoData.java
index 1c62ced..623b66f 100644
--- a/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadHistoryArangoData.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/service/read/ReadHistoryArangoData.java
@@ -39,7 +39,7 @@ public class ReadHistoryArangoData extends Thread {
                 i++;
             }
             long l = System.currentTimeMillis();
-            LOG.info(query+ "\n处理IP数据" + i + "条，运行时间：" + (l - s));
+            LOG.info(query+ "\n处理数据" + i + "条，运行时间：" + (l - s));
         }
     }
 }
diff --git a/IP-learning-graph/src/main/resources/application.properties b/IP-learning-graph/src/main/resources/application.properties
index 25c29c4..58749b2 100644
--- a/IP-learning-graph/src/main/resources/application.properties
+++ b/IP-learning-graph/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #arangoDB参数配置
-arangoDB.host=192.168.40.182
+arangoDB.host=192.168.40.127
 arangoDB.port=8529
 arangoDB.user=root
 arangoDB.password=111111
@@ -13,6 +13,6 @@ update.arango.batch=10000
 thread.pool.number=10
 thread.await.termination.time=10
 
-read.clickhouse.max.time=1594695278
+read.clickhouse.max.time=1594809098
 #read.clickhouse.min.time=1594622638
-read.clickhouse.min.time=1593705600
\ No newline at end of file
+read.clickhouse.min.time=1593792000
\ No newline at end of file