1、修改编译BUG

common-push/pom.xml

@@ -22,11 +22,11 @@
             <artifactId>public</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.diagbot</groupId>
-            <artifactId>graph</artifactId>
+            <artifactId>nlp</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 

common-push/src/main/java/org/diagbot/common/push/Test.java

@@ -1,11 +0,0 @@
-package org.diagbot.common.push;
-
-/**
- * @ClassName org.diagbot.common.push.Test
- * @Description TODO
- * @Author fyeman
- * @Date 2019/8/5/005 17:07
- * @Version 1.0
- **/
-public class Test {
-}

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

@@ -1,4 +1,4 @@
-package org.diagbot.graph.util;
+package org.diagbot.common.push.cache;
 
 import org.apache.commons.lang3.StringUtils;
 import org.diagbot.nlp.participle.cfg.Configuration;

common-push/src/main/java/org/diagbot/common/push/filter/ClassifyDiag.java

@@ -2,9 +2,9 @@ package org.diagbot.common.push.filter;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
-import org.diagbot.common.work.FeatureRate;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.graph.util.CacheUtil;
+import org.diagbot.common.push.bean.FeatureRate;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.cache.CacheUtil;
 
 import java.text.DecimalFormat;
 import java.util.*;
@@ -55,7 +55,7 @@ public class ClassifyDiag {
      * @param graphFeatures 过滤前的诊断结果
      * @return 返回过滤后的诊断结果
      */
-    public List<FeatureRate> filterDiag(ResponseData graphResponseData,List<FeatureRate> graphFeatures){
+    public List<FeatureRate> filterDiag(ResponseData graphResponseData, List<FeatureRate> graphFeatures){
         //根据诊断依据规则过滤掉的诊断列表
         List<String> excludeDiag = graphResponseData.getExcludeDiag();
         //将需要排除的诊断从列表中删除

graph-web/pom.xml

@@ -35,6 +35,11 @@
 			<artifactId>common-service</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.diagbot</groupId>
+			<artifactId>common-push</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.diagbot</groupId>
 			<artifactId>nlp</artifactId>

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

@@ -5,11 +5,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.diagbot.common.javabean.MangementEvaluation;
-import org.diagbot.common.work.FeatureRate;
 import org.diagbot.common.javabean.Filnlly;
-import org.diagbot.common.work.LisDetail;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.common.work.SearchData;
+import org.diagbot.common.push.bean.FeatureRate;
+import org.diagbot.common.push.bean.PreResult;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.graph.jdbc.DriverManager;
 import org.diagbot.graph.jdbc.Neo4jAPI;
 
@@ -117,14 +117,14 @@ public class GraphCalculate {
             logger.info("diseaseSet :" + diseaseSet);
         }
         Integer diseaseType = searchData.getDisType();
-        List<LisDetail> lisArr = searchData.getLisArr();
+        List<PreResult> lisArr = searchData.getLisArr();
         Set<String> lisSet = new HashSet<>();
         Map<String,Double> lis_Result = new HashMap<>();
         if(lisArr != null && lisArr.size() > 0){
-            for (LisDetail lis:lisArr) {
+            for (PreResult lis:lisArr) {
                 String detailName = lis.getUniqueName();
                 logger.info("公表名为  :"+detailName);
-                Double value = lis.getValue();
+                Double value = Double.valueOf(lis.getValue());
                 lis_Result.put(detailName,value);
                 lisSet.add(detailName);
             }

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

@@ -1,16 +1,12 @@
 package org.diagbot.graphWeb.work;
 
-import org.diagbot.common.work.SearchData;
+import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.graph.javabean.GdbResponse;
-import org.diagbot.graph.jdbc.DriverManager;
-import org.diagbot.graph.jdbc.Neo4jAPI;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;
-import org.neo4j.driver.v1.Driver;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class HighRiskCalculate {

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

@@ -1,8 +1,8 @@
 package org.diagbot.graphWeb.work;
 
-import org.diagbot.common.work.FeatureRate;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.common.work.SearchData;
+import org.diagbot.common.push.bean.FeatureRate;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;

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

@@ -1,84 +0,0 @@
-package org.diagbot.graphWeb.work;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.diagbot.common.work.SearchData;
-import org.diagbot.nlp.feature.FeatureAnalyze;
-import org.diagbot.nlp.feature.FeatureType;
-import org.diagbot.nlp.util.Constants;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-
-public class ParamsDataProxy {
-    public void createSearchData(HttpServletRequest request, SearchData searchData)throws Exception {
-        //消除空格
-        if (searchData.getSymptom() != null) {
-            searchData.setSymptom(searchData.getSymptom().trim());
-        }
-        if (searchData.getDiag() != null) {
-            searchData.setDiag(searchData.getDiag().trim());
-        }
-        //计算年龄区间
-        if (searchData.getAge() > 0) {
-            searchData.setAge_start(searchData.getAge() - 5);
-            searchData.setAge_end(searchData.getAge() + 5);
-        }
-        //默认查询门诊数据
-//        if (org.springframework.util.StringUtils.isEmpty(searchData.getResourceType())) {
-//            searchData.setResourceType(BigDataConstants.resource_type_o);
-//        }
-        //所有信息参与推送
-        searchData.setSymptom(searchData.getSymptom() + searchData.getVital()
-                + searchData.getLis() + searchData.getPacs() + searchData.getPast() + searchData.getOther() + searchData.getIndications());
-        searchData.setSymptom(searchData.getSymptom().trim());
-        //一次推送多个类别信息
-        String[] featureTypes = searchData.getFeatureType().split(",");
-        searchData.setFeatureTypes(featureTypes);
-
-        //获取入参中的特征信息
-        FeatureAnalyze fa = new FeatureAnalyze();
-
-        if (!org.springframework.util.StringUtils.isEmpty(searchData.getSymptom())) {
-            List<Map<String, Object>> featuresList = fa.start(searchData.getSymptom(), FeatureType.FEATURE);
-            paramFeatureInit(searchData, featuresList);
-
-            //如果既往史中诊断信息，需要提取这个特征
-            featuresList = fa.start(searchData.getOther(), FeatureType.DIAG);
-            paramFeatureInit(searchData, featuresList);
-        }
-
-        if (!org.springframework.util.StringUtils.isEmpty(searchData.getDiag()) && org.springframework.util.StringUtils.isEmpty(searchData.getSymptom())) {
-            List<Map<String, Object>> featuresList = fa.start(searchData.getDiag(), FeatureType.DIAG);
-            paramFeatureInit(searchData, featuresList);
-        }
-
-    }
-
-    /**
-     * 推送模型入参
-     *
-     * @param searchData
-     * @throws Exception
-     */
-    private void paramFeatureInit(SearchData searchData, List<Map<String, Object>> featuresList) throws Exception {
-        if (featuresList != null && featuresList.size() > 0) {
-//            BeanUtils.setProperty(searchData, property_list, featuresList);
-            Map<String, Object> featureMap = null;
-            for (int i = 0; i < featuresList.size(); i++) {
-                featureMap = featuresList.get(i);
-                Map<String, String> map = new HashMap<>();
-                for (Map.Entry<String, Object> entry : featureMap.entrySet()) {
-                    map.put(entry.getKey(), String.valueOf(entry.getValue()));
-                }
-                map.put("featureType", String.valueOf(featureMap.get("feature_type")));
-                map.put("featureName", String.valueOf(featureMap.get("feature_name")));
-                if (Constants.default_negative.equals(featureMap.get("negative"))) {
-                    searchData.getInputs().put(map.get("feature_name"), map);
-                } else {
-                    searchData.getFilters().put(map.get("feature_name"), map);
-                }
-            }
-        }
-    }
-}

graph/pom.xml

@@ -27,7 +27,11 @@
             <artifactId>common-service</artifactId>
             <version>1.0.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.diagbot</groupId>
+            <artifactId>common-push</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.diagbot</groupId>
             <artifactId>nlp</artifactId>

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

@@ -4,12 +4,9 @@ import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import io.netty.handler.codec.json.JsonObjectDecoder;
-import org.assertj.core.util.Lists;
 import org.diagbot.common.javabean.*;
-import org.diagbot.common.work.*;
+import org.diagbot.common.push.bean.FeatureRate;
 import org.diagbot.pub.utils.PropertiesUtil;
-import org.neo4j.driver.internal.value.NodeValue;
 import org.neo4j.driver.v1.*;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;

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

@@ -3,16 +3,12 @@ package org.diagbot.push.controller;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.diagbot.bigdata.work.AlgorithmCore;
-import org.diagbot.bigdata.work.PretreatmentFilter;
 import org.diagbot.common.javabean.*;
+import org.diagbot.common.push.bean.FeatureRate;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.common.push.filter.ClassifyDiag;
-import org.diagbot.common.work.CrisisDetail;
-import org.diagbot.common.work.FeatureRate;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.common.work.SearchData;
 import org.diagbot.graph.util.CacheUtil;
-import org.diagbot.graphWeb.work.DiseaseCalculate;
-import org.diagbot.graphWeb.work.FilterSortDiag;
 import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.nlp.util.Constants;
@@ -29,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.diagbot.push.convert.PreProcess;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;

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

@@ -1,18 +1,13 @@
 package org.diagbot.push.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import org.diagbot.common.javabean.MedicalIndication;
-import org.diagbot.common.javabean.MedicalIndicationDetail;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.common.work.SearchData;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.bean.SearchData;
+import org.diagbot.common.push.work.ParamsDataProxy;
 import org.diagbot.graph.javabean.GdbResponse;
 import org.diagbot.graph.jdbc.DriverManager;
 import org.diagbot.graph.jdbc.Neo4jAPI;
-import org.diagbot.graphWeb.work.GraphCalculate;
-import org.diagbot.graphWeb.work.HighRiskCalculate;
-import org.diagbot.graphWeb.work.LisPacsCalculate;
-import org.diagbot.graphWeb.work.ParamsDataProxy;
-import org.diagbot.graphWeb.work.ScaleCalculate;
+import org.diagbot.graphWeb.work.*;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.web.BaseController;
 import org.neo4j.driver.v1.Driver;
@@ -23,9 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -97,7 +89,7 @@ public class GraphController extends BaseController {
     @ResponseBody
     public Map<String, Object> scale(HttpServletRequest request, @RequestBody SearchData searchData) throws Exception {
         ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
-        paramsDataProxy.createSearchData(request, searchData);
+        paramsDataProxy.createSearchData(searchData);
         //        Driver driver = DriverManager.newDrive("localhost", "neo4j", "root");
         Driver driver = DriverManager.newDrive();
         Neo4jAPI neo4jAPI = new Neo4jAPI(driver);

rule/src/main/java/org/diagbot/rule/crisis/CrisisApplication.java

@@ -0,0 +1,8 @@
+package org.diagbot.rule.crisis;
+
+/**
+ * Created by louhr on 2019/9/2.
+ */
+public class CrisisApplication {
+
+}