测站点里程

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/DatumPoint.java

@@ -8,7 +8,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 /**
  * @author yangyj
  * @Date 2022/6/7 15:32
- * @description TODO
+ * @description 测站点
  */
 @Data
 @TableName("t_om_datum_point")
@@ -19,6 +19,8 @@ public class DatumPoint extends TenantEntity {
     private Double y;
     private Double h;
     private String level;
+    /**里程信息，用于转点估算距离*/
+    private String milestone;
     private String remark;
     private Integer type;
     private Long projectId;

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/DatumPointVo.java

@@ -16,5 +16,6 @@ public class DatumPointVo {
     private Double y;
     private Double h;
     private String level;
+    private String milestone;
     private String remark;
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/DatumPointMapper.xml

@@ -18,6 +18,7 @@
         <result column="y" property="y"/>
         <result column="h" property="h"/>
         <result column="level" property="level"/>
+        <result column="milestone" property="milestone"/>
         <result column="remark" property="remark"/>
         <result column="type" property="type"/>
         <result column="projectId" property="project_id"/>

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

@@ -19,6 +19,7 @@ import static org.springblade.manager.formula.TurnPoint.*;
 public interface ITurnPointCalculator {
     Long VERSION=202310121730L;
      String ZD_REG="(?i)zd\\d+";
+     /*核心计算*/
     static List<TurnPoint> create(List<Map<String, Object>> data, LinkedHashMap<String, String> configMap,LevelInfo levelInfo) {
         /*1.验证数据的合理性，如果已经合理则不需要计算
         * 2.尝试补充数据，如果不合理则重新生成转点，并用正尺方式生成

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

@@ -56,6 +56,8 @@ public class LevelInfo implements  Cloneable {
 
     /**测量数据是否可推导*/
     private boolean persist=false;
+    /**是否开启距离转点模式，宝北项目隧道一个仪高点只能测量两百米范围的测点，超过就必须进行转点，所有需要配合桩号距离判断*/
+    private boolean distance=false;
 
     public Double getBmdSj() {
         return bmdSj;
@@ -178,4 +180,11 @@ public class LevelInfo implements  Cloneable {
            this.closeZd=new ArrayList<>();
     }
 
+    public boolean isDistance() {
+        return distance;
+    }
+
+    public void setDistance(boolean distance) {
+        this.distance = distance;
+    }
 }