Browse Source

测试
出除大数据推送逻辑

kongwz 4 years ago
parent
commit
ece95aa084

+ 16 - 11
bigdata-web/src/main/java/org/diagbot/bigdata/work/AlgorithmCore.java

@@ -28,17 +28,7 @@ public class AlgorithmCore {
     Logger logger = LoggerFactory.getLogger(AlgorithmCore.class);
 
     public ResponseData algorithm(HttpServletRequest request, SearchData searchData, ResponseData responseData) throws Exception {
-        //录入文本处理,包括提取特征、推送类型转换等
-        BigDataParamsProxy paramsDataProxy = new BigDataParamsProxy();
-        logger.info("页面文本信息:" + searchData.getSymptom());
-        paramsDataProxy.createSearchData(searchData);
-        //对象拷贝至BigDataSearchData处理
-        BigDataSearchData bigDataSearchData = new BigDataSearchData();
-        BeanUtils.copyProperties(searchData, bigDataSearchData);
-        //featureType转算法模型类别
-        bigDataSearchData.setAlgorithmClassify(paramsDataProxy.createAlgorithmClassify(searchData.getSysCode(), searchData.getFeatureTypes(), searchData));
-
-        responseData.setInputs(bigDataSearchData.getInputs());
+        BigDataSearchData bigDataSearchData = getBigDataSearchData(searchData, responseData);
         //推送模型类型集合
         AlgorithmClassify[] classifies = bigDataSearchData.getAlgorithmClassify();
         String[] featureTypes = bigDataSearchData.getFeatureTypes();
@@ -123,4 +113,19 @@ public class AlgorithmCore {
         }
         return responseData;
     }
+
+    public BigDataSearchData getBigDataSearchData(SearchData searchData, ResponseData responseData) throws Exception {
+        //录入文本处理,包括提取特征、推送类型转换等
+        BigDataParamsProxy paramsDataProxy = new BigDataParamsProxy();
+        logger.info("页面文本信息:" + searchData.getSymptom());
+        paramsDataProxy.createSearchData(searchData);
+        //对象拷贝至BigDataSearchData处理
+        BigDataSearchData bigDataSearchData = new BigDataSearchData();
+        BeanUtils.copyProperties(searchData, bigDataSearchData);
+        //featureType转算法模型类别
+        bigDataSearchData.setAlgorithmClassify(paramsDataProxy.createAlgorithmClassify(searchData.getSysCode(), searchData.getFeatureTypes(), searchData));
+
+        responseData.setInputs(bigDataSearchData.getInputs());
+        return bigDataSearchData;
+    }
 }

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

@@ -167,11 +167,12 @@ public class AlgorithmController extends BaseController {
 
         //大数据推送
 //        searchData.setLength(6);    //模型推送最多6个比较合理
-        /*AlgorithmCore core = new AlgorithmCore();
-        ResponseData bigDataResponseData = core.algorithm(request, searchData, responseData);
+        AlgorithmCore core = new AlgorithmCore();
+        /*ResponseData bigDataResponseData = core.algorithm(request, searchData, responseData);
         bigDataResponseData.setVitals(new ArrayList<>());
         bigDataResponseData.setLabs(new ArrayList<>());
         bigDataResponseData.setPacs(new ArrayList<>());*/
+        core.getBigDataSearchData(searchData,responseData);
         ResponseData bigDataResponseData =  new ResponseData();
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData, crisisDetailMap);