公式相关：关闭转点检查

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

@@ -493,7 +493,7 @@ public class CustomFunction {
                 range= ((List<Object>) range).get(0);
             }
             if( Func.isNotEmpty(range)) {
-                String[] s = Func.toStr(range).replaceAll("[|]", "").split(",");
+                String[] s = Func.toStr(range).replaceAll("[\\[\\]\\s]+", "").split(",");
                 return dateCp(s[0], s[1], isAsc);
             }
         }

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

@@ -56,7 +56,7 @@ public interface ITurnPointCalculator {
                 return tmp;
             }
             /*判断是否可推导*/
-            levelInfo.setPersist(persist(tmp));
+            /*levelInfo.setPersist(persist(tmp));问题多多，暂时关闭*/
             if(levelInfo.isNotPersist()) {
                 /*不可推导的情况移除转点，fill阶段自动生成*/
                 tmp.removeIf(e-> ZD.equals(e.getType()));

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

@@ -257,12 +257,12 @@ public class TurnPoint {
     }
 
     public static void test() {
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 5; i++) {
             LevelInfo info = new LevelInfo();
-            info.setSightHeight(401.817+0.454);
+            info.setSightHeight(392.497+2.489);
             TurnPoint tp = new TurnPoint(info, new HashMap<>());
-            tp.setQ(0.619);
-            tp.setSc(405.546);
+            tp.setQ(1.256);
+            tp.setSc(402.248);
             if(!tp.isVisible(false)) {
                 System.out.println("第" + (i + 1) + "次");
                 System.out.println(tp.limit(false).stream().map(e -> "{" + e.getQ() + "," + e.getBmd() + "," + e.getH() + "}").collect(Collectors.toList()) + "{" + tp.getQ() + "," + tp.getSc() + "," + tp.getSj() + "}");
@@ -272,14 +272,14 @@ public class TurnPoint {
 
         }
     }
+/*    public static void main(String[] args) {
+        test();
+    }*/
 
     public Boolean isNegativeQ(){
         return StringUtils.isNumber(q)&&getQ0L()<0;
     }
 
-/*    public static void main(String[] args) {
-        test();
-    }*/
 
     public static Random r = new Random();
     /**转点的核心处理算法，当测点不在测量范围会触发*/
@@ -300,7 +300,7 @@ public class TurnPoint {
         do {
             TurnPoint tmp;
             if (hd > step) {
-                double x = hdx(higher);
+                double x = hdx();
                 tmp = createZd(x, higher, "ZD" + (levelInfo.getCloseZd().size()));
                 hd -= x;
             } else {
@@ -314,7 +314,7 @@ public class TurnPoint {
         return result;
     }
 
-    public double hdx(boolean higher) {
+    public double hdx() {
         double step = levelInfo.getStep();
         double x;
         double loop = 0;