公式相关

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -45,8 +45,7 @@ import static java.math.BigDecimal.ROUND_HALF_UP;
 
 public class CustomFunction {
 
-	//定义存储天气数据
-	public static final  Map<String,Object> weatherMap=new HashMap<>();
+
 	
 	/**
 	 * 类调用地址前缀
@@ -59,41 +58,8 @@ public class CustomFunction {
 		KEYWORD_SET.add("last");
 	}
 
-	/**
-	 * 取绝对值
-	 * @param value
-	 * @param scaleObj
-	 * @return
-	 * @author:rock
-	 * @time:2020年2月20日 下午5:03:39
-	 */
-	public static Object abs(Object value, Object scaleObj) {
-		if(StringUtils.isNumber(value)) {
-			int scale = StringUtils.handleObj2Integer(scaleObj);
-			String valueStr = value.toString();
-			if(scale <= 0) {
-				//整型处理
-				int v = 0;
-				if(valueStr.contains(".")) {
-					v = Integer.parseInt(valueStr.substring(0, valueStr.indexOf(".")));
-				} else {
-					v = Integer.parseInt(valueStr);
-				}
-				return Math.abs(v);
-			} else if(scale > 0) {
-				double d = Math.abs(Double.parseDouble(valueStr));
-				BigDecimal big = new BigDecimal(d);
-				return big.setScale(scale, ROUND_HALF_UP);
-			}
-		}
-		return null;
-	}
-	
-
-
 
 
-	
 
 
 	/**

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

@@ -43,6 +43,7 @@ import javax.validation.Valid;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 
@@ -199,15 +200,14 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
-    public R<List<WbsFormElementVO>> selectFormElements(@RequestParam("id") String id,Long nodeId) {
+    public R<List<WbsFormElementVO>> selectFormElements(@RequestParam("id") String id,Long nodeId,String search) {
         List<WbsFormElementVO> wbsFormElements = null;
-//        TokenizerEngine engine = new HanLPEngine();
-//        String text = "这是一段分词测试代码";
-//        Result result = engine.parse(text);
-//        String resultStr = CollUtil.join((Iterator<Word>)result, " ");
         if (StringUtils.isNotEmpty(id)) {
             wbsFormElements = wbsTreeService.selectFormElements(id,nodeId);
             if (wbsFormElements.size() > 0) {
+                if(StringUtils.isNotEmpty(search)){
+                    wbsFormElements=wbsFormElements.stream().filter(e->e.getEName().contains(search)).collect(Collectors.toList());
+                }
                 return R.data(wbsFormElements);
             }
         }