公式相关

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

@@ -0,0 +1,12 @@
+package org.springblade.manager.formula.impl;
+
+import java.util.Hashtable;
+
+/**
+ * @author yangyj
+ * @Date 2022/9/9 17:37
+ * @description TODO
+ */
+public class CompositeDataAccessGroup {
+
+}

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author yangyj
@@ -34,7 +35,8 @@ public class FormulaTurnPoint implements FormulaStrategy {
         this.args=args;
         if(Func.isNotEmpty(args)) {
             args.forEach(k -> {
-                dataSourceMap.put(k, fds.stream().filter(e -> k.equals(e.getCode())).findFirst().orElseGet(null));
+                Optional<FormData> ov =fds.stream().filter(e -> k.equals(e.getCode())).findFirst();
+                ov.ifPresent(formData -> dataSourceMap.put(k, formData));
             });
             CompositeDataAccess cda = new CompositeDataAccess(dataSourceMap);
             cda.cursorReset();
@@ -59,7 +61,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
                     TurnPointCalculator tpc = new TurnPointCalculator();
                     NextPoint nextPoint = new NextPoint(qs.stringValue(),gc.stringValue());
                     List<NextPoint> nextPointList= tpc.turnPoint(levelInfo,nextPoint);
-
+                    /**怎么动态插入数据？*/
                 }
             }
         }
@@ -83,4 +85,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
     }
 
 
+
+
+
 }

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

@@ -2,7 +2,6 @@ package org.springblade.manager.formula.impl;
 
 
 import com.mixsmart.utils.StringUtils;
-import javassist.compiler.KeywordTable;
 import lombok.Data;
 import org.springblade.common.utils.BaseUtils;
 import org.springblade.core.tool.utils.Func;
@@ -32,6 +31,7 @@ public class TableElementConverter implements ITableElementConverter {
     private Long nodeId;
     List<KeyMapper> keyMappers;
     List<Formula> formulas;
+    /**公式执行时的元素对象*/
     List<FormData> fds;
 
 
@@ -122,6 +122,7 @@ public class TableElementConverter implements ITableElementConverter {
         Map<String,List<FormData>> fdsMap = this.fds.stream().collect(Collectors.groupingBy(FormData::getTableName));
     }
 
+    /**格式化回写内容*/
     public String recovery(List<ElementData> dataList,String position){
         List<Coords> coordsList = CoordsBuilder.getInstance().build(position);
         StringBuilder sb = new StringBuilder();