|
@@ -60,6 +60,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ String g8pcfw =Expression.parse("WP['g8pcfw']").calculate(tec.getConstantMap());
|
|
CompositeDataAccess cda = new CompositeDataAccess(dataSourceMap);
|
|
CompositeDataAccess cda = new CompositeDataAccess(dataSourceMap);
|
|
List<Map<String, Object>> tableData = new ArrayList<>();
|
|
List<Map<String, Object>> tableData = new ArrayList<>();
|
|
/*用来映射元素*/
|
|
/*用来映射元素*/
|
|
@@ -88,7 +89,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
|
|
}
|
|
}
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
Map<String, Object> g8 = (Map<String, Object>) tec.getConstantMap().computeIfAbsent("G8", k -> new HashMap<>());
|
|
Map<String, Object> g8 = (Map<String, Object>) tec.getConstantMap().computeIfAbsent("G8", k -> new HashMap<>());
|
|
- List<TurnPoint> result = ITurnPointCalculator.create(tableData, configMap);
|
|
|
|
|
|
+ List<TurnPoint> result = ITurnPointCalculator.create(tableData, configMap,g8pcfw);
|
|
/*V判断*/
|
|
/*V判断*/
|
|
forG8(result, g8,tec);
|
|
forG8(result, g8,tec);
|
|
List<Object> data= result.stream().map(TurnPoint::getDataMap).flatMap(m -> {
|
|
List<Object> data= result.stream().map(TurnPoint::getDataMap).flatMap(m -> {
|