1、数据文件更新，数据库链接121

bigdata-web/src/main/resources/doc_result_mapping_diag.dict

@@ -81,6 +81,7 @@ jnQH++UTPaibBHhE3G65A5OH5JCq/vF1WhqDUIQPQGM=
 de3O9146cmULVgLDGsMmxnAul+X1XFtHy4x6AQXguls=
 9UQdU1VIB/Ztd8WtUYdrl/znlgPCB6PWstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
 zybTgccYrmvNZmfBQxP52cK0z0/1KIV28K8JgXllPjTLjHoBBeC6Ww==
+9U2iKDgg7A8Fwc85LPgI0O/1mwKFPYtV1K7XQRHlBMM=
 kdU8UcCILZA2zqe2dEz9kO/1mwKFPYtV1K7XQRHlBMM=
 x9ZTV7gEMRCi91Qg24vlA75amaIn5rxJIrRdP5MeE9j1rLaDeGOQwfOj8LtFg+GJ
 FQUi8oWeKA22mkhDBQ8Od0ffVX1Kx6/gaXBl6wZu5y0=
@@ -410,7 +411,6 @@ su0V2rk2gah2w8q8JxH30WL6uHlLqsog
 GPdd2yIwWWesOniOA5cBq41ncbSjshCEmQCWLXtYoTFPfX7y11TKwA==
 mtIyd1Hqz2UxOjWwaO+5DiH/h1pywZ5c0pCfO/z5g6Y=
 1MHev69zrjZj004btOAkes94cw1mrZqiQE1oNjRzv0A=
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhDYCbiEbl34508wX/qhzBqr0pgEZ36UZf7
 EjAf+Fk40oLXv2qPN2R841D8sLBRuvnPVj3R0+P6Ke796uutIWsx7JC4iPbph9qG
 it7CAuuV7SAxR6MAda5351Pq3vaS3WGD
 IS3trY+w1C5ped3RWFjnRS7e/oaau9gAXpBSJ5uhUAo=

bigdata-web/src/test/java/org/diagbot/CacheFileManagerTest.java

@@ -26,7 +26,7 @@ public class CacheFileManagerTest {
     }
 
     public void contextMappingInitialized() {
-        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;

graph/src/main/resources/sexAge.dict

@@ -592,7 +592,7 @@ QXHaYAMJQ7/FvRrnmgaMCQ==
 j5r7gucVUZPp5ZxWLLR5AS349p/6d3y8
 Lz3xBm67RkVVyamDmYnpfjGNMMvXHJmC
 kQHtQ28+jmRWIB83VXJqByyrN35xm8Fe
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhDf9e/2UjqI0fFvRrnmgaMCQ==
+9U2iKDgg7A8Fwc85LPgI0GDbMrtym4KUeKotPWLsEqA=
 mtIyd1Hqz2UxOjWwaO+5Dj8PLzc11tWsQax04aCP8eU=
 fDYkXHftmz8W40YEz3OcstSGSakSJUzZeKotPWLsEqA=
 it7CAuuV7SAxR6MAda5356QPEZGpkHJa
@@ -1158,7 +1158,7 @@ JfNtumkrZmxvbR4XDkKjggxr6LyaSznieKotPWLsEqA=
 b8ErQvNUZge21gN+q0c3vqQPEZGpkHJa
 JfNtumkrZmw7DinSsD8MBDI7066I+E8fmq/ypb8RXkpKYBGd+lGX+w==
 BT/fHxNzenARRLLJRGBoUC349p/6d3y8
-FQUi8oWeKA0OsheGum+CXaQPEZGpkHJa
+FQUi8oWeKA0OsheGum+CXW5cSlSZZcv/
 pEpH+RMCU2G21gN+q0c3vqQPEZGpkHJa
 YmFbY+KQ4Y5k2APy5BDRc21xZMWnmwq9Qax04aCP8eU=
 EpkhMubA/KXQpA+y/oKUUaQPEZGpkHJa
@@ -2476,7 +2476,7 @@ Eq5VJuqm/iCChQBQ0HmJGvBjDc6YVozAmq/ypb8RXkpKYBGd+lGX+w==
 R1Vwa0rLfaVKtqgxnW7bwc/RvG5HYC/sM8bOVEfASk/FvRrnmgaMCQ==
 atzWyH9igvz89EZrxmAsAdNT95SkLHLIrPHeV7tOs3vxgWOVkIedBg==
 atzWyH9igvy//lF/+Pk+H9NT95SkLHLIrPHeV7tOs3vxgWOVkIedBg==
-H2eaHSBk3dpWgHE3Y5h4cgaP0uYN8IByQax04aCP8eU=
+pwmJtiBT1985FZ311/7ePyyrN35xm8Fe
 6GD7Nfjee9oPoBuAz6CxwvoGdXtgcCHU01MYuuUMKUcYHy38j8RheCyrN35xm8Fe
 sVXI6TfppIV/T9Uhc6irVYRTFQfd158KM8bOVEfASk/FvRrnmgaMCQ==
 zIfEYJb04elWgHE3Y5h4cgaP0uYN8IByQax04aCP8eU=
@@ -9523,7 +9523,7 @@ uGTuryj+tOsAtM+BG/Lw4yQQ8K42nLpDeKotPWLsEqA=
 Y16URROdqEx+wPtZwxseavlalACax0r5Qax04aCP8eU=
 9pzYhs9wWQp+7mLkPHSV2fem7VGBz0eb2xu6/IA5JtzxgWOVkIedBg==
 uGTuryj+tOvQ5JYaky+hnbLNgfAK5e0aeKotPWLsEqA=
-uGTuryj+tOtgN4Xv6QXDPC349p/6d3y8
+lky5VKsiFuTFvRrnmgaMCQ==
 Lgrg85i6pxiJ97P/3YQTQaQPEZGpkHJa
 8v64ZC+8UFumPH5L1vFOZiyrN35xm8Fe
 XHih9lYA8/pN0PUQkzwUHqQPEZGpkHJa
@@ -10134,14 +10134,14 @@ B8w+Leibou83jfinsyzjqVFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 cPDKivAIKoe6sipaQQr451FheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 BXQUha07j2YW40YEz3OcslFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
-+/2OC1vcA4AmhbdxontiXFFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
++/2OC1vcA4BvjyLPnTxTH1FheItN0h2Nmq/ypb8RXkpKYBGd+lGX+w==
 vKMadaRxCnvp6gLrPkJa61FheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 46RKeKrgKofEEUMXkymMT12lphhhK8g51zMNsa85/xrFvRrnmgaMCQ==
 glddNMedxyRFQbW3noP3pqxxzpsSi8aWmq/ypb8RXkpKYBGd+lGX+w==
 36s42ZhwjJ4UHNlX3+xyXSsHiIwWK6GHxC/de4m0Po3xgWOVkIedBg==
 EoFoqzO/R+G5M8tS1KZ/PUHja5jX2PQaeKotPWLsEqA=
 B8w+Leibou83jfinsyzjqVFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
-rjhqzeVmkFn4UdCOgcORtlFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
+rjhqzeVmkFlzCIj6arogkeJA/Bid8pBH1zMNsa85/xrFvRrnmgaMCQ==
 5Y1mwjb8gugiKdKAOW+k6VFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
 1AooRnXbEgh9WYdAmyfR9lFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
@@ -11330,7 +11330,7 @@ mscuPrILVGDj6uG6UR98vC349p/6d3y8
 qjQEvkTAaKWzXmKqIXy3v1rXPHULrPf4DOlg+yEfronxgWOVkIedBg==
 biT7+6/eTSsjCQFsbwhTAQCP9heTbolSQjn5f5QIlePFvRrnmgaMCQ==
 XS8bUKaQun+GBiOZZsX6ivEGCkxJgIepeKotPWLsEqA=
-B+/CSTZg+VcRe3RZpYFL37zZvY15Bd9uagk4/sCxk10eOekIAqoYODS2bTxfc9RKLKs3fnGbwV4=
+B+/CSTZg+VcRe3RZpYFL37zZvY15Bd9uN3lC3PQXsDLFvRrnmgaMCQ==
 GhRXduWr8cb6kiy7/ILyevFm22FHP8f5MfpsscypK+Kb6klcP6QHjSyrN35xm8Fe
 mscuPrILVGDPKZNsQ93yjailoxXz6kJWp1HdWxYPpjrxgWOVkIedBg==
 bKuUJ1epVUJVk4WHEHm5hj8PLzc11tWsQax04aCP8eU=
@@ -12908,7 +12908,7 @@ Fuf6pvQ8ckB1sXunLF29Tjb0lF7RYqvcQax04aCP8eU=
 dRXKYlKp0ivy/Y8+prgNnvQ9ESntPVrIeKotPWLsEqA=
 aak3L9Lnp6mEma3UH3skIHl8JsYXjPfCQax04aCP8eU=
 FQUi8oWeKA2BEzUegK+LzaQPEZGpkHJa
-5Bgoob8FfZTO0EtYHLOvpj8PLzc11tWsQax04aCP8eU=
+5Bgoob8FfZTO0EtYHLOvpsM1yUIjER1sQax04aCP8eU=
 kvJ9l6NV5Fnuq8q2TQycqAa2szONeQhPmq/ypb8RXkpKYBGd+lGX+w==
 FQUi8oWeKA1hE5NxRs2+jaQPEZGpkHJa
 FQUi8oWeKA36tmOrM4e4pD8PLzc11tWsQax04aCP8eU=
@@ -14764,7 +14764,7 @@ rJe5qexUTGX0M2+bu54jF83FCMWIWAvioUj4PeHWd1iLKVWCCOezlS349p/6d3y8
 9zUaxn05IBwLbL1x0Ek7nqwTAGVP2Ej/otnt8g0PR3zFvRrnmgaMCQ==
 9zUaxn05IBwCKqSROb+hZdkaACmksho9NRjgcVFmXJU1m1w9fAg2gSyrN35xm8Fe
 9zUaxn05IBwCUsI920A0/ZMHnOgVyIc8N3lC3PQXsDLFvRrnmgaMCQ==
-n/H6l3GoIIPGTCHzeDEooxP9xkCi/4b4eKotPWLsEqA=
+n/H6l3GoIIPGTCHzeDEooxP9xkCi/4b4eXyyRiJmUlY=
 T8EFg6F1LsJSoAO1PSjvmtb//tEXgv7UoUj4PeHWd1iLKVWCCOezlS349p/6d3y8
 9zUaxn05IBwcX8Vjb9aFbaQPEZGpkHJa
 9zUaxn05IBxsSts9cCbhXjhDlSszOMFBG/PT4CIbso149wiynVG8pCyrN35xm8Fe
@@ -21306,3 +21306,8 @@ LVbLn2n5fv+1UD1kKrrIq6QPEZGpkHJa
 VynNxYGlkQBoQiPzscAqGy349p/6d3y8
 LDpfYG6SR7kjJBLpKNC7Wm5cSlSZZcv/
 XsRueZvhAyoSM4JWt9br8qQPEZGpkHJa
+kQHtQ28+jmRQTcI8S9f0YBzd1Zn+LndCmq/ypb8RXkpKYBGd+lGX+w==
+ib079HkmfIwFhfnjPKd+oaQPEZGpkHJa
+Ug9yBDBbRy1AJGxQk4iM7oJVnd+ppTRB9ZdcuU/iHiTxgWOVkIedBg==
+b+p7oPuIEcUZtGtdyQdnXqQPEZGpkHJa
+HCEq+yB3xiQXu9lhRvmKDJ9C2w8N4lKwmq/ypb8RXkpKYBGd+lGX+w==

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

@@ -12,10 +12,13 @@ public class CacheFile {
     public static void main(String[] args) {
         CacheFile cacheFile = new CacheFile();
         cacheFile.diagSort();
+        cacheFile.sexAge();
+//        cacheFile.contentMaping();
+        cacheFile.vitalMaping();
     }
     //诊断大小类对应
     public void diagSort(){
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/bigdata-web?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;
@@ -43,7 +46,7 @@ public class CacheFile {
     }
     //诊断和性别,年龄的对应
     public void sexAge(){
-        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;
@@ -77,7 +80,7 @@ public class CacheFile {
 
     //标签类型对应
     public void contentMaping()  {
-        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;
@@ -105,7 +108,7 @@ public class CacheFile {
     }
     //体征及体征结果
     public void vitalMaping()  {
-        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;

nlp/src/main/java/org/diagbot/nlp/util/DictUtil.java

@@ -29,7 +29,7 @@ public class DictUtil {
     }
 
     public void writeToDict(String path) {
-        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;