公式相关:range实测值

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

@@ -56,9 +56,6 @@ public class RangeInfo {
 
 
     public void setDesign(String design) {
-        if(Func.isNotBlank(this.design)){
-            this.gDesign= Arrays.stream(this.design.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toDouble).collect(Collectors.toList());
-        }
         this.design = design;
     }
 
@@ -75,10 +72,25 @@ public class RangeInfo {
       return  gSize.size()>i?gSize.get(i):gSize.get(gSize.size()-1);
     }
 
-    public void setSize(String size) {
+    public void build(){
+        if(Func.isNotBlank(this.design)){
+            this.gDesign= Arrays.stream(this.design.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toDouble).collect(Collectors.toList());
+        }
         if(Func.isNotBlank(this.size)){
             this.gSize= Arrays.stream(this.size.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
         }
+        if(Func.isNotBlank(this.dev)){
+            this.gDev= Arrays.stream(this.dev.split("/+")).collect(Collectors.toList());
+        }
+        if(Func.isNotBlank(this.pass)){
+            this.gPass= Arrays.stream(this.pass.split("[^\\d.%]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
+        }
+        if(Func.isNotBlank(this.capacity)){
+            this.gCapacity= Arrays.stream(this.capacity.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
+        }
+    }
+
+    public void setSize(String size) {
         this.size = size;
     }
 
@@ -100,9 +112,6 @@ public class RangeInfo {
     }
 
     public void setDev(String dev) {
-        if(Func.isNotBlank(this.dev)){
-            this.gDev= Arrays.stream(this.dev.split("/+")).collect(Collectors.toList());
-        }
         this.dev = dev;
     }
 
@@ -134,9 +143,7 @@ public class RangeInfo {
     }
 
     public void setPass(String pass) {
-        if(Func.isNotBlank(this.pass)){
-            this.gPass= Arrays.stream(this.pass.split("[^\\d.%]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
-        }
+
         this.pass = pass;
     }
     public Integer getPassAt(int i){
@@ -154,9 +161,7 @@ public class RangeInfo {
     }
 
     public void setCapacity(String capacity) {
-        if(Func.isNotBlank(this.capacity)){
-            this.gCapacity= Arrays.stream(this.capacity.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
-        }
+
         this.capacity = capacity;
     }
 

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

@@ -234,6 +234,7 @@ public class FormulaController {
                 keymap.put(info.getKey(),bak);
             }
             List<Object> data =new ArrayList<>();
+            info.build();
             if(info.getDesigns().size()>0){
                 AtomicInteger i= new AtomicInteger();
                 List<Object> tmpList = info.getDesigns().stream()
@@ -250,7 +251,7 @@ public class FormulaController {
                 }
             }
             String[] dw = keymap.get(info.getKey()).split(StringPool.SEMICOLON);
-            Map<String,Object> result = new HashMap<>(dw.length*2);
+            LinkedHashMap<String,Object> result = new LinkedHashMap<>(dw.length*2);
             if(dw.length==1){
                 result.put(info.getKey()+"__"+dw[0],data.stream().filter(StringUtils::isNotEmpty).map(Func::toStr).collect(Collectors.joining("、")));
             }else{