1 files changed, 32 insertions, 25 deletions
diff --git a/script/neo4jcommand.py b/script/neo4jcommand.py
index 0aa8cdd..b12d509 100644
--- a/script/neo4jcommand.py
+++ b/script/neo4jcommand.py
@@ -36,42 +36,49 @@ WHERE n.IPType contains "6"
 RETURN n.IP as ip, n.ISP as isp,n.CCODE as ccode,n.COU as cou,n.PROV as prov, score  
 ORDER BY score DESC, ip ASC,isp ASC,ccode ASC,cou ASC,prov ASC limit 30'''
 
-
 # 节点邻居
-node_neighbors=''''''
-
-
+node_neighbors = '''MATCH(n:NodeResolver53{IP:'%s'})-[]->(m:NodeResolver53) RETURN m'''
 
-# IP关联数据
-IP_relate=''''''
+# 节点全部信息
 
+# IP关联数据，以地理位置代表
+IP_relate = '''MATCH (n:NodeResolver53)-[]->(m:NodeResolver53) 
+with n.LAT as flat,n.LNG as flng,m.LAT as tlat,m.LNG as tlng ,count(*) as c 
+RETURN flat,flng,tlat,tlng,c
+order by c DESC limit 10000
+'''
 
 # AS关联数据
-AS_relate=''''''
-
+AS_relate = '''
+MATCH(n:NodeResolver53)-[l:IP_LINK]->(d:NodeResolver53) 
+WITH n.AS AS fasn, d.AS AS tasn, count(*) AS c 
+RETURN fasn,tasn,c 
+order by c DESC limit 10000 
+'''
 
 # ISP关联数据
-ISP_relate=''''''
-
-
-# 所有节点信息
-all_node=''''''
-
+ISP_relate = '''MATCH(n:NodeResolver53)-[l:IP_LINK]->(d:NodeResolver53) 
+WITH n.ISP AS fisp, d.ISP AS tisp, count(*) AS c 
+RETURN fisp,tisp,c
+order by c DESC limit 10000'''
 
 # AS分布
-AS_dist=''''''
-
+AS_dist = '''MATCH(n:NodeResolver53{IPType:"v6"})
+ with n.AS as asn,count(*) as c 
+ RETURN asn,c
+ order by c DESC limit 10000
+ '''
 
 # ISP分布统计
-ISP_dist=''''''
+ISP_dist = '''MATCH(n:NodeResolver53{IPType:"v6"}) 
+with n.ISP as isp,count(*) as c 
+RETURN isp,c
+order by c DESC limit 10000
+'''
 
 # 国家分布统计
-cou_dist=''''''
-
-
-
-
-
+cou_dist = '''MATCH(n:NodeResolver53{IPType:"v6"}) with n.COU as cou,count(*) as c RETURN cou,c'''
+ccode_dist = '''MATCH(n:NodeResolver53{IPType:"v6"}) with n.CCODE as ccode,count(*) as c RETURN ccode,c'''
 
 # 双栈服务数量统计
 dualcountcypher = '''
@@ -114,7 +121,7 @@ v6count = '''
 match (n:NodeResolver53) where n.IPType contains "6" return count(n)'''
 
 delQuery = '''
-CALL apoc.periodic.commit("MATCH (n:NodeResolverQuery) WITH n LIMIT $limit DETACH DELETE n RETURN count(*)",{limit: 10000})
+CALL apoc.periodic.commit("MATCH (n:NodeResolverQuery) 
+WITH n LIMIT $limit DETACH DELETE n RETURN count(*)",{limit: 10000})
 YIELD updates, executions, runtime, batches 
 RETURN updates, executions, runtime, batches;'''
-