测站点bug修复

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

@@ -1,7 +1,5 @@
 package org.springblade.manager.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.manager.entity.Formula;
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/DatumPointController.java

@@ -46,18 +46,17 @@ public class DatumPointController {
 
     @GetMapping("/list")
     public R<IPage<DatumPoint>>  list( String contractId, Query page, String type, String name){
-        Map<String, Object> param = new HashMap<>(10);
+        LambdaQueryWrapper<DatumPoint> queryWrapper=Wrappers.<DatumPoint>lambdaQuery();
         if(StringUtil.isNotBlank(contractId)){
-            param.put("contractId",contractId);
+            queryWrapper.eq(DatumPoint::getContractId,contractId);
         }
         if(StringUtil.isNotBlank(type)){
-            param.put("type",type);
+            queryWrapper.eq(DatumPoint::getType,type);
         }
-        if(StringUtil.isNotBlank(contractId)){
-            param.put("name",name);
-            param.put("remark",name);
+        if(StringUtil.isNotBlank(name)){
+            queryWrapper.and(e->e.like(DatumPoint::getName,name).or().like(DatumPoint::getRemark,name));
         }
-        return R.data(service.page(Condition.getPage(page),Condition.getQueryWrapper(param,DatumPoint.class)));
+        return R.data(service.page(Condition.getPage(page),queryWrapper));
     }
 
     @PostMapping("/add")

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -132,8 +132,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
 
-    public static void slice(Map<String,Object> variables,String formula){
-            int min =0;
+    public static List<Object> slice(Map<String,Object> variables,String formula){
+        int min =0;
+        List<Object> result = new ArrayList<>();
         Map<String,Object> currentMap = new HashMap<>();
         Map<String,List<Object>> massMap = new HashMap<>();
         for(Map.Entry<String,Object> entry:variables.entrySet()){
@@ -150,12 +151,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 }
         }
         for(int i=0;i<min;i++){
-                for(Map.Entry<String,List<Object>> e:massMap.entrySet()){
-                    currentMap.put(e.getKey(),e.getValue().get(i));
-                }
+            for(Map.Entry<String,List<Object>> e:massMap.entrySet()){
+                currentMap.put(e.getKey(),e.getValue().get(i));
+            }
             Object data  = Expression.parse(formula).calculate(currentMap);
-
+            result.add(data);
         }
+        return  result;
     }
 
     public static final String WP_REG= "(?<=P\\[)[^]]+(?=\\])";