公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/RangeInfo.java

@@ -1,5 +1,7 @@
 package org.springblade.manager.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.core.tool.utils.Func;
 
@@ -10,11 +12,26 @@ import org.springblade.core.tool.utils.Func;
  */
 @Data
 public class RangeInfo {
+    @ApiModelProperty(
+            value = "设计值",
+            required = true
+    )
     private String design;
+    @ApiModelProperty(
+            value = "频率",
+            required = true
+    )
     private Integer size;
+    @ApiModelProperty("偏差范围")
     private String dev;
+    @ApiModelProperty(
+            value = "表单key",
+            required = true
+    )
     private String key;
+    @ApiModelProperty("表节点的唯一id")
+    private Long pkId;
     public Boolean verify(){
-        return Func.isNotBlank(design)&&Func.isNotEmpty(size)&&size>0&&Func.isNotEmpty(dev)&&Func.isNotBlank(key);
+        return Func.isNotBlank(design)&&Func.isNotEmpty(size)&&size>0&&Func.isNotBlank(key)&&(Func.isNotEmpty(pkId)||Func.isNotBlank(dev));
     }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -21,6 +21,7 @@ import org.springblade.manager.entity.Formula;
 import org.springblade.manager.service.impl.FormulaServiceImpl;
 import org.springblade.manager.wrapper.FormulaWrapper;
 import org.springframework.beans.BeanUtils;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
 @Api(value = "公式脚本", tags = "公式脚本")
 public class FormulaController {
     private final FormulaServiceImpl service;
+    private final JdbcTemplate jdbcTemplate;
     /**
      * 新增或修改
      */
@@ -168,12 +170,15 @@ public class FormulaController {
 
 
 
-    @PostMapping("/range")
+    @GetMapping("/range")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "自动填充数据", notes = "根据设计值、偏差范围、频率自动填充数据")
-    public R<Map<String,List<Object>>> rangeList( @RequestBody RangeInfo info) {
+    public R<Map<String,List<Object>>> rangeList(RangeInfo info) {
         if(info.verify()){
             Map<String,List<Object>> map = new HashMap<>();
+            if(Func.isNotEmpty(info.getPkId())){
+              Map<String,Object> data =  this.jdbcTemplate.queryForMap("");
+            }
             List<Object> data = CustomFunction.rangeList(info.getSize(),info.getDesign(),info.getDev(),1,0,1);
             map.put(info.getKey(),data);
             return R.data(map);