Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

icss-service/src/main/java/com/diagbot/client/bean/CalculateData.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:计算接口入参
+ * @Author:zhaops
+ * @time: 2019/4/24 15:15
+ */
+@Getter
+@Setter
+public class CalculateData {
+    private Integer type;  //1-量表，2-计算公式
+    private JSONObject data;
+}

icss-service/src/main/java/com/diagbot/vo/CalculateVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.client.bean.CalculateData;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,8 +11,5 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CalculateVO {
-    private Integer type;
-    private String scale;
-    private String formula;
+public class CalculateVO  extends CalculateData {
 }

icss-service/src/main/java/com/diagbot/web/CalculateController.java

@@ -21,16 +21,15 @@ import javax.validation.Valid;
  * @time: 2019/4/15 13:40
  */
 @RestController
-@RequestMapping("/push")
+@RequestMapping("/calc")
 @Api(value = "计算相关API", tags = { "2期-计算相关API" })
 public class CalculateController {
     @Autowired
     CalculateFacade calculateFacade;
 
     @ApiOperation(value = "推理结果计算接口[by:zhaops]",
-            notes = "type： 1-量表，11-计算公式(必填)，Integer<br>" +
-                    "scale：量表填写内容，String<br>" +
-                    "formula：计算公式填写内容，String<br>")
+            notes = "type： 1-量表，2-计算公式(必填)，Integer<br>" +
+                    "data：计算参数（量表或计算公式结构），String<br>")
     @PostMapping("/calculate")
     @SysLogger("calculate")
     public RespDTO<CalculateDTO> calculate(@RequestBody @Valid CalculateVO calculateVO) {