From 67938c65975a002c487acf42488bc93382a2dc7a Mon Sep 17 00:00:00 2001
From: tiger_zhou <123456>
Date: Mon, 5 Sep 2022 15:13:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=898=E5=8F=B7=E7=BA=BF=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=E5=85=AC=E9=87=8C=E6=A0=87=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simulation/cbtc/build/MapDeviceBuilder.java     |  2 ++
 .../rtss/simulation/cbtc/data/map/Section.java      |  9 +++++++++
 .../joylink/rtss/vo/map/graph/MapSectionNewVO.java  | 13 +++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java
index f6534d99b..1dc33a437 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java
+++ b/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()));
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
index 6903d8c4b..7a27284df 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
@@ -169,6 +169,15 @@ public class Section extends DelayUnlockDevice {
      */
     private boolean hasStopCountDown;
 
+    /**
+     * 公里标 最小(米)
+     */
+    private Float kmMin;
+    /**
+     * 公里标 最大(米)
+     */
+    private Float kmMax;
+
     // ------------------状态属性---------------------
 
     /**
diff --git a/src/main/java/club/joylink/rtss/vo/map/graph/MapSectionNewVO.java b/src/main/java/club/joylink/rtss/vo/map/graph/MapSectionNewVO.java
index 930f01490..ba6055a23 100644
--- a/src/main/java/club/joylink/rtss/vo/map/graph/MapSectionNewVO.java
+++ b/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;
+
 }