kongwz преди 6 години
родител
ревизия
60424b9d41
променени са 1 файла, в които са добавени 7 реда и са изтрити 9 реда
  1. 7 9
      graph-web/src/main/java/org/diagbot/graphWeb/controller/PushController.java

+ 7 - 9
graph-web/src/main/java/org/diagbot/graphWeb/controller/PushController.java

@@ -27,10 +27,12 @@ public class PushController {
     @RequestMapping(value = "/push", method = RequestMethod.POST)
     @ResponseBody
     public Response<ResponseData> bayesPageData(HttpServletRequest request, @RequestBody SearchData searchData) throws Exception {
-        return calculate(request, searchData);
-    }
-    public Response<ResponseData> calculate(HttpServletRequest request, SearchData searchData) throws Exception {
         Response<ResponseData> response = new Response();
+        ResponseData responseData = this.calculate(request, searchData);
+        response.setData(responseData);
+        return response;
+    }
+    public ResponseData calculate(HttpServletRequest request, SearchData searchData) throws Exception {
         ResponseData responseData = new ResponseData();
         ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
         paramsDataProxy.createSearchData(request,searchData);
@@ -43,10 +45,6 @@ public class PushController {
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(searchData.getLisArr()));
         List<String> lisResult = neo4jAPI.AnalysisLISResult(jsonArray);
         inputList.addAll(lisResult);
-       /* for (String s:
-            inputList ) {
-            System.out.println(s);
-        }*/
         //计算诊断
         Map<String, String> condition = neo4jAPI.getCondition((String[]) inputList.toArray(new String[inputList.size()]));
         List<FeatureRate> featureRates = new ArrayList<>();
@@ -67,9 +65,9 @@ public class PushController {
             responseData.setTreat(mulDiseaseTreat);
         }
         responseData.setDis(featureRates);
-        response.setData(responseData);
+//        response.setData(responseData);
         responseData.setInputs(searchData.getInputs());
-        return response;
+        return responseData;
     }
 }