kongwz vor 6 Jahren
Ursprung
Commit
eff77f548c

+ 9 - 0
common-service/src/main/java/org/diagbot/common/work/FeatureRate.java

@@ -8,6 +8,7 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 
     public String getFeatureName() {
         return featureName;
@@ -40,4 +41,12 @@ public class FeatureRate {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 }

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

@@ -89,7 +89,8 @@ public class GraphCalculate {
                             Map<String, String> value = d.getValue();
                             String s = JSON.toJSONString(value);
                             featureRate.setDesc(s);
-                            featureRate.setRate("neo4j");
+//                            featureRate.setRate("neo4j");
+                            featureRate.setSource("neo4j");
                             featureRates.add(featureRate);
                         }
 

+ 3 - 3
graph-web/src/main/resources/url.properties

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.168.2.234:5004/knowledge/getHighRisk
-lisPacs.http.url=http://192.168.2.234:5004/knowledge/getLisPacs
-disease.http.url=http://192.168.2.234:5004/knowledge/getDisease
+highrisk.http.url=http://192.168.2.186:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.186:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.186:5004/knowledge/getDisease
 #lisPacs.http.url=http://192.168.3.9:5004/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:5004/knowledge/getHighRisk

+ 1 - 1
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("bolt232.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt232.user"), propertiesUtil.getProperty("bolt232.passwd")),
+            driver = GraphDatabase.driver(propertiesUtil.getProperty("bolt.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt.user"), propertiesUtil.getProperty("bolt.passwd")),
                     Config.build().withMaxConnectionLifetime(ConnLifeTime, TimeUnit.MINUTES)
                             .withMaxTransactionRetryTime(TransRetryTime, TimeUnit.SECONDS)
                             .withMaxConnectionPoolSize(ConnPoolSize)

+ 1 - 1
graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -390,7 +390,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         List<String> bigdataDiagList = new LinkedList<>();//大数据诊断
         if (bigdataDiagFeature.size() > 0) {
             for (FeatureRate fe : bigdataDiagFeature) {
-                if ("neo4j".equals(fe.getRate()) && fe.getDesc().contains("确诊")) {
+                if ("neo4j".equals(fe.getSource()) && fe.getDesc().contains("确诊")) {
                     neo4jDiagList.add(fe.getFeatureName());
                 } else if (fe.getDesc() == null) {
                     bigdataDiagList.add(fe.getFeatureName());

+ 1 - 0
graphdb/src/main/java/org/diagbot/vo/domain/FeatureRate.java

@@ -10,4 +10,5 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 }