Merge branch 'test' into test-training2-zhouyin

src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java

@@ -1017,6 +1017,8 @@ public class MapDeviceBuilder {
             if (Objects.nonNull(elementMap.get(section.getCode()))) {
                 errMsgList.add(String.format("编码为[%s]的区段不唯一", section.getCode()));
             }
+            section.setKmMin(sectionVO.getKmMin());
+            section.setKmMax(sectionVO.getKmMax());
             elementMap.put(section.getCode(), section);
             section.setRoadType(sectionVO.getRoadType());
             section.setPhysical(MapDeviceBuilder.isPhysicalSection(sectionVO.getType()));

src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java

@@ -172,6 +172,15 @@ public class Section extends DelayUnlockDevice {
      */
     private boolean hasStopCountDown;
 
+    /**
+     * 公里标 最小(米)
+     */
+    private Float kmMin;
+    /**
+     * 公里标 最大(米)
+     */
+    private Float kmMax;
+
     // ------------------状态属性---------------------
 
     /**

src/main/java/club/joylink/rtss/vo/map/graph/MapSectionNewVO.java

@@ -277,12 +277,12 @@ public class MapSectionNewVO {
     /**
      * 左侧公里标（厘米）
      */
-    private Float kmRangeLeft;
+//    private Float kmRangeLeft;
 
     /**
      * 右侧公里标（厘米）
      */
-    private Float kmRangeRight;
+//    private Float kmRangeRight;
 
     /**
      * 区间
@@ -307,4 +307,13 @@ public class MapSectionNewVO {
      */
     private String srCode;
 
+    /**
+     * 公里标最小(米)
+     */
+    private Float kmMin;
+    /**
+     * 公里标最大(米)
+     */
+    private Float kmMax;
+
 }