Merge remote-tracking branch 'origin/master' into push-186server

common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -23,9 +23,9 @@ import java.util.*;
 public class CacheFileManager {
     Logger logger = LoggerFactory.getLogger(CacheFileManager.class);
 
-    private String user = "teamdata";
-    private String password = "jiO2rfnYhg";
-    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String user = "root";
+    private String password = "lantone";
+    private String url = "jdbc:mysql://192.168.2.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
 
     private String path = "";
 

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

@@ -1,5 +1,5 @@
-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
+highrisk.http.url=http://192.168.2.123:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.123:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.123: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

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -54,9 +54,9 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
     @Autowired
     private BiRepository biRepository;
     private List<BaseNode> baseNodes;
-    private String user = "teamdata";
-    private String password = "jiO2rfnYhg";
-    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String user = "root";
+    private String password = "lantone";
+    private String url = "jdbc:mysql://192.168.2.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
     private Pageable pageable;
     /**
      * 处理症状节点相关的申请

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -140,7 +140,7 @@ public class AlgorithmController extends BaseController {
         paramsDataProxy.createNormalInfo(searchData);
         //数据预处理
         PretreatmentRule pretreatmentRule = new PretreatmentRule();
-        pretreatmentRule.rule(searchData);
+//        pretreatmentRule.rule(searchData);
         //危机值
         CrisisApplication crisisApplication = new CrisisApplication();
         Map<String, List<CrisisDetail>> crisisDetailMap = crisisApplication.crisisContent(searchData);