Parcourir la source

公式相关:G8自定义偏差范围

yangyj il y a 2 ans
Parent
commit
7b5139efd0

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/ITurnPointCalculator.java

@@ -20,9 +20,10 @@ import static org.springblade.manager.formula.TurnPoint.*;
 public interface ITurnPointCalculator {
 
 
-    static List<TurnPoint> create(List<Map<String, Object>> data, LinkedHashMap<String, String> configMap) {
+    static List<TurnPoint> create(List<Map<String, Object>> data, LinkedHashMap<String, String> configMap,String g8pcfw) {
         if (Func.isNotEmpty(data) && configMap != null) {
             LevelInfo levelInfo = new LevelInfo();
+            levelInfo.setDx(g8pcfw);
             List<TurnPoint> tmp = new ArrayList<>();
             for (int i = 0; i < data.size(); i++) {
                 Map<String, Object> dm = data.get(i);

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

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