测试环境，图谱连接232

重新加载归一词库

graph/src/main/java/org/diagbot/graph/jdbc/DriverManager.java

@@ -21,7 +21,7 @@ public class DriverManager {
     public static Driver newDrive() throws Exception {
         //            driver = GraphDatabase.driver("bolt://192.168.3.112:7687", AuthTokens.basic("neo4j", "123456"),
         if( driver == null){
-            driver = GraphDatabase.driver(propertiesUtil.getProperty("bolt.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt.user"), propertiesUtil.getProperty("bolt.passwd")),
+            driver = GraphDatabase.driver(propertiesUtil.getProperty("bolt232.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt232.user"), propertiesUtil.getProperty("bolt232.passwd")),
                     Config.build().withMaxConnectionLifetime(ConnLifeTime, TimeUnit.MINUTES)
                             .withMaxTransactionRetryTime(TransRetryTime, TimeUnit.SECONDS)
                             .withMaxConnectionPoolSize(ConnPoolSize)

graph/src/main/java/org/diagbot/graph/util/CacheUtil.java

@@ -41,13 +41,16 @@ public class CacheUtil {
             diagClassifyJiMap = new HashMap<>();
             List<String> contentList = configuration.readFileContents(path);
             String diagName =null,bigdiagName=null;
-            String[] diagSort =null;
+            String[] diagSort =null;String[] split = null;
             for (String s:contentList) {
                 String[] splits = s.split("\\|");
                 if (splits.length >= 2) {
                     diagName = splits[0].trim();//疾病本体
                     bigdiagName = splits[1].trim();//疾病大类
-                    diagClassifyJiMap.put(bigdiagName, 2);
+                    split = bigdiagName.split("\\、");
+                    for (String dis:split) {
+                        diagClassifyJiMap.put(dis, 2);
+                    }
                     diagClassifyJiMap.put(diagName,1);
                     if (splits.length == 3) {
                         diagSort = splits[2].split("\\、");
@@ -70,13 +73,18 @@ public class CacheUtil {
             diagClassifyMap = new HashMap<>();
             List<String> contentList = configuration.readFileContents(path);
             String diagName =null,bigdiagName=null;
-            String[] diagSort =null;
+            String[] diagSort =null;String[] split =null;
             for (String s:contentList) {
                 String[] splits = s.split("\\|");
                 if (splits.length >= 2) {
                     diagName = splits[0].trim();//疾病本体
                     bigdiagName = splits[1].trim();//疾病大类
-                    diagClassifyMap.put(bigdiagName, diagName);
+                    split = bigdiagName.split("\\、");
+                    for (String dis:split
+                         ) {
+                        diagClassifyMap.put(dis, diagName);
+                    }
+
                     if (splits.length == 3) {
                         diagSort = splits[2].split("\\、");
                         for (String dis : diagSort) {

graph/src/main/resources/diagClassify.dict

@@ -1,85 +1,18 @@
-de3O9146cmVps3llnokVH/VEHVNVSAf28NI2uzoIb1z+V0UU9rhi8c3bJ7ybsBJaPe8Dwi16GCWsj2KV4MFGvM2XHsPM5/7vsdnMld18khWHuidZqDP+S0Wp2ks4E38XyKOlDzIs7nh+60vzmgZck5I2f4ckLQ9q42uDOadsTHSQBwvCoRnyrEpgEZ36UZf7
-de3O9146cmXZ5vyqQrfGtukh+7ztl8Scn6MXF+Z9t7fx4lhYgvw9OMPL84gmGlXsfs16bsXBopowp2rr+8BdkLp8TLAofH0HdJu/Z+f8mccjaiE1wLfZ+x8Giqn81mC6mdV44oVYWXs9HDN2zZEu56/KAMhd1mfFgjLDcveXrBQ=
-RjlHunEZKP2G6qnHcET7YTx6dEKKWoowYO2o3LGxGdY23pVlp5apnLVBc+kE13yRZTyV0HA939d+2CGuyJ4UnIpLC2SKAD9H8AYG2/+cSQ24Sb7MZ3N6O5RkShZvNXKYmtLrLqmUWy/SL0jCg7w0/lscz3JraR1+3VaP952Z3DTcLM1uKWDR6A==
-RjlHunEZKP02Kkkiv0cRsiGHkf3LOZUbZI/MOgENdU2bEOW86axfL7to9BzcCtKahNoLIiRKQB8VPtQeE0un6in3rGXqQ9cgmDhL+xvjqaO3QuGz77WkKFKzqC2ioHZHcJFNOdGnR2UwvUHjuaLnow==
-RjlHunEZKP1GqRWsmFqF81oMQ9o6jaGMqgbmc8d/drwHpeF8StNMmLqkgcaEPLA2NmRR3v2oqUiIlPb4AjSslFRhE/a8+rwPeiS9ZqV5MvouV2aR/RfOvAK52fy6HUOW
-RjlHunEZKP1f+Xw9ovIrqcMr3qlunGaOWLjpsZqBN36EAj7YjHwO5qdyxmZIFYPUaZnjn25t1FT1SMSdWfQ/gVv+iloFmS1z3Rp/oMp3XHix/kIn2HDUIvHEcMY6pkofs4F4is8JibLcSDgtAdzlN3bdEINoILZYreaFev21BvOHzlGaNyDwBE5apQIQsswN
-E0zofMTBmeiphs0iC7vrYX7YIa7InhScmITlQMM4zbJKYBGd+lGX+w==
-E0zofMTBmehahrKxgKIgQX7YIa7InhScmITlQMM4zbJKYBGd+lGX+w==
-tQqyk3JtpQSNfLuFP5mqIW/uRY6g7LFfAGUEiTffJOyEpbnjoZrXUYLNngz5p3CVTdIEyhnewGKCzZ4M+adwlfqfhjFiqMCHN8t1HUmMTUA=
-tQqyk3JtpQSrwHa0tVAPXG/uRY6g7LFfwzwjLiQhaQ0=
-QY8HRySr7Iwnp75iBJ/VjxOIU+zd8rQ7cYUk/dpHC/JKYBGd+lGX+w==
-QY8HRySr7Iwnp75iBJ/VjxOIU+zd8rQ7tWx+IEiJ7o0H1mThJ7gSoQ==
-QY8HRySr7Iwnp75iBJ/VjxOIU+zd8rQ7Tdp+mfnukBbq1KNjixCbjqzLO3h9qz3/
-QY8HRySr7Iwnp75iBJ/Vj6EartQd+Ruay09JTFOMHIhDrVTSChjG5A==
-QY8HRySr7Iwnp75iBJ/Vj6EartQd+RuaGIuDViimEJ0H1mThJ7gSoQ==
-QY8HRySr7Iwnp75iBJ/Vj1JJXUSpiAOlcH7SKfLT/pRKYBGd+lGX+w==
-QY8HRySr7Iwnp75iBJ/Vj+3XaTjV4VFOlsI/pFsgIb0u2WJVxeidQQ==
-8+/D6NypjddUIm92l3iN1Uuc/0bs8CvPrxAz4u4zi3IpsfANTRsS4dsQ+5pETXBQ
-8+/D6NypjddUIm92l3iN1RMRyZFpCIgsrxAz4u4zi3IpsfANTRsS4dsQ+5pETXBQ
-8+/D6NypjddUIm92l3iN1YWxPHbyuaEKIuydduvnnjTfijPDjIJtLyQOE5CeChrCuipopyTOKsSI5/HVtv3JTB6mtWVDEwMM17fWhB9R3z3h5IIo8JsBGQ==
-kRGK26rRVysm9pMK7wBhWY2iGQ2rccVyPBQSiGlnxKE=
-kRGK26rRVyu7GwwTQ0WXNg46yEXvENcfIVOt7Mod6Ps5mxVKRDBSCg==
-kRGK26rRVysbQDyBW1xUyY2iGQ2rccVyPBQSiGlnxKE=
-2jobYaE9hqn8wIoqdezhvDzj8cdKEnQiQD7P1WAVSwE=
-2jobYaE9hqnnX/mA/TOQdzzj8cdKEnQiQD7P1WAVSwE=
-2jobYaE9hqnnO9xH0Ng8qDzj8cdKEnQiQD7P1WAVSwE=
-2jobYaE9hqkdrVgoS621cI2iGQ2rccVyQD7P1WAVSwE=
-R9zWPlPSlOpvMc6gf+vo7Efc1j5T0pTq3wJeT9uIdw05t9ci1V8G6Nw5/wmoKh/O5CMgpfNuLotH3NY+U9KU6oWv11PkPSA5s81M06l2LDO6wJm6v4silcFa8MKldzceUmuF4sVj1cJ/Jdns96y0KQ==
-R9zWPlPSlOop+RSWAxFgMUfc1j5T0pTqKfkUlgMRYDGhFIZjGCZUD7nsKOkjGOTnVS+ckNNMZizw7oZqIGR94V6Xsia9y8izND5C1/8FKOcgYT3Owlb7u7nsKOkjGOTneIBrCjmIqzU=
-IMHDeNUnTX3SlsLfTPun+tNTGLrlDClHlXCORo2NvvVMWLNz9VqNyoF8LbGqawR/o+AtTpkfT0fV2ph/NDZqdx9PJEtEyOk0Pyiqohw0HR5KYBGd+lGX+w==
-IMHDeNUnTX1u8/ancQDeY9NTGLrlDClHp8xbmibDDV4hZB/+Q/mDHohTLf8Zf1l0yGZD8NTwpOWFRcQAa4tQJ3X/rgUvMKpTs0PSXx3SYXQ=
-oRqu1B35G5r1/K/2KIYDNKfNXG7WEEJn702NvF+A5Xg5mxVKRDBSCg==
-oRqu1B35G5ogwCx/aPoyzbss9owqky3e702NvF+A5Xg5mxVKRDBSCg==
-oRqu1B35G5pqKPvVOJ6IDY6ePH8PSWuRjAZ7I7cMHAK73XHYC6Akpw==
-oRqu1B35G5rjlkbWMKMO6yDKFNAVOJBp702NvF+A5Xg5mxVKRDBSCg==
-VC7rkUAh+6IOJyqFdqvYFmjLG7423xrFESItu0JlyWy73XHYC6Akpw==
-VC7rkUAh+6IOJyqFdqvYFmHwQjShON9fhw48h4qdOM5KYBGd+lGX+w==
-VC7rkUAh+6IOJyqFdqvYFi/gyc0psbeQKR0EVmN5m61Rim+G22KkXKzLO3h9qz3/
-VC7rkUAh+6IOJyqFdqvYFmY/MQi6NG5NyZd8+R27AhUvph5mChmg9A==
-VC7rkUAh+6IOJyqFdqvYFhOHROczP9gSXVtBpnZT9jSWsjKN6/+kCA==
-VC7rkUAh+6IOJyqFdqvYFkadxTWJUjJdyAUIJrCEc/BKYBGd+lGX+w==
-VC7rkUAh+6IOJyqFdqvYFn+AbILNUy1H15zd/uzdHgu4+VkLqXY4pHscRNkoXg8TU6UFXXTaYukdes/JyFc0OX+PGO+FqW9GTXFiR5BKDCwCHXX318BY8w==
-8n8zV92Zv6l9KDxIQfEX1nZbyBjxZ5kKV/Hp2+gZRugZ2wSwovQtcSypSfvlaemr
-8n8zV92Zv6l9KDxIQfEX1gYGst0L0VxA+txv0nfiE8G7v2Ten8/zVKzLO3h9qz3/
-8n8zV92Zv6nu8xwJpBGB7iXzbbppK2Zs+txv0nfiE8F1Lzfp/5wLX6zLO3h9qz3/
-8n8zV92Zv6nu8xwJpBGB7qfcarVHiWLlnIJ40LYYnBZhG8ICDAGyzA==
-8n8zV92Zv6nu8xwJpBGB7n3e0abfH1gY+txv0nfiE8F1Lzfp/5wLX6zLO3h9qz3/
-lIV9YVV9QehYSuC/ANfdSTha8zxf3Hy7
-lIV9YVV9Qej64m/3BU/YLywD+mrUh5SymQWPqo/kQAvJ8Mk28bf8YWNK4ficpU19HZrzGFpPxwNTSceGqFwPgFflxwowVkH331fFGRCNymrCQD6zKKakDtiy4sQDGnt4qX1QP1Y2Xg1RFT0vSlnegD3cQA4BkkoHiZ50/t0z8Fnlob2Ye8rbnw==
-LAP6atSHlLIAuzNm8LfUwIa0FqldZgW45bV/y/cbl+A=
-LAP6atSHlLLt63zkPn/paYa0FqldZgW45bV/y/cbl+A=
-aoyMNdWOkHezBcuWAN69djha8zxf3Hy7
-lIV9YVV9QejkIyCl824uizha8zxf3Hy7
-LAP6atSHlLJw2EZUYZ9TOTha8zxf3Hy7
-LAP6atSHlLIqGEwAN87XepyzLvIGtX+Ol1M+9nQLrYQtpHqBV1Ei4WVeX46M4V00m0CcuRvPf+M=
-BklPGQplmWLohT4jcppA9F7IHDS5I2/n
-BklPGQplmWJrhbPpUhe2EArZxL5wy5xjb0zp3pbRbBgPSkwiuy+mJg==
-BklPGQplmWJrtdU0KGYRIKzLO3h9qz3/
-p9xqtUeJYuV763zk1n7SVFIPcgQwW0ctynkGSrhDIiOM60xJYFx0aQ==
-p9xqtUeJYuV763zk1n7SVPMvMCS4x4x/YiRu1ikKWf8Z2wSwovQtcRqv2V2sZD8x
-RDRqSmn8EECp5vSNnZ4Fp31H6jXXJjK2ht920Hnr08U=
-RDRqSmn8EEDnUswlzsbKMH1H6jXXJjK2ht920Hnr08U=
-RDRqSmn8EEARd2pG51aaHUQ0akpp/BBARZe8TU7WYyk=
-RDRqSmn8EEA0qE5jtnOUjH1H6jXXJjK2ht920Hnr08U=
-98gWtMm+tR625dg6mP2VTBRy4eqkKuM8Gavn/kkrqRE=
-98gWtMm+tR46By2e/5n/HhRy4eqkKuM82XJkOa9sRAG2GAYTx8FRgmG2db34U5XxuszESNIk33Clx351wwlsKK83lcSVJXQ9d1XUEvmLHidKYBGd+lGX+w==
-98gWtMm+tR6I6KaHZWPikBRy4eqkKuM8Gavn/kkrqRE=
-98gWtMm+tR4//yRAg62teBRy4eqkKuM8Gavn/kkrqRE=
-h381cyp+EIIktrquGmmwyM6srNo8HVLf
-Ss1fTwot0QhJWGMMdctgt86srNo8HVLf
-Ss1fTwot0QgPiXOCKP2zFM6srNo8HVLf
-8RfFan0pKMpvMc6gf+vo7PEXxWp9KSjKkAeuGME68RI=
-8RfFan0pKMop+RSWAxFgMfEXxWp9KSjKkAeuGME68RI=
-HoHtYSLcpapg4HdcdQdA3A+XWTgi8fuftWfOFeoJahFpwVFdsPOEkpg+d/HNBOcC8gqP/AVGyqdsq5QnV6lVQt4sQpkPgSzN
-HoHtYSLcpapyT1zqnSuFf1/0FM8ps6hPqcrbsmg5p84dJBcpwoJo/JFg8AHwKyJ0/ICc9j/VEAY=
+kQHtQ28+jmQArPJrd/bUjJEB7UNvPo5kaH9Yc7Wy6H+RAe1Dbz6OZHuruyPH85zpkQHtQ28+jmSSecxn6PopWA==
+9K+PZ38Hd/1bK60dslh9jD08xZT/RFfX6nQY8kcF6f6Q3pCfQMdEPfSvj2d/B3f9Tj6O+pMPrIRmq1tUfM7NXEw+ew7Midqlfcmfdvs36w05mxVKRDBSCg==
+csx+mzURhJ9wBHXy23rFCqELYR/Ge6SfJguv40zsenLdteW2LzNMtrg0JQEm9dDbB1G+0rUX/fo=
+bK8Zpab/PptNYls6bckCK2qOH6CihZwfKfesZepD1yCYOEv7G+Opo+vBv5hwZW/eVnsuGILD+YJwkU050adHZc9nrcMQ3QcNfldHWCrTN51y47LOmx/liqE23F9pxjrKlKBI0b+VWyI=
+B6XhfErTTJgvNY+AQau22C5XZpH9F868vBWNDVn69QQR0SGjmGqDDcCM58ZMX4o+ZXyFPMW0ii/Ny1CxCM0j0dpXXmClQOUaVGET9rz6vA+1//CUvL5M1g==
+ZBlMqkWFMgGKhXne6fxyMKv5big2S+NWojkRSVpz0yn6WMgWKDhc0+g7aXmzxY+BfWBnTB7jgAc=
+vtDo+c8/v9LFD8Zgufoub1pWh1AgRr/9GnymXXqYoBWbuNje0T36Dr3Q7oysbBqkX1Y5k+9viFNKYBGd+lGX+w==
+vGTRMHlT7dVn8NkcapuUf41gFgiCfJ2oDDOh4hMlCBwOIv27jCqunbxk0TB5U+3VD7FeNuUlO7/XGFua8Lqaah7XrZ4qqRttcq02pXq78Czy339ugWe7+R7XrZ4qqRttjLsAdbyDm5W+WpmiJ+a8SfqpmsxeaqFV
 x9PLCfVsCr/aY475fTCHFGhMbsgdvFwEdAst9qQci0LWQamxDzw1E7qpIkwJx9YsGlVBbqLl3urSDDpehmH9129vfFiy9pH8kCx6xYUnv5FKYBGd+lGX+w==
 x9PLCfVsCr/aY475fTCHFPXiKHRRn5b1dAst9qQci0IbixSDt+/ibotub2c2nK7+hNNemi/HhvrIKGxpbjCvzM5Kw2EKXOmOZvQ0DrEA+9k=
-WEck0+cxgSIjbkhvE0jRPBw91EHpsWRO
-WEck0+cxgSIjbkhvE0jRPJTYEeFyhgm3JxzpZJtLMQNKYBGd+lGX+w==
-Liq4+z+iHBbQC3hom0PzAIso9V888m13KiDzJFJhabu03GZdWL8lkDx5HY77PTBpcNQEpTpRXla03GZdWL8lkET0g0IOo8TG
-Liq4+z+iHBYKw1llIDNuU5Qw++y19ijkrrOwRuaa87u03GZdWL8lkJbWROriztT4xcrxFBQsXlC03GZdWL8lkET0g0IOo8TG
-9K+PZ38Hd/1bK60dslh9jD08xZT/RFfX3Xy+aWqbuA9KYBGd+lGX+w==
-9K+PZ38Hd/0lZB4l/ViRPT08xZT/RFfX3Xy+aWqbuA9KYBGd+lGX+w==
-entv5lp5ztFvMc6gf+vo7Hp7b+Zaec7RkAeuGME68RI=
-entv5lp5ztEp+RSWAxFgMXp7b+Zaec7RkAeuGME68RI=
+hUAdePKw8Fat5bAa8jA4IbW7c/rMKpvdCZ6MHlCTW0VVL5yQ00xmLGaoAlsMAZo7JB2Cqxd7RUo5mxVKRDBSCg==
+CfPzXQ015jpvMc6gf+vo7Anz810NNeY6bzHOoH/r6OwhBdCms1xkEXTyLF4g0UYOUWF4i03SHY1baeFjtzyIA230oq1zrgjpJNvo5Ld6H+No5oiZjWu7jg==
+CfPzXQ015jop+RSWAxFgMQnz810NNeY6kAeuGME68RI=
+AhKA2vBf73VVXxJdQdnvopTfpFBJIh3ZVRNG119aBmmWCEFlJOjxbFtp4WO3PIgDoqpU4KSD1ReQ3pCfQMdEPTS99G7VuQMc
+anqc376RwxF+Tyu5VoFlKqXxSD+f1O2vC5YOy19B3S1HJbFtXbY5u4s87+ChjgP9RyWxbV22ObuxUtK/+6g5z6zLO3h9qz3/
++8iGrGjQRQXLJRvWtAt1iYU809Pr5+wg80e6b34+k3qaoMeR3HYQyn6/oN57/v4WReElQJ+Fc6O3OV7VztniKXRpb7y0gLlK8W4jXgAgFfPwHLNp0tAohzUX4TxTFrGq
+8n8zV92Zv6lIoOZPZs0HwgrZxL5wy5xjD7Bi/O7j4pT7gtDvhBGfLPJ/M1fdmb+pEWTgRjnEzOg=
+u9VShjNiQLYp+RSWAxFgMbvVUoYzYkC2ltZE6uLO1Pi1rPvw0grsulq9P1+cZSODCwy1ps4giW8=

graph/src/test/java/org/diagbot/graph/CacheFile.java

@@ -46,7 +46,7 @@ public class CacheFile {
     }
     //疾病分类归一
     public void diagClassifyMaping(){
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

graphdb/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
     active: local
   data:
     neo4j:
-      uri: bolt://192.168.2.233:7687
+      uri: bolt://192.168.2.232:7687
       username: neo4j
       password: root