统一使用232driver

graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -40,11 +40,11 @@ public class GraphCalculate {
         Set<String> ss = inputs.keySet();
         logger.info("从分词系统接收到的词 :" + ss);
         inputList.addAll(ss);
-        Driver driver = DriverManager.newDrive("192.168.2.232", "neo4j", "root");
-        Neo4jAPI neo4jAPI = new Neo4jAPI();
+//        Driver driver = DriverManager.newDrive("192.168.2.232", "neo4j", "root");
+        Neo4jAPI neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
         logger.info("图谱开始推送诊断!!!!!!!!!!!");
         //计算诊断
-        Map<String, String> condition = neo4jAPI.getCondition((String[]) inputList.toArray(new String[inputList.size()]),driver);
+        Map<String, String> condition = neo4jAPI.getCondition((String[]) inputList.toArray(new String[inputList.size()]));
         List<FeatureRate> featureRates = new ArrayList<>();
         for (Map.Entry<String, String> d : condition.entrySet()) {
             if (!"低血糖反应".equals(d.getKey()) && !"胃肠道不良反应".equals(d.getKey())
@@ -66,9 +66,8 @@ public class GraphCalculate {
         Integer diseaseType = searchData.getDisType();
         //走治疗
         if (webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
-            Driver driver1 = DriverManager.newDrive("192.168.2.232", "neo4j", "root");
             //走平常诊断治疗
-            Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(webDiag, diseaseType, diseaseSet, String.join(",", inputList),driver1);
+            Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(webDiag, diseaseType, diseaseSet, String.join(",", inputList));
             responseData.setTreat(mulDiseaseTreat);
         }
         //管理评估(慢病才有)

graph-web/src/main/java/org/diagbot/graphWeb/work/ScaleCalculate.java

@@ -15,7 +15,8 @@ public class ScaleCalculate {
     public String scaleScoreCalc(String[] scaleItems,String scaleName){
         Neo4jAPI neo4jAPI = null;
         try {
-            neo4jAPI = new Neo4jAPI(DriverManager.newDrive("192.168.2.233","neo4j","root"));
+//            neo4jAPI = new Neo4jAPI(DriverManager.newDrive("192.168.2.233","neo4j","root"));
+            neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
         } catch (Exception e) {
             System.out.println("Neo4j连接出错！");
             e.printStackTrace();

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

@@ -20,12 +20,14 @@ public class DriverManager {
     public static PropertiesUtil propertiesUtil = new PropertiesUtil("bolt.properties");
     public static Driver newDrive() throws Exception {
         //            driver = GraphDatabase.driver("bolt://192.168.3.112:7687", AuthTokens.basic("neo4j", "123456"),
-        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)
-                        .withConnectionAcquisitionTimeout(ConnTimeout, TimeUnit.MINUTES)
-                        .toConfig());
+        if( driver == null){
+            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)
+                            .withConnectionAcquisitionTimeout(ConnTimeout, TimeUnit.MINUTES)
+                            .toConfig());
+        }
         return driver;
     }
 

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

@@ -645,7 +645,7 @@ public class Neo4jAPI {
      * @param keys
      * @return
      */
-    public Map<String, String> getCondition(String[] keys,Driver driver) {
+    public Map<String, String> getCondition(String[] keys) {
         Map<String, String> diseaseCondition = new LinkedHashMap<>();
         List<String> newList = new ArrayList<>();
         ArrayList<String> fildList = new ArrayList<>();
@@ -740,7 +740,6 @@ public class Neo4jAPI {
             e.printStackTrace();
         } finally {
             CloseSession(session);
-            driver.close();
             return diseaseCondition;
         }
     }
@@ -969,7 +968,7 @@ public class Neo4jAPI {
      * @param filds   //     * @param sign 标志,2是平常诊断的治疗,0是复诊诊断的治疗,1是急诊
      * @return
      */
-    public Map<String, Filnlly> getMulDiseaseTreat_2(String disease,Integer diseaseType,Set<String> disSet, String filds,Driver driver) {
+    public Map<String, Filnlly> getMulDiseaseTreat_2(String disease,Integer diseaseType,Set<String> disSet, String filds) {
         Map<String, Filnlly> diagTreat = new HashMap<>();
         Session session = null;
         NumberFormat nf = NumberFormat.getPercentInstance();
@@ -1182,7 +1181,7 @@ public class Neo4jAPI {
             e.printStackTrace();
         } finally {
             CloseSession(session);
-            driver.close();
+//            driver.close();
             return diagTreat;
         }
     }