From 01b440646b7988bfe5d502487fb39e16283332dd Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Fri, 15 Dec 2023 17:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=9A=84proto=20id=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiannccda/alert/AlertDetailFactory.java   |    2 +-
 .../core/relieve/RelieveFilterManager.java    |    4 +-
 .../ats/cache/LineGraphicDataRepository.java  |  101 +-
 .../convertor/LineNetTrainComMethod.java      |   26 +-
 .../collect/datasource/InterLockData.java     |    8 +-
 .../ats/warn/AllLineBlueAlertListener.java    |    3 +-
 .../ats/warn/AxleLedAlertListener.java        |    8 +-
 .../warn/AxleSwitchTrackLedAlertListener.java |    4 +-
 .../AxleSwitchTrackLedMostAlertListener.java  |    4 +-
 .../xiannccda/ats/warn/BlueAlertListener.java |    3 +-
 .../ats/warn/PlatformAlertMonitoringTask.java |    4 +-
 .../warn/SwitchLostAlertMonitoringTask.java   |    2 +-
 .../warn/SwitchLostAlertMonitoringTask2.java  |    2 +-
 .../ats/warn/SwitchLostMostAlertListener.java |    4 +-
 .../warn/TrainAtpCutAlertMonitoringTask.java  |    2 +-
 .../xiannccda/dto/protos/DeviceInfoProto.java |  628 ++---
 .../dto/protos/LayoutGraphicsProto.java       | 2299 ++++++++++++-----
 .../xiannccda/service/AlertInfoService.java   |   12 +-
 .../xiannccda/service/AlertRecordService.java |    2 +-
 .../joylink/xiannccda/vo/AreaConfigVO.java    |    6 +-
 20 files changed, 1970 insertions(+), 1154 deletions(-)

diff --git a/src/main/java/club/joylink/xiannccda/alert/AlertDetailFactory.java b/src/main/java/club/joylink/xiannccda/alert/AlertDetailFactory.java
index c4b172a..78bff78 100644
--- a/src/main/java/club/joylink/xiannccda/alert/AlertDetailFactory.java
+++ b/src/main/java/club/joylink/xiannccda/alert/AlertDetailFactory.java
@@ -119,7 +119,7 @@ public class AlertDetailFactory {
 
   private String getPlatformDesc(int lineId, Platform platform) {
     Station station = LineGraphicDataRepository.getDeviceByCode(lineId,
-        platform.getRefStation(), Station.class);
+        String.valueOf(platform.getRefStation()), Station.class);
     return String.format("[%s][%s行站台]", station.getName(), platform.getUp() ? "上" : "下");
   }
 
diff --git a/src/main/java/club/joylink/xiannccda/alert/core/relieve/RelieveFilterManager.java b/src/main/java/club/joylink/xiannccda/alert/core/relieve/RelieveFilterManager.java
index 195206b..d836ee0 100644
--- a/src/main/java/club/joylink/xiannccda/alert/core/relieve/RelieveFilterManager.java
+++ b/src/main/java/club/joylink/xiannccda/alert/core/relieve/RelieveFilterManager.java
@@ -29,9 +29,9 @@ public class RelieveFilterManager implements ApplicationRunner {
    * @param deviceLayoutId
    * @return true = 解除告警，false = 需要告警
    */
-  public boolean relieveAlertMatch(Integer lineId, AlertDeviceType deviceType, AlertType alertType, String deviceLayoutId) {
+  public boolean relieveAlertMatch(Integer lineId, AlertDeviceType deviceType, AlertType alertType, Integer deviceLayoutId) {
     for (RelieveFilter filter : RELIEVE_FILTER_LIST) {
-      MatcherResult result = filter.isMatch(lineId, deviceType, alertType, deviceLayoutId);
+      MatcherResult result = filter.isMatch(lineId, deviceType, alertType, deviceLayoutId.toString());
       if (result.nextFilter) {
         if (Objects.equals(false, result.result)) {
           return false;
diff --git a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java
index a7241da..42645c5 100644
--- a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java
+++ b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java
@@ -15,10 +15,7 @@ import club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType
 import club.joylink.xiannccda.entity.PublishedGi;
 import club.joylink.xiannccda.exception.BusinessExceptionAssertEnum;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.GeneratedMessageV3.Builder;
@@ -42,9 +39,13 @@ import org.apache.commons.lang3.StringUtils;
 public class LineGraphicDataRepository {
 
   /**
-   * 线路数据信息
+   * 线路数据信息 k1 = 线路id
+   * <p>
+   * k2 = 设备类型
+   * <p>
+   * k3 = 设备图中的id
    */
-  private static final Map<Integer, Map<String, Map<String, Builder>>> lineGraphMap =
+  private static final Map<Integer, Map<String, Map<Integer, Builder>>> lineGraphMap =
       new ConcurrentHashMap<>();
 
   /**
@@ -54,7 +55,7 @@ public class LineGraphicDataRepository {
       new HashMap<>();
 
   /**
-   * 线路-设备code-设备
+   * 线路-设备code(包含设备id)-设备
    */
   private static final HashBasedTable<Integer, String, MessageOrBuilder> line_code_table =
       HashBasedTable.create();
@@ -85,7 +86,7 @@ public class LineGraphicDataRepository {
         LayoutGraphicsProto.RtssGraphicStorage storage =
             LayoutGraphicsProto.RtssGraphicStorage.parseFrom(publishGi.getProto());
         //        DeviceNameChanger.init(storage);
-        Map<String, Map<String, Builder>> lineDataMap = new HashMap<>();
+        Map<String, Map<Integer, Builder>> lineDataMap = new HashMap<>();
         // 构建区段
         physicalSectionInitLineGraph(lineDataMap, storage);
         // 构建道岔
@@ -103,29 +104,27 @@ public class LineGraphicDataRepository {
         // 填充line_code_table
         fillLineCodeTable(publishGi.getLineId(), storage);
 
-        Map<String, Map<String, Builder>> tmpMaper = lineGraphMap.get(publishGi.getLineId());
+        Map<String, Map<Integer, Builder>> tmpMaper = lineGraphMap.get(publishGi.getLineId());
         if (CollectionUtils.isEmpty(tmpMaper)) {
           return;
         }
-        Map<String, Builder> turnoutMap = tmpMaper.get(DeviceType.Turnout.name());
+        Map<Integer, Builder> turnoutMap = tmpMaper.get(DeviceType.Turnout.name());
 
-        Map<String, Builder> builderMap = tmpMaper.get(DeviceType.Section.name());
-        /*if (CollectionUtils.isEmpty(builderMap)) {
-          return;
-        }*/
+        Map<Integer, Builder> builderMap = tmpMaper.get(DeviceType.Section.name());
 
         for (Section section : storage.getSectionList()) {
           if (section.getSectionType() == SectionType.TurnoutPhysical) {
-            for (String s : section.getChildrenList()) {
-              Builder b = turnoutMap.get(s);
+
+            for (Integer childId : section.getChildrenList()) {
+              Builder b = turnoutMap.get(childId);
               if (b instanceof DeviceInfoProto.Turnout.Builder logicSection) {
                 LOGIC_SECTION_TO_SECTION_TABLE.put(publishGi.getLineId(), logicSection.getCode(), section.getCode());
                 LOGIC_SECTION_TO_AXLE_TABLE.put(publishGi.getLineId(), section.getCode(), logicSection.getCode());
               }
             }
           } else {
-            for (String s : section.getChildrenList()) {
-              Builder b = builderMap.get(s);
+            for (Integer childId : section.getChildrenList()) {
+              Builder b = builderMap.get(childId);
               if (b instanceof DeviceInfoProto.Section.Builder logicSection) {
                 LOGIC_SECTION_TO_SECTION_TABLE.put(publishGi.getLineId(), logicSection.getCode(), logicSection.getCode());
                 LOGIC_SECTION_TO_AXLE_TABLE.put(publishGi.getLineId(), logicSection.getCode(), section.getCode());
@@ -146,7 +145,7 @@ public class LineGraphicDataRepository {
     }
     if (sectionMsg instanceof Section section) {
       Stream<LayoutGraphicsProto.Platform> platformStream = LineGraphicDataRepository.getDevices(lineId, LayoutGraphicsProto.Platform.class);
-      return platformStream.filter(d -> StringUtils.equals(d.getRefSectionId(), section.getCommon().getId())).findFirst();
+      return platformStream.filter(d -> d.getRefSectionId() == section.getCommon().getId()).findFirst();
     }
     return Optional.empty();
   }
@@ -164,9 +163,9 @@ public class LineGraphicDataRepository {
    * @return 公里标
    */
   public static DeviceKilometer.Builder getKilometerCodeList(int lineId, String sectionName) {
-    Map<String, Map<String, Builder>> lineDataMap = lineGraphMap.get(lineId);
+    Map<String, Map<Integer, Builder>> lineDataMap = lineGraphMap.get(lineId);
     if (CollectionUtils.isNotEmpty(lineDataMap)) {
-      Map<String, Builder> sectionMap = lineDataMap.get(DeviceType.Section.name());
+      Map<Integer, Builder> sectionMap = lineDataMap.get(DeviceType.Section.name());
       for (Builder v : sectionMap.values()) {
         DeviceInfoProto.Section.Builder builder = (DeviceInfoProto.Section.Builder) v;
         if (Objects.equals(builder.getCode(), sectionName)) {
@@ -174,7 +173,7 @@ public class LineGraphicDataRepository {
         }
       }
 
-      Map<String, Builder> turnoutMap = lineDataMap.get(DeviceType.Turnout.name());
+      Map<Integer, Builder> turnoutMap = lineDataMap.get(DeviceType.Turnout.name());
       for (Builder v : turnoutMap.values()) {
         DeviceInfoProto.Turnout.Builder builder = (DeviceInfoProto.Turnout.Builder) v;
         if (Objects.equals(builder.getCode(), sectionName)) {
@@ -260,9 +259,14 @@ public class LineGraphicDataRepository {
             continue;
           }
           MessageOrBuilder common = (MessageOrBuilder) builder.getField(commonField);
-
-          String id = (String) common.getField(idField);
-          line_code_table.put(lineId, id, builder);
+          Object idObjVal = common.getField(idField);
+          String idTmpVal = "";
+          if (idObjVal instanceof String idVal) {
+            idTmpVal = idVal;
+          } else if (idObjVal instanceof Integer idVal) {
+            idTmpVal = String.valueOf(idVal);
+          }
+          line_code_table.put(lineId, idTmpVal, builder);
         }
       }
     });
@@ -274,8 +278,8 @@ public class LineGraphicDataRepository {
    * @param lineId 线路ID
    * @return 区段集合
    */
-  public static Map<String, Builder> getLineSectionBuild(int lineId) {
-    Map<String, Map<String, Builder>> lineDataMap = lineGraphMap.get(lineId);
+  public static Map<Integer, Builder> getLineSectionBuild(int lineId) {
+    Map<String, Map<Integer, Builder>> lineDataMap = lineGraphMap.get(lineId);
     if (CollectionUtils.isNotEmpty(lineDataMap)) {
       return lineDataMap.get(DeviceType.Section.name());
     }
@@ -289,20 +293,20 @@ public class LineGraphicDataRepository {
    * @param storage 地图构建数据
    */
   private static void physicalSectionInitLineGraph(
-      Map<String, Map<String, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
+      Map<String, Map<Integer, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
     // 先初始化物理区段信息
     List<Section> sectionList =
         storage.getSectionList().stream()
             .filter(s -> Objects.equals(s.getSectionType(), SectionType.Physical))
             .toList();
     // 物理区段数据 + 逻辑区段数据（预设值[物理section数量 * 【ABCD】]）
-    Map<String, Builder> sectionMap = new HashMap<>(sectionList.size() * 5);
+    Map<Integer, Builder> sectionMap = new HashMap<>(sectionList.size() * 5);
     sectionList.stream()
         // 目前数据中还存在 区段类型为 逻辑区段类型暂时先过滤掉错误
         .filter(section -> !SectionType.UNRECOGNIZED.equals(section.getSectionType()))
         .forEach(
             section -> {
-              String sid = section.getCommon().getId();
+              Integer sid = section.getCommon().getId();
               DeviceInfoProto.Section.Builder sectionBuilder = initSection(sectionMap, sid);
               sectionBuilder.setCode(section.getCode());
               sectionBuilder.setDestinationCode(section.getDestinationCode());
@@ -326,11 +330,11 @@ public class LineGraphicDataRepository {
    */
   private static void turnoutInitLineGraph(
       Integer lineId,
-      Map<String, Map<String, Builder>> dataMap,
+      Map<String, Map<Integer, Builder>> dataMap,
       LayoutGraphicsProto.RtssGraphicStorage storage) {
     Map<String, CoordinateConvertor> convertorMap =
         lineCoordinateMain.computeIfAbsent(lineId, id -> new HashMap<>());
-    Map<String, Builder> cacheSwitchMap = new HashMap<>(storage.getTurnoutsList().size());
+    Map<Integer, Builder> cacheSwitchMap = new HashMap<>(storage.getTurnoutsList().size());
     storage.getTurnoutsList().stream()
         .forEach(
             t -> {
@@ -355,19 +359,19 @@ public class LineGraphicDataRepository {
    * @param storage
    */
   private static void setUpTurnoutPhysicalSectionInfo(
-      Map<String, Map<String, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
-    Map<String, Builder> curSectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
-    Map<String, Builder> turnoutMap = dataMap.getOrDefault(DeviceType.Turnout.name(), Map.of());
+      Map<String, Map<Integer, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
+    Map<Integer, Builder> curSectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
+    Map<Integer, Builder> turnoutMap = dataMap.getOrDefault(DeviceType.Turnout.name(), Map.of());
     // 先初始化物理区段信息
     List<Section> sectionList =
         storage.getSectionList().stream()
             .filter(s -> Objects.equals(s.getSectionType(), SectionType.TurnoutPhysical))
             .toList();
     // 道岔区段数据
-    Map<String, Builder> sectionMap = new HashMap<>(sectionList.size());
+    Map<Integer, Builder> sectionMap = new HashMap<>(sectionList.size());
     sectionList.forEach(
         section -> {
-          String sid = section.getCommon().getId();
+          Integer sid = section.getCommon().getId();
           DeviceInfoProto.Section.Builder s = initSection(sectionMap, sid);
           s.setCode(section.getCode());
           s.setDestinationCode(section.getDestinationCode());
@@ -396,12 +400,12 @@ public class LineGraphicDataRepository {
    */
   private static void setUpKilometerCode(
       Integer lineId,
-      Map<String, Map<String, Builder>> dataMap,
+      Map<String, Map<Integer, Builder>> dataMap,
       LayoutGraphicsProto.RtssGraphicStorage storage) {
     // 初始化转换信息
     initConvertorCoordinate(lineId, dataMap, storage);
-    Map<String, Builder> sectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
-    Map<String, Builder> turnoutMap = dataMap.getOrDefault(DeviceType.Turnout.name(), Map.of());
+    Map<Integer, Builder> sectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
+    Map<Integer, Builder> turnoutMap = dataMap.getOrDefault(DeviceType.Turnout.name(), Map.of());
     storage.getAxleCountingsList().stream()
         .filter(ac -> StringUtils.isNotEmpty(ac.getKilometerSystem().getCoordinateSystem()))
         .forEach(
@@ -443,10 +447,10 @@ public class LineGraphicDataRepository {
    */
   private static void initConvertorCoordinate(
       Integer lineId,
-      Map<String, Map<String, Builder>> dataMap,
+      Map<String, Map<Integer, Builder>> dataMap,
       LayoutGraphicsProto.RtssGraphicStorage storage) {
     // 强制转换道岔
-    Map<String, Builder> turnoutMap = dataMap.get(DeviceType.Turnout.name());
+    Map<Integer, Builder> turnoutMap = dataMap.get(DeviceType.Turnout.name());
     if (CollectionUtils.isEmpty(turnoutMap)) {
       return;
     }
@@ -580,8 +584,9 @@ public class LineGraphicDataRepository {
    * @param storage 地图信息
    */
   private static void setUpLogicSectionInfo(
-      Map<String, Map<String, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
-    Map<String, Builder> sectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
+      Map<String, Map<Integer, Builder>> dataMap, LayoutGraphicsProto.RtssGraphicStorage storage) {
+
+    Map<Integer, Builder> sectionMap = dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
     if (sectionMap.isEmpty()) {
       return;
     }
@@ -589,13 +594,13 @@ public class LineGraphicDataRepository {
         .getLogicSectionsList()
         .forEach(
             section -> {
-              String sid = section.getCommon().getId();
+              Integer sid = section.getCommon().getId();
               if (sectionMap.containsKey(sid)) {
                 DeviceInfoProto.Section.Builder sectionBuilder = findSection(sectionMap, sid);
                 sectionBuilder.setCode(section.getCode());
                 // 获取到物理区段信息
                 DeviceInfoProto.Section.Builder physicalSection =
-                    findSection(sectionMap, sectionBuilder.getPhysicalSectionId());
+                    findSection(sectionMap, Integer.valueOf(sectionBuilder.getPhysicalSectionId()));
                 DeviceKilometer.Builder deviceKilometer = sectionBuilder.getKilometerBuilder();
                 DeviceKilometer.Builder parentKilometer = physicalSection.getKilometerBuilder();
                 if (parentKilometer.getKilometerSystemCount() > 0) {
@@ -678,7 +683,7 @@ public class LineGraphicDataRepository {
    * @param id  区段ID
    * @return 区段实体信息
    */
-  private static DeviceInfoProto.Section.Builder initSection(Map<String, Builder> map, String id) {
+  private static DeviceInfoProto.Section.Builder initSection(Map<Integer, Builder> map, Integer id) {
     if (map.containsKey(id)) {
       return (DeviceInfoProto.Section.Builder) map.get(id);
     } else {
@@ -697,7 +702,7 @@ public class LineGraphicDataRepository {
    * @param id  区段ID
    * @return 区段信息
    */
-  private static DeviceInfoProto.Section.Builder findSection(Map<String, Builder> map, String id) {
+  private static DeviceInfoProto.Section.Builder findSection(Map<Integer, Builder> map, Integer id) {
     if (map.containsKey(id)) {
       return (DeviceInfoProto.Section.Builder) map.get(id);
     }
@@ -711,7 +716,7 @@ public class LineGraphicDataRepository {
    * @param id  道岔ID
    * @return 道岔信息
    */
-  private static DeviceInfoProto.Turnout.Builder findTurnout(Map<String, Builder> map, String id) {
+  private static DeviceInfoProto.Turnout.Builder findTurnout(Map<Integer, Builder> map, Integer id) {
     if (map.containsKey(id)) {
       return (DeviceInfoProto.Turnout.Builder) map.get(id);
     }
diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainComMethod.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainComMethod.java
index ababc1a..f202e81 100644
--- a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainComMethod.java
+++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainComMethod.java
@@ -18,7 +18,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 
-/** 线网的列车数据，一些公共方法 */
+/**
+ * 线网的列车数据，一些公共方法
+ */
 @Slf4j
 public abstract class LineNetTrainComMethod {
 
@@ -50,8 +52,8 @@ public abstract class LineNetTrainComMethod {
   /**
    * 设置公里标信息
    *
-   * @param obj 要设置的对象
-   * @param type 所在设备类型
+   * @param obj        要设置的对象
+   * @param type       所在设备类型
    * @param deviceName 设备名称
    */
   public static void setUpKilometerCode(
@@ -68,11 +70,11 @@ public abstract class LineNetTrainComMethod {
   /**
    * 根据目的码确定方向，并确定公里标
    *
-   * @param obj 要设置的对象
-   * @param globalId 车次号
+   * @param obj             要设置的对象
+   * @param globalId        车次号
    * @param destinationCode 目的码
-   * @param type 设备类型
-   * @param name 设备名称
+   * @param type            设备类型
+   * @param name            设备名称
    */
   public static void setTrainDirectionAndKilometerCode(
       WsMessageProto.WsLineNetTrainOffsetMessage.Builder obj,
@@ -114,8 +116,8 @@ public abstract class LineNetTrainComMethod {
    * 获取设备的公里标
    *
    * @param lineId 线路ID
-   * @param type 设备类型
-   * @param name 设备名称
+   * @param type   设备类型
+   * @param name   设备名称
    * @return 公里标列表
    */
   private static DeviceKilometer.Builder getDeviceKM(int lineId, DeviceType type, String name) {
@@ -133,11 +135,11 @@ public abstract class LineNetTrainComMethod {
    * 获取目的地码的公里标信息
    *
    * @param lineId 线路ID
-   * @param code 目的地码
+   * @param code   目的地码
    * @return 公里标列表
    */
   private static DeviceKilometer.Builder getDirectionCodeKM(int lineId, String code) {
-    Map<String, Builder> map = LineGraphicDataRepository.getLineSectionBuild(lineId);
+    Map<Integer, Builder> map = LineGraphicDataRepository.getLineSectionBuild(lineId);
     Optional<Builder> destination =
         map.values().stream()
             .filter(
@@ -158,7 +160,7 @@ public abstract class LineNetTrainComMethod {
    * 选择对应的公里标信息
    *
    * @param dir 运行方向
-   * @param km 公里标信息
+   * @param km  公里标信息
    * @return 公里标
    */
   private static long selectDeviceKilometerCode(int dir, DeviceKilometer.Builder km) {
diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/datasource/InterLockData.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/datasource/InterLockData.java
index 1b4d315..3e7e685 100644
--- a/src/main/java/club/joylink/xiannccda/ats/message/collect/datasource/InterLockData.java
+++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/datasource/InterLockData.java
@@ -66,10 +66,10 @@ public class InterLockData extends AbstractData {
 //    this.handleLevelOne(AlertType.INTERLOCK_LEVEL_TWO, alertTypeListMap, builder, lineId);
   }
 
-  private List<Station> sortRtu(String[] datas, Integer lineId) {
+  private List<Station> sortRtu(Integer[] datas, Integer lineId) {
     List<Station> stationList = Lists.newArrayList();
-    for (String data : datas) {
-      Station stationS = LineGraphicDataRepository.getDeviceByCode(lineId, data, Station.class);
+    for (Integer data : datas) {
+      Station stationS = LineGraphicDataRepository.getDeviceByCode(lineId, data.toString(), Station.class);
       stationList.add(stationS);
     }
     stationList.sort((o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getCode(), o2.getCode()));
@@ -116,7 +116,7 @@ public class InterLockData extends AbstractData {
       detail.setRtuId(deviceRtuId);
       INTER_LOCK_TABLE.put(names, tableColumn, detail);
     }
-    detail.addDevice(commonInfo.getId());
+    detail.addDevice(commonInfo.getOldid());
   }
 
   private String interLockMapName(AlertType alertType, AlertDeviceType deviceTyp) {
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/AllLineBlueAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/AllLineBlueAlertListener.java
index a497440..a6d47dc 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/AllLineBlueAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/AllLineBlueAlertListener.java
@@ -32,8 +32,7 @@ public class AllLineBlueAlertListener implements AlertSourceEventListener<AllLin
     if (alertManager.needMostShow(rtu.getLineId(), BlueAlertListener.BLUE_DISPLAY_NAME, event.allControlStationSize)
         && alertManager.putAlterDevice(rtu.getLineId(), BlueAlertListener.BLUE_DISPLAY_NAME, BlueAlertListener.ALL_BLUE_DISPLAY_VAL_FLAG)) {
       NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.ALL_LINE_BLUE_DISPLAY, rtu, BlueAlertListener.ALL_BLUE_DISPLAY_VAL_FLAG,
-          event.station.getCommon().getId(),
-          AlertDeviceType.DEVICE_TYPE_RTU, false);
+          String.valueOf(event.station.getCommon().getId()), AlertDeviceType.DEVICE_TYPE_RTU, false);
       alertManager.emit(alertInfo);
     }
   }
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/AxleLedAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/AxleLedAlertListener.java
index afb1d60..59e1545 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/AxleLedAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/AxleLedAlertListener.java
@@ -85,8 +85,8 @@ public class AxleLedAlertListener implements AlertSourceEventListener<AxleLedAle
     List<Boolean> orangeList = Lists.newArrayList();
 
     DeviceStatusData deviceStatusData = DeviceDataRepository.findDataSouce(String.valueOf(trackBuild.getLineId()), DataTypeEnum.DEVICE);
-    for (String childId : axleSection.getChildrenList()) {
-      LogicSection childSection = LineGraphicDataRepository.getDeviceByCode(trackBuild.getLineId(), childId, LogicSection.class);
+    for (Integer childId : axleSection.getChildrenList()) {
+      LogicSection childSection = LineGraphicDataRepository.getDeviceByCode(trackBuild.getLineId(), childId.toString(), LogicSection.class);
       String trainGroupId = trainDataSource.findTrainForDeviceName(childSection.getCode());
       if (StringUtils.isNotEmpty(trainGroupId)) {
         redList.add(false);
@@ -115,7 +115,7 @@ public class AxleLedAlertListener implements AlertSourceEventListener<AxleLedAle
     Integer rtuId = DeviceStatusDataOperate.findFieldVal(build, "rtuId", Integer.class);
     String deviceCodeId = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "code", String.class);
     CommonInfo commonInfo = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "common", CommonInfo.class);
-    String layoutDeviceId = commonInfo.getId();
+    Integer layoutDeviceId = commonInfo.getId();
     String ledName = alertType == AlertType.AXLE_LED_RED ? "红光带" : "橙光带";
     String ledPutName = this.getDefaultName(alertType, lineId, rtuId);
     if (light) {
@@ -123,7 +123,7 @@ public class AxleLedAlertListener implements AlertSourceEventListener<AxleLedAle
       if (alertManager.putAlterDevice(lineId, ledPutName, deviceCodeId) && Objects.equals(false,
           relieveFilterManager.relieveAlertMatch(lineId, AlertDeviceType.DEVICE_TYPE_TRACK, alertType, layoutDeviceId))) {
         String alertMsg = String.format("出现%s设备[%s]", ledName, deviceCodeId);
-        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), alertType, build, alertMsg, layoutDeviceId, AlertDeviceType.DEVICE_TYPE_TRACK, false);
+        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), alertType, build, alertMsg, String.valueOf(layoutDeviceId), AlertDeviceType.DEVICE_TYPE_TRACK, false);
         alertManager.emit(alertInfo);
         alertManager.emit(new SwitchAndTrackLedMostAlertEvent(build, alertType, lineId, layoutDeviceId, deviceCodeId, true));
 //        alertManager.emit(new SwitchAndTrackLedInterLockL2AlertEvent(build, alertType, lineId, layoutDeviceId, deviceCodeId, true, rtuId));
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedAlertListener.java
index 0208f11..3ee8726 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedAlertListener.java
@@ -104,14 +104,14 @@ public class AxleSwitchTrackLedAlertListener implements AlertSourceEventListener
     Integer rtuId = DeviceStatusDataOperate.findFieldVal(build, "rtuId", Integer.class);
     String deviceCodeId = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "code", String.class);
     CommonInfo commonInfo = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "common", CommonInfo.class);
-    String layoutDeviceId = commonInfo.getId();
+    Integer layoutDeviceId = commonInfo.getId();
     String ledName = alertType == AlertType.AXLE_LED_RED ? "红光带" : "橙光带";
     String ledPutName = this.getDefaultName(alertType, lineId, rtuId);
     if (light) {
       log.info("光带检测到[{}] 线路[{}] 设备[{}] 告警[{}]", ledName, lineId, deviceCodeId, alertType.name());
       if (alertManager.putAlterDevice(lineId, ledPutName, deviceCodeId)) {
         String alertMsg = String.format("出现%s设备[%s]", ledName, deviceCodeId);
-        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), alertType, build, alertMsg, layoutDeviceId, AlertDeviceType.DEVICE_TYPE_TRACK, false);
+        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), alertType, build, alertMsg, String.valueOf(layoutDeviceId), AlertDeviceType.DEVICE_TYPE_TRACK, false);
         alertManager.emit(alertInfo);
         alertManager.emit(new SwitchAndTrackLedMostAlertEvent(build, alertType, lineId, layoutDeviceId, deviceCodeId, true));
 //        alertManager.emit(new SwitchAndTrackLedInterLockL2AlertEvent(build, alertType, lineId, layoutDeviceId, deviceCodeId, true, rtuId));
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedMostAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedMostAlertListener.java
index b047b93..7fe181c 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedMostAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/AxleSwitchTrackLedMostAlertListener.java
@@ -67,11 +67,11 @@ public class AxleSwitchTrackLedMostAlertListener implements AlertSourceEventList
 
     private AlertType alertType;
     private int lineId;
-    private String layoutDeviceId;
+    private Integer layoutDeviceId;
     private boolean alert;
     private String realDeviceCodeId;
 
-    public SwitchAndTrackLedMostAlertEvent(Builder source, AlertType alertType, int lineId, String layoutDeviceId, String realDeviceCodeId, boolean alert) {
+    public SwitchAndTrackLedMostAlertEvent(Builder source, AlertType alertType, int lineId, Integer layoutDeviceId, String realDeviceCodeId, boolean alert) {
       super(source);
       this.alertType = alertType;
       this.lineId = lineId;
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/BlueAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/BlueAlertListener.java
index 2bd0172..5eee2fe 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/BlueAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/BlueAlertListener.java
@@ -65,7 +65,8 @@ public class BlueAlertListener implements AlertSourceEventListener<BlueDisplayAl
         Optional<AreaConfigVO> alertInfoMostOptional = this.alertInfoService.findAreaDevice(AlertType.BLUE_DISPLAY, AlertDeviceType.DEVICE_TYPE_RTU, station.getCommon().getId(), rtu.getLineId());
         String alertInfoMostName = alertInfoMostOptional.map(AreaConfigVO::getAreaName).orElse(String.format("%s 集中站中断连接 ", station.getName()));
         int allControlStationSize = CONTROL_STATION_MAPER.get(rtu.getLineId()).size();
-        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.BLUE_DISPLAY, rtu, alertInfoMostName, station.getCommon().getId(), AlertDeviceType.DEVICE_TYPE_RTU,
+        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.BLUE_DISPLAY, rtu, alertInfoMostName, String.valueOf(station.getCommon().getId()),
+            AlertDeviceType.DEVICE_TYPE_RTU,
             false);
         alertManager.emit(alertInfo);
         alertManager.emit(new AllLineBlueDisplayAlertEvent(rtu, station, allControlStationSize));
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/PlatformAlertMonitoringTask.java b/src/main/java/club/joylink/xiannccda/ats/warn/PlatformAlertMonitoringTask.java
index e1466b7..0c64ee4 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/PlatformAlertMonitoringTask.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/PlatformAlertMonitoringTask.java
@@ -79,9 +79,9 @@ public class PlatformAlertMonitoringTask implements AlertMonitoringTask {
     return "PLATFORM_CLOSE_OR_OPEN_ALTER";
   }
 
-  private String findRefStationName(int lineId, String stationId) {
+  private String findRefStationName(int lineId, Integer stationId) {
     Stream<Station> stream = LineGraphicDataRepository.getDevices(lineId, Station.class);
-    Optional<Station> stationOptional = stream.filter(d -> StringUtils.equalsIgnoreCase(d.getCommon().getId(), stationId)).findAny();
+    Optional<Station> stationOptional = stream.filter(d -> d.getCommon().getId() == stationId).findAny();
     return stationOptional.map(Station::getName).orElse(null);
   }
 
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask.java b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask.java
index 539d5f9..edeb65a 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask.java
@@ -89,7 +89,7 @@ public class SwitchLostAlertMonitoringTask implements AlertMonitoringTask {
       //失表超时
       if (alertManager.putAlterDevice(lineId, switchPutName, savedSwitchBuild.getId())) {
         String alertMsg = String.format("设备[%s]失表", savedSwitchBuild.getId());
-        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.SWITCH_LOST, savedSwitchBuild, alertMsg, turnout.getCommon().getId(),
+        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.SWITCH_LOST, savedSwitchBuild, alertMsg, String.valueOf(turnout.getCommon().getId()),
             AlertDeviceType.DEVICE_TYPE_SWITCH, false);
         alertManager.emit(alertInfo);
         alertManager.emit(new SwitchLostMostEvent(savedSwitchBuild, true, turnout));
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask2.java b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask2.java
index 5229b4f..a9402e6 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask2.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostAlertMonitoringTask2.java
@@ -107,7 +107,7 @@ public class SwitchLostAlertMonitoringTask2 implements AlertMonitoringTask {
         log.info("道岔失表超时，准备报警 线路[{}] 设备[{}] 接受时间[{}] 发送时间[{}] 对应地图设备id[{}]"
             , lineId, switchBuild.getId(), switchBuild.getReceiveTime(), switchBuild.getTimestamp(), turnout.getCommon().getId());
         String alertMsg = String.format("设备[%s]失表", switchBuild.getId());
-        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.SWITCH_LOST, switchBuild, alertMsg, turnout.getCommon().getId(),
+        NccAlertInfo alertInfo = this.alertInfoService.createAlert2(Optional.empty(), AlertType.SWITCH_LOST, switchBuild, alertMsg, String.valueOf(turnout.getCommon().getId()),
             AlertDeviceType.DEVICE_TYPE_SWITCH, false);
         alertManager.emit(alertInfo);
         alertManager.emit(new SwitchLostMostEvent(switchBuild, true, turnout));
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostMostAlertListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostMostAlertListener.java
index c512736..eec767f 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostMostAlertListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchLostMostAlertListener.java
@@ -36,8 +36,8 @@ public class SwitchLostMostAlertListener implements AlertSourceEventListener<Swi
 
   private final AlertManager alertManager = AlertManager.getDefault();
 
-  private List<String> findDeviceIdFormCode(Integer lineId, List<String> deviceCodes) {
-    List<String> list = Lists.newArrayList();
+  private List<Integer> findDeviceIdFormCode(Integer lineId, List<String> deviceCodes) {
+    List<Integer> list = Lists.newArrayList();
     for (String deviceCode : deviceCodes) {
       Turnout turnout = LineGraphicDataRepository.getDeviceByCode(lineId, deviceCode, Turnout.class);
       list.add(turnout.getCommon().getId());
diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/TrainAtpCutAlertMonitoringTask.java b/src/main/java/club/joylink/xiannccda/ats/warn/TrainAtpCutAlertMonitoringTask.java
index c052b02..eb07322 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/TrainAtpCutAlertMonitoringTask.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/TrainAtpCutAlertMonitoringTask.java
@@ -102,7 +102,7 @@ public class TrainAtpCutAlertMonitoringTask implements AlertMonitoringTask {
     MessageOrBuilder turnoutOrLogicSection = LineGraphicDataRepository.getDeviceByCode(trainInfo.getLineId(), sectionCode);
     CommonInfo commonInfo = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "common", CommonInfo.class);
     String deviceCode = DeviceStatusDataOperate.findFieldVal(turnoutOrLogicSection, "code", String.class);
-    String layoutDeviceId = commonInfo.getId();
+    Integer layoutDeviceId = commonInfo.getId();
     if (alertManager.putAlterDevice(trainInfo.getLineId(), this.getName(), trainInfo.getGroupId())) {
       log.info("列车紧制ATP检测告警 线路[{}] 列车车组号[{}] 所在设备[{}]", trainInfo.getLineId(), trainInfo.getGroupId(), trainInfo.getDevName());
       String alertMsg = String.format("列车[%s] 紧制导致ATP切除所在区段[%s]", trainInfo.getGroupId(), deviceCode);
diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java
index ea5f307..38fcea4 100644
--- a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java
+++ b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java
@@ -19,16 +19,10 @@ public final class DeviceInfoProto {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string id = 1;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
-    java.lang.String getId();
-    /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
-     */
-    com.google.protobuf.ByteString
-        getIdBytes();
+    int getId();
 
     /**
      * <pre>
@@ -55,17 +49,16 @@ public final class DeviceInfoProto {
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @return A list containing the childrenId.
      */
-    java.util.List<java.lang.String>
-        getChildrenIdList();
+    java.util.List<java.lang.Integer> getChildrenIdList();
     /**
      * <pre>
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @return The count of childrenId.
      */
     int getChildrenIdCount();
@@ -74,42 +67,21 @@ public final class DeviceInfoProto {
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @param index The index of the element to return.
      * @return The childrenId at the given index.
      */
-    java.lang.String getChildrenId(int index);
-    /**
-     * <pre>
-     * 关联区段
-     * </pre>
-     *
-     * <code>repeated string childrenId = 3;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the childrenId at the given index.
-     */
-    com.google.protobuf.ByteString
-        getChildrenIdBytes(int index);
+    int getChildrenId(int index);
 
     /**
      * <pre>
      * 物理区段Id
      * </pre>
      *
-     * <code>string physicalSectionId = 4;</code>
+     * <code>uint32 physicalSectionId = 4;</code>
      * @return The physicalSectionId.
      */
-    java.lang.String getPhysicalSectionId();
-    /**
-     * <pre>
-     * 物理区段Id
-     * </pre>
-     *
-     * <code>string physicalSectionId = 4;</code>
-     * @return The bytes for physicalSectionId.
-     */
-    com.google.protobuf.ByteString
-        getPhysicalSectionIdBytes();
+    int getPhysicalSectionId();
 
     /**
      * <pre>
@@ -175,11 +147,8 @@ public final class DeviceInfoProto {
       super(builder);
     }
     private Section() {
-      id_ = "";
       code_ = "";
-      childrenId_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
-      physicalSectionId_ = "";
+      childrenId_ = emptyIntList();
       destinationCode_ = "";
     }
 
@@ -204,42 +173,14 @@ public final class DeviceInfoProto {
     }
 
     public static final int ID_FIELD_NUMBER = 1;
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private int id_ = 0;
     /**
-     * <code>string id = 1;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     @java.lang.Override
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        id_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getId() {
+      return id_;
     }
 
     public static final int CODE_FIELD_NUMBER = 2;
@@ -291,17 +232,17 @@ public final class DeviceInfoProto {
 
     public static final int CHILDRENID_FIELD_NUMBER = 3;
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList childrenId_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.Internal.IntList childrenId_;
     /**
      * <pre>
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @return A list containing the childrenId.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
         getChildrenIdList() {
       return childrenId_;
     }
@@ -310,7 +251,7 @@ public final class DeviceInfoProto {
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @return The count of childrenId.
      */
     public int getChildrenIdCount() {
@@ -321,72 +262,28 @@ public final class DeviceInfoProto {
      * 关联区段
      * </pre>
      *
-     * <code>repeated string childrenId = 3;</code>
+     * <code>repeated uint32 childrenId = 3;</code>
      * @param index The index of the element to return.
      * @return The childrenId at the given index.
      */
-    public java.lang.String getChildrenId(int index) {
-      return childrenId_.get(index);
-    }
-    /**
-     * <pre>
-     * 关联区段
-     * </pre>
-     *
-     * <code>repeated string childrenId = 3;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the childrenId at the given index.
-     */
-    public com.google.protobuf.ByteString
-        getChildrenIdBytes(int index) {
-      return childrenId_.getByteString(index);
+    public int getChildrenId(int index) {
+      return childrenId_.getInt(index);
     }
+    private int childrenIdMemoizedSerializedSize = -1;
 
     public static final int PHYSICALSECTIONID_FIELD_NUMBER = 4;
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object physicalSectionId_ = "";
+    private int physicalSectionId_ = 0;
     /**
      * <pre>
      * 物理区段Id
      * </pre>
      *
-     * <code>string physicalSectionId = 4;</code>
+     * <code>uint32 physicalSectionId = 4;</code>
      * @return The physicalSectionId.
      */
     @java.lang.Override
-    public java.lang.String getPhysicalSectionId() {
-      java.lang.Object ref = physicalSectionId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        physicalSectionId_ = s;
-        return s;
-      }
-    }
-    /**
-     * <pre>
-     * 物理区段Id
-     * </pre>
-     *
-     * <code>string physicalSectionId = 4;</code>
-     * @return The bytes for physicalSectionId.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getPhysicalSectionIdBytes() {
-      java.lang.Object ref = physicalSectionId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        physicalSectionId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getPhysicalSectionId() {
+      return physicalSectionId_;
     }
 
     public static final int DESTINATIONCODE_FIELD_NUMBER = 5;
@@ -488,17 +385,22 @@ public final class DeviceInfoProto {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+      getSerializedSize();
+      if (id_ != 0) {
+        output.writeUInt32(1, id_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
       }
-      for (int i = 0; i < childrenId_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, childrenId_.getRaw(i));
+      if (getChildrenIdList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(childrenIdMemoizedSerializedSize);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(physicalSectionId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, physicalSectionId_);
+      for (int i = 0; i < childrenId_.size(); i++) {
+        output.writeUInt32NoTag(childrenId_.getInt(i));
+      }
+      if (physicalSectionId_ != 0) {
+        output.writeUInt32(4, physicalSectionId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, destinationCode_);
@@ -515,8 +417,9 @@ public final class DeviceInfoProto {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+      if (id_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, id_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
@@ -524,13 +427,20 @@ public final class DeviceInfoProto {
       {
         int dataSize = 0;
         for (int i = 0; i < childrenId_.size(); i++) {
-          dataSize += computeStringSizeNoTag(childrenId_.getRaw(i));
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(childrenId_.getInt(i));
         }
         size += dataSize;
-        size += 1 * getChildrenIdList().size();
+        if (!getChildrenIdList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        childrenIdMemoizedSerializedSize = dataSize;
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(physicalSectionId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, physicalSectionId_);
+      if (physicalSectionId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, physicalSectionId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, destinationCode_);
@@ -554,14 +464,14 @@ public final class DeviceInfoProto {
       }
       club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section other = (club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section) obj;
 
-      if (!getId()
-          .equals(other.getId())) return false;
+      if (getId()
+          != other.getId()) return false;
       if (!getCode()
           .equals(other.getCode())) return false;
       if (!getChildrenIdList()
           .equals(other.getChildrenIdList())) return false;
-      if (!getPhysicalSectionId()
-          .equals(other.getPhysicalSectionId())) return false;
+      if (getPhysicalSectionId()
+          != other.getPhysicalSectionId()) return false;
       if (!getDestinationCode()
           .equals(other.getDestinationCode())) return false;
       if (hasKilometer() != other.hasKilometer()) return false;
@@ -581,7 +491,7 @@ public final class DeviceInfoProto {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId().hashCode();
+      hash = (53 * hash) + getId();
       hash = (37 * hash) + CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCode().hashCode();
       if (getChildrenIdCount() > 0) {
@@ -589,7 +499,7 @@ public final class DeviceInfoProto {
         hash = (53 * hash) + getChildrenIdList().hashCode();
       }
       hash = (37 * hash) + PHYSICALSECTIONID_FIELD_NUMBER;
-      hash = (53 * hash) + getPhysicalSectionId().hashCode();
+      hash = (53 * hash) + getPhysicalSectionId();
       hash = (37 * hash) + DESTINATIONCODE_FIELD_NUMBER;
       hash = (53 * hash) + getDestinationCode().hashCode();
       if (hasKilometer()) {
@@ -731,11 +641,10 @@ public final class DeviceInfoProto {
       public Builder clear() {
         super.clear();
         bitField0_ = 0;
-        id_ = "";
+        id_ = 0;
         code_ = "";
-        childrenId_ =
-            com.google.protobuf.LazyStringArrayList.emptyList();
-        physicalSectionId_ = "";
+        childrenId_ = emptyIntList();
+        physicalSectionId_ = 0;
         destinationCode_ = "";
         kilometer_ = null;
         if (kilometerBuilder_ != null) {
@@ -768,11 +677,20 @@ public final class DeviceInfoProto {
       @java.lang.Override
       public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section buildPartial() {
         club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section result = new club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section result) {
+        if (((bitField0_ & 0x00000004) != 0)) {
+          childrenId_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.childrenId_ = childrenId_;
+      }
+
       private void buildPartial0(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -781,10 +699,6 @@ public final class DeviceInfoProto {
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.code_ = code_;
         }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          childrenId_.makeImmutable();
-          result.childrenId_ = childrenId_;
-        }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.physicalSectionId_ = physicalSectionId_;
         }
@@ -810,10 +724,8 @@ public final class DeviceInfoProto {
 
       public Builder mergeFrom(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section other) {
         if (other == club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.getDefaultInstance()) return this;
-        if (!other.getId().isEmpty()) {
-          id_ = other.id_;
-          bitField0_ |= 0x00000001;
-          onChanged();
+        if (other.getId() != 0) {
+          setId(other.getId());
         }
         if (!other.getCode().isEmpty()) {
           code_ = other.code_;
@@ -823,17 +735,15 @@ public final class DeviceInfoProto {
         if (!other.childrenId_.isEmpty()) {
           if (childrenId_.isEmpty()) {
             childrenId_ = other.childrenId_;
-            bitField0_ |= 0x00000004;
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureChildrenIdIsMutable();
             childrenId_.addAll(other.childrenId_);
           }
           onChanged();
         }
-        if (!other.getPhysicalSectionId().isEmpty()) {
-          physicalSectionId_ = other.physicalSectionId_;
-          bitField0_ |= 0x00000008;
-          onChanged();
+        if (other.getPhysicalSectionId() != 0) {
+          setPhysicalSectionId(other.getPhysicalSectionId());
         }
         if (!other.getDestinationCode().isEmpty()) {
           destinationCode_ = other.destinationCode_;
@@ -869,27 +779,37 @@ public final class DeviceInfoProto {
               case 0:
                 done = true;
                 break;
-              case 10: {
-                id_ = input.readStringRequireUtf8();
+              case 8: {
+                id_ = input.readUInt32();
                 bitField0_ |= 0x00000001;
                 break;
-              } // case 10
+              } // case 8
               case 18: {
                 code_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000002;
                 break;
               } // case 18
-              case 26: {
-                java.lang.String s = input.readStringRequireUtf8();
+              case 24: {
+                int v = input.readUInt32();
                 ensureChildrenIdIsMutable();
-                childrenId_.add(s);
+                childrenId_.addInt(v);
+                break;
+              } // case 24
+              case 26: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureChildrenIdIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  childrenId_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
                 break;
               } // case 26
-              case 34: {
-                physicalSectionId_ = input.readStringRequireUtf8();
+              case 32: {
+                physicalSectionId_ = input.readUInt32();
                 bitField0_ |= 0x00000008;
                 break;
-              } // case 34
+              } // case 32
               case 42: {
                 destinationCode_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000010;
@@ -919,74 +839,34 @@ public final class DeviceInfoProto {
       }
       private int bitField0_;
 
-      private java.lang.Object id_ = "";
+      private int id_ ;
       /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @return The id.
        */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          id_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getId() {
+        return id_;
       }
       /**
-       * <code>string id = 1;</code>
-       * @return The bytes for id.
-       */
-      public com.google.protobuf.ByteString
-          getIdBytes() {
-        java.lang.Object ref = id_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          id_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
-      public Builder setId(
-          java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder setId(int value) {
+
         id_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
       /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
-        id_ = getDefaultInstance().getId();
         bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string id = 1;</code>
-       * @param value The bytes for id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
-        checkByteStringIsUtf8(value);
-        id_ = value;
-        bitField0_ |= 0x00000001;
+        id_ = 0;
         onChanged();
         return this;
       }
@@ -1083,33 +963,32 @@ public final class DeviceInfoProto {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList childrenId_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      private com.google.protobuf.Internal.IntList childrenId_ = emptyIntList();
       private void ensureChildrenIdIsMutable() {
-        if (!childrenId_.isModifiable()) {
-          childrenId_ = new com.google.protobuf.LazyStringArrayList(childrenId_);
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          childrenId_ = mutableCopy(childrenId_);
+          bitField0_ |= 0x00000004;
         }
-        bitField0_ |= 0x00000004;
       }
       /**
        * <pre>
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @return A list containing the childrenId.
        */
-      public com.google.protobuf.ProtocolStringList
+      public java.util.List<java.lang.Integer>
           getChildrenIdList() {
-        childrenId_.makeImmutable();
-        return childrenId_;
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(childrenId_) : childrenId_;
       }
       /**
        * <pre>
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @return The count of childrenId.
        */
       public int getChildrenIdCount() {
@@ -1120,42 +999,28 @@ public final class DeviceInfoProto {
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @param index The index of the element to return.
        * @return The childrenId at the given index.
        */
-      public java.lang.String getChildrenId(int index) {
-        return childrenId_.get(index);
+      public int getChildrenId(int index) {
+        return childrenId_.getInt(index);
       }
       /**
        * <pre>
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
-       * @param index The index of the value to return.
-       * @return The bytes of the childrenId at the given index.
-       */
-      public com.google.protobuf.ByteString
-          getChildrenIdBytes(int index) {
-        return childrenId_.getByteString(index);
-      }
-      /**
-       * <pre>
-       * 关联区段
-       * </pre>
-       *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @param index The index to set the value at.
        * @param value The childrenId to set.
        * @return This builder for chaining.
        */
       public Builder setChildrenId(
-          int index, java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+          int index, int value) {
+
         ensureChildrenIdIsMutable();
-        childrenId_.set(index, value);
-        bitField0_ |= 0x00000004;
+        childrenId_.setInt(index, value);
         onChanged();
         return this;
       }
@@ -1164,16 +1029,14 @@ public final class DeviceInfoProto {
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @param value The childrenId to add.
        * @return This builder for chaining.
        */
-      public Builder addChildrenId(
-          java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder addChildrenId(int value) {
+
         ensureChildrenIdIsMutable();
-        childrenId_.add(value);
-        bitField0_ |= 0x00000004;
+        childrenId_.addInt(value);
         onChanged();
         return this;
       }
@@ -1182,16 +1045,15 @@ public final class DeviceInfoProto {
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @param values The childrenId to add.
        * @return This builder for chaining.
        */
       public Builder addAllChildrenId(
-          java.lang.Iterable<java.lang.String> values) {
+          java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureChildrenIdIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
             values, childrenId_);
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1200,90 +1062,40 @@ public final class DeviceInfoProto {
        * 关联区段
        * </pre>
        *
-       * <code>repeated string childrenId = 3;</code>
+       * <code>repeated uint32 childrenId = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearChildrenId() {
-        childrenId_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);;
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * 关联区段
-       * </pre>
-       *
-       * <code>repeated string childrenId = 3;</code>
-       * @param value The bytes of the childrenId to add.
-       * @return This builder for chaining.
-       */
-      public Builder addChildrenIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
-        checkByteStringIsUtf8(value);
-        ensureChildrenIdIsMutable();
-        childrenId_.add(value);
-        bitField0_ |= 0x00000004;
+        childrenId_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
-      private java.lang.Object physicalSectionId_ = "";
+      private int physicalSectionId_ ;
       /**
        * <pre>
        * 物理区段Id
        * </pre>
        *
-       * <code>string physicalSectionId = 4;</code>
+       * <code>uint32 physicalSectionId = 4;</code>
        * @return The physicalSectionId.
        */
-      public java.lang.String getPhysicalSectionId() {
-        java.lang.Object ref = physicalSectionId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          physicalSectionId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getPhysicalSectionId() {
+        return physicalSectionId_;
       }
       /**
        * <pre>
        * 物理区段Id
        * </pre>
        *
-       * <code>string physicalSectionId = 4;</code>
-       * @return The bytes for physicalSectionId.
-       */
-      public com.google.protobuf.ByteString
-          getPhysicalSectionIdBytes() {
-        java.lang.Object ref = physicalSectionId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          physicalSectionId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <pre>
-       * 物理区段Id
-       * </pre>
-       *
-       * <code>string physicalSectionId = 4;</code>
+       * <code>uint32 physicalSectionId = 4;</code>
        * @param value The physicalSectionId to set.
        * @return This builder for chaining.
        */
-      public Builder setPhysicalSectionId(
-          java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder setPhysicalSectionId(int value) {
+
         physicalSectionId_ = value;
         bitField0_ |= 0x00000008;
         onChanged();
@@ -1294,30 +1106,12 @@ public final class DeviceInfoProto {
        * 物理区段Id
        * </pre>
        *
-       * <code>string physicalSectionId = 4;</code>
+       * <code>uint32 physicalSectionId = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearPhysicalSectionId() {
-        physicalSectionId_ = getDefaultInstance().getPhysicalSectionId();
         bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * 物理区段Id
-       * </pre>
-       *
-       * <code>string physicalSectionId = 4;</code>
-       * @param value The bytes for physicalSectionId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPhysicalSectionIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
-        checkByteStringIsUtf8(value);
-        physicalSectionId_ = value;
-        bitField0_ |= 0x00000008;
+        physicalSectionId_ = 0;
         onChanged();
         return this;
       }
@@ -1637,16 +1431,10 @@ public final class DeviceInfoProto {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string id = 1;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
-    java.lang.String getId();
-    /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
-     */
-    com.google.protobuf.ByteString
-        getIdBytes();
+    int getId();
 
     /**
      * <code>string code = 2;</code>
@@ -1704,7 +1492,6 @@ public final class DeviceInfoProto {
       super(builder);
     }
     private Turnout() {
-      id_ = "";
       code_ = "";
     }
 
@@ -1729,42 +1516,14 @@ public final class DeviceInfoProto {
     }
 
     public static final int ID_FIELD_NUMBER = 1;
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private int id_ = 0;
     /**
-     * <code>string id = 1;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     @java.lang.Override
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        id_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getId() {
+      return id_;
     }
 
     public static final int CODE_FIELD_NUMBER = 2;
@@ -1858,8 +1617,8 @@ public final class DeviceInfoProto {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+      if (id_ != 0) {
+        output.writeUInt32(1, id_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
@@ -1876,8 +1635,9 @@ public final class DeviceInfoProto {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+      if (id_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, id_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
@@ -1901,8 +1661,8 @@ public final class DeviceInfoProto {
       }
       club.joylink.xiannccda.dto.protos.DeviceInfoProto.Turnout other = (club.joylink.xiannccda.dto.protos.DeviceInfoProto.Turnout) obj;
 
-      if (!getId()
-          .equals(other.getId())) return false;
+      if (getId()
+          != other.getId()) return false;
       if (!getCode()
           .equals(other.getCode())) return false;
       if (hasKilometer() != other.hasKilometer()) return false;
@@ -1922,7 +1682,7 @@ public final class DeviceInfoProto {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId().hashCode();
+      hash = (53 * hash) + getId();
       hash = (37 * hash) + CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCode().hashCode();
       if (hasKilometer()) {
@@ -2064,7 +1824,7 @@ public final class DeviceInfoProto {
       public Builder clear() {
         super.clear();
         bitField0_ = 0;
-        id_ = "";
+        id_ = 0;
         code_ = "";
         kilometer_ = null;
         if (kilometerBuilder_ != null) {
@@ -2129,10 +1889,8 @@ public final class DeviceInfoProto {
 
       public Builder mergeFrom(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Turnout other) {
         if (other == club.joylink.xiannccda.dto.protos.DeviceInfoProto.Turnout.getDefaultInstance()) return this;
-        if (!other.getId().isEmpty()) {
-          id_ = other.id_;
-          bitField0_ |= 0x00000001;
-          onChanged();
+        if (other.getId() != 0) {
+          setId(other.getId());
         }
         if (!other.getCode().isEmpty()) {
           code_ = other.code_;
@@ -2168,11 +1926,11 @@ public final class DeviceInfoProto {
               case 0:
                 done = true;
                 break;
-              case 10: {
-                id_ = input.readStringRequireUtf8();
+              case 8: {
+                id_ = input.readUInt32();
                 bitField0_ |= 0x00000001;
                 break;
-              } // case 10
+              } // case 8
               case 18: {
                 code_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000002;
@@ -2202,74 +1960,34 @@ public final class DeviceInfoProto {
       }
       private int bitField0_;
 
-      private java.lang.Object id_ = "";
+      private int id_ ;
       /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @return The id.
        */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          id_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getId() {
+        return id_;
       }
       /**
-       * <code>string id = 1;</code>
-       * @return The bytes for id.
-       */
-      public com.google.protobuf.ByteString
-          getIdBytes() {
-        java.lang.Object ref = id_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          id_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
-      public Builder setId(
-          java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder setId(int value) {
+
         id_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
       /**
-       * <code>string id = 1;</code>
+       * <code>uint32 id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
-        id_ = getDefaultInstance().getId();
         bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string id = 1;</code>
-       * @param value The bytes for id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
-        checkByteStringIsUtf8(value);
-        id_ = value;
-        bitField0_ |= 0x00000001;
+        id_ = 0;
         onChanged();
         return this;
       }
@@ -3493,11 +3211,11 @@ public final class DeviceInfoProto {
   static {
     java.lang.String[] descriptorData = {
       "\n\021device_info.proto\022\005state\032\033stationLayou" +
-      "tGraphics.proto\"\226\001\n\007Section\022\n\n\002id\030\001 \001(\t\022" +
-      "\014\n\004code\030\002 \001(\t\022\022\n\nchildrenId\030\003 \003(\t\022\031\n\021phy" +
-      "sicalSectionId\030\004 \001(\t\022\027\n\017destinationCode\030" +
+      "tGraphics.proto\"\226\001\n\007Section\022\n\n\002id\030\001 \001(\r\022" +
+      "\014\n\004code\030\002 \001(\t\022\022\n\nchildrenId\030\003 \003(\r\022\031\n\021phy" +
+      "sicalSectionId\030\004 \001(\r\022\027\n\017destinationCode\030" +
       "\005 \001(\t\022)\n\tkilometer\030\006 \001(\0132\026.state.DeviceK" +
-      "ilometer\"N\n\007Turnout\022\n\n\002id\030\001 \001(\t\022\014\n\004code\030" +
+      "ilometer\"N\n\007Turnout\022\n\n\002id\030\001 \001(\r\022\014\n\004code\030" +
       "\002 \001(\t\022)\n\tkilometer\030\003 \001(\0132\026.state.DeviceK" +
       "ilometer\"t\n\017DeviceKilometer\022\024\n\014minKilome" +
       "ter\030\001 \001(\003\022\024\n\014maxKilometer\030\002 \001(\003\0225\n\017kilom" +
diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
index dcbbb77..70a9b37 100644
--- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
+++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
@@ -10941,16 +10941,16 @@ public final class LayoutGraphicsProto {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string id = 1;</code>
-     * @return The id.
+     * <code>string oldid = 1;</code>
+     * @return The oldid.
      */
-    java.lang.String getId();
+    java.lang.String getOldid();
     /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
+     * <code>string oldid = 1;</code>
+     * @return The bytes for oldid.
      */
     com.google.protobuf.ByteString
-        getIdBytes();
+        getOldidBytes();
 
     /**
      * <code>string graphicType = 2;</code>
@@ -11002,6 +11002,12 @@ public final class LayoutGraphicsProto {
      */
     club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.ChildTransformOrBuilder getChildTransformsOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 id = 5;</code>
+     * @return The id.
+     */
+    int getId();
   }
   /**
    * <pre>
@@ -11020,7 +11026,7 @@ public final class LayoutGraphicsProto {
       super(builder);
     }
     private CommonInfo() {
-      id_ = "";
+      oldid_ = "";
       graphicType_ = "";
       childTransforms_ = java.util.Collections.emptyList();
     }
@@ -11045,39 +11051,39 @@ public final class LayoutGraphicsProto {
               club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.class, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder.class);
     }
 
-    public static final int ID_FIELD_NUMBER = 1;
+    public static final int OLDID_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private volatile java.lang.Object oldid_ = "";
     /**
-     * <code>string id = 1;</code>
-     * @return The id.
+     * <code>string oldid = 1;</code>
+     * @return The oldid.
      */
     @java.lang.Override
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
+    public java.lang.String getOldid() {
+      java.lang.Object ref = oldid_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        id_ = s;
+        oldid_ = s;
         return s;
       }
     }
     /**
-     * <code>string id = 1;</code>
-     * @return The bytes for id.
+     * <code>string oldid = 1;</code>
+     * @return The bytes for oldid.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
+        getOldidBytes() {
+      java.lang.Object ref = oldid_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        id_ = b;
+        oldid_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -11190,6 +11196,17 @@ public final class LayoutGraphicsProto {
       return childTransforms_.get(index);
     }
 
+    public static final int ID_FIELD_NUMBER = 5;
+    private int id_ = 0;
+    /**
+     * <code>uint32 id = 5;</code>
+     * @return The id.
+     */
+    @java.lang.Override
+    public int getId() {
+      return id_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -11204,8 +11221,8 @@ public final class LayoutGraphicsProto {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, oldid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(graphicType_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, graphicType_);
@@ -11216,6 +11233,9 @@ public final class LayoutGraphicsProto {
       for (int i = 0; i < childTransforms_.size(); i++) {
         output.writeMessage(4, childTransforms_.get(i));
       }
+      if (id_ != 0) {
+        output.writeUInt32(5, id_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -11225,8 +11245,8 @@ public final class LayoutGraphicsProto {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, oldid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(graphicType_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, graphicType_);
@@ -11239,6 +11259,10 @@ public final class LayoutGraphicsProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, childTransforms_.get(i));
       }
+      if (id_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, id_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -11254,8 +11278,8 @@ public final class LayoutGraphicsProto {
       }
       club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo other = (club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo) obj;
 
-      if (!getId()
-          .equals(other.getId())) return false;
+      if (!getOldid()
+          .equals(other.getOldid())) return false;
       if (!getGraphicType()
           .equals(other.getGraphicType())) return false;
       if (hasTransform() != other.hasTransform()) return false;
@@ -11265,6 +11289,8 @@ public final class LayoutGraphicsProto {
       }
       if (!getChildTransformsList()
           .equals(other.getChildTransformsList())) return false;
+      if (getId()
+          != other.getId()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -11276,8 +11302,8 @@ public final class LayoutGraphicsProto {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId().hashCode();
+      hash = (37 * hash) + OLDID_FIELD_NUMBER;
+      hash = (53 * hash) + getOldid().hashCode();
       hash = (37 * hash) + GRAPHICTYPE_FIELD_NUMBER;
       hash = (53 * hash) + getGraphicType().hashCode();
       if (hasTransform()) {
@@ -11288,6 +11314,8 @@ public final class LayoutGraphicsProto {
         hash = (37 * hash) + CHILDTRANSFORMS_FIELD_NUMBER;
         hash = (53 * hash) + getChildTransformsList().hashCode();
       }
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -11423,7 +11451,7 @@ public final class LayoutGraphicsProto {
       public Builder clear() {
         super.clear();
         bitField0_ = 0;
-        id_ = "";
+        oldid_ = "";
         graphicType_ = "";
         transform_ = null;
         if (transformBuilder_ != null) {
@@ -11437,6 +11465,7 @@ public final class LayoutGraphicsProto {
           childTransformsBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
+        id_ = 0;
         return this;
       }
 
@@ -11484,7 +11513,7 @@ public final class LayoutGraphicsProto {
       private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.id_ = id_;
+          result.oldid_ = oldid_;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.graphicType_ = graphicType_;
@@ -11494,6 +11523,9 @@ public final class LayoutGraphicsProto {
               ? transform_
               : transformBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.id_ = id_;
+        }
       }
 
       @java.lang.Override
@@ -11508,8 +11540,8 @@ public final class LayoutGraphicsProto {
 
       public Builder mergeFrom(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo other) {
         if (other == club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance()) return this;
-        if (!other.getId().isEmpty()) {
-          id_ = other.id_;
+        if (!other.getOldid().isEmpty()) {
+          oldid_ = other.oldid_;
           bitField0_ |= 0x00000001;
           onChanged();
         }
@@ -11547,6 +11579,9 @@ public final class LayoutGraphicsProto {
             }
           }
         }
+        if (other.getId() != 0) {
+          setId(other.getId());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -11574,7 +11609,7 @@ public final class LayoutGraphicsProto {
                 done = true;
                 break;
               case 10: {
-                id_ = input.readStringRequireUtf8();
+                oldid_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000001;
                 break;
               } // case 10
@@ -11603,6 +11638,11 @@ public final class LayoutGraphicsProto {
                 }
                 break;
               } // case 34
+              case 40: {
+                id_ = input.readUInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -11620,73 +11660,73 @@ public final class LayoutGraphicsProto {
       }
       private int bitField0_;
 
-      private java.lang.Object id_ = "";
+      private java.lang.Object oldid_ = "";
       /**
-       * <code>string id = 1;</code>
-       * @return The id.
+       * <code>string oldid = 1;</code>
+       * @return The oldid.
        */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
+      public java.lang.String getOldid() {
+        java.lang.Object ref = oldid_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          id_ = s;
+          oldid_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string id = 1;</code>
-       * @return The bytes for id.
+       * <code>string oldid = 1;</code>
+       * @return The bytes for oldid.
        */
       public com.google.protobuf.ByteString
-          getIdBytes() {
-        java.lang.Object ref = id_;
+          getOldidBytes() {
+        java.lang.Object ref = oldid_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          id_ = b;
+          oldid_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string id = 1;</code>
-       * @param value The id to set.
+       * <code>string oldid = 1;</code>
+       * @param value The oldid to set.
        * @return This builder for chaining.
        */
-      public Builder setId(
+      public Builder setOldid(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        id_ = value;
+        oldid_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
       /**
-       * <code>string id = 1;</code>
+       * <code>string oldid = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearId() {
-        id_ = getDefaultInstance().getId();
+      public Builder clearOldid() {
+        oldid_ = getDefaultInstance().getOldid();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
       /**
-       * <code>string id = 1;</code>
-       * @param value The bytes for id to set.
+       * <code>string oldid = 1;</code>
+       * @param value The bytes for oldid to set.
        * @return This builder for chaining.
        */
-      public Builder setIdBytes(
+      public Builder setOldidBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        id_ = value;
+        oldid_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
         return this;
@@ -12122,6 +12162,38 @@ public final class LayoutGraphicsProto {
         }
         return childTransformsBuilder_;
       }
+
+      private int id_ ;
+      /**
+       * <code>uint32 id = 5;</code>
+       * @return The id.
+       */
+      @java.lang.Override
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>uint32 id = 5;</code>
+       * @param value The id to set.
+       * @return This builder for chaining.
+       */
+      public Builder setId(int value) {
+
+        id_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearId() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        id_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -16929,20 +17001,20 @@ public final class LayoutGraphicsProto {
      * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
      * </pre>
      *
-     * <code>string refStation = 6;</code>
-     * @return The refStation.
+     * <code>string oldrefStation = 6;</code>
+     * @return The oldrefStation.
      */
-    java.lang.String getRefStation();
+    java.lang.String getOldrefStation();
     /**
      * <pre>
      * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
      * </pre>
      *
-     * <code>string refStation = 6;</code>
-     * @return The bytes for refStation.
+     * <code>string oldrefStation = 6;</code>
+     * @return The bytes for oldrefStation.
      */
     com.google.protobuf.ByteString
-        getRefStationBytes();
+        getOldrefStationBytes();
 
     /**
      * <pre>
@@ -16959,20 +17031,40 @@ public final class LayoutGraphicsProto {
      *关联的物理区段id
      * </pre>
      *
-     * <code>string refSectionId = 8;</code>
-     * @return The refSectionId.
+     * <code>string oldrefSectionId = 8;</code>
+     * @return The oldrefSectionId.
      */
-    java.lang.String getRefSectionId();
+    java.lang.String getOldrefSectionId();
     /**
      * <pre>
      *关联的物理区段id
      * </pre>
      *
-     * <code>string refSectionId = 8;</code>
-     * @return The bytes for refSectionId.
+     * <code>string oldrefSectionId = 8;</code>
+     * @return The bytes for oldrefSectionId.
      */
     com.google.protobuf.ByteString
-        getRefSectionIdBytes();
+        getOldrefSectionIdBytes();
+
+    /**
+     * <pre>
+     * 关联的车站id
+     * </pre>
+     *
+     * <code>uint32 refStation = 9;</code>
+     * @return The refStation.
+     */
+    int getRefStation();
+
+    /**
+     * <pre>
+     * 关联的物理区段id
+     * </pre>
+     *
+     * <code>uint32 refSectionId = 10;</code>
+     * @return The refSectionId.
+     */
+    int getRefSectionId();
   }
   /**
    * Protobuf type {@code graphicData.Platform}
@@ -16989,8 +17081,8 @@ public final class LayoutGraphicsProto {
     private Platform() {
       code_ = "";
       direction_ = "";
-      refStation_ = "";
-      refSectionId_ = "";
+      oldrefStation_ = "";
+      oldrefSectionId_ = "";
     }
 
     @java.lang.Override
@@ -17140,27 +17232,27 @@ public final class LayoutGraphicsProto {
       }
     }
 
-    public static final int REFSTATION_FIELD_NUMBER = 6;
+    public static final int OLDREFSTATION_FIELD_NUMBER = 6;
     @SuppressWarnings("serial")
-    private volatile java.lang.Object refStation_ = "";
+    private volatile java.lang.Object oldrefStation_ = "";
     /**
      * <pre>
      * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
      * </pre>
      *
-     * <code>string refStation = 6;</code>
-     * @return The refStation.
+     * <code>string oldrefStation = 6;</code>
+     * @return The oldrefStation.
      */
     @java.lang.Override
-    public java.lang.String getRefStation() {
-      java.lang.Object ref = refStation_;
+    public java.lang.String getOldrefStation() {
+      java.lang.Object ref = oldrefStation_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        refStation_ = s;
+        oldrefStation_ = s;
         return s;
       }
     }
@@ -17169,18 +17261,18 @@ public final class LayoutGraphicsProto {
      * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
      * </pre>
      *
-     * <code>string refStation = 6;</code>
-     * @return The bytes for refStation.
+     * <code>string oldrefStation = 6;</code>
+     * @return The bytes for oldrefStation.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getRefStationBytes() {
-      java.lang.Object ref = refStation_;
+        getOldrefStationBytes() {
+      java.lang.Object ref = oldrefStation_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        refStation_ = b;
+        oldrefStation_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -17202,27 +17294,27 @@ public final class LayoutGraphicsProto {
       return up_;
     }
 
-    public static final int REFSECTIONID_FIELD_NUMBER = 8;
+    public static final int OLDREFSECTIONID_FIELD_NUMBER = 8;
     @SuppressWarnings("serial")
-    private volatile java.lang.Object refSectionId_ = "";
+    private volatile java.lang.Object oldrefSectionId_ = "";
     /**
      * <pre>
      *关联的物理区段id
      * </pre>
      *
-     * <code>string refSectionId = 8;</code>
-     * @return The refSectionId.
+     * <code>string oldrefSectionId = 8;</code>
+     * @return The oldrefSectionId.
      */
     @java.lang.Override
-    public java.lang.String getRefSectionId() {
-      java.lang.Object ref = refSectionId_;
+    public java.lang.String getOldrefSectionId() {
+      java.lang.Object ref = oldrefSectionId_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        refSectionId_ = s;
+        oldrefSectionId_ = s;
         return s;
       }
     }
@@ -17231,24 +17323,54 @@ public final class LayoutGraphicsProto {
      *关联的物理区段id
      * </pre>
      *
-     * <code>string refSectionId = 8;</code>
-     * @return The bytes for refSectionId.
+     * <code>string oldrefSectionId = 8;</code>
+     * @return The bytes for oldrefSectionId.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getRefSectionIdBytes() {
-      java.lang.Object ref = refSectionId_;
+        getOldrefSectionIdBytes() {
+      java.lang.Object ref = oldrefSectionId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        refSectionId_ = b;
+        oldrefSectionId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
+    public static final int REFSTATION_FIELD_NUMBER = 9;
+    private int refStation_ = 0;
+    /**
+     * <pre>
+     * 关联的车站id
+     * </pre>
+     *
+     * <code>uint32 refStation = 9;</code>
+     * @return The refStation.
+     */
+    @java.lang.Override
+    public int getRefStation() {
+      return refStation_;
+    }
+
+    public static final int REFSECTIONID_FIELD_NUMBER = 10;
+    private int refSectionId_ = 0;
+    /**
+     * <pre>
+     * 关联的物理区段id
+     * </pre>
+     *
+     * <code>uint32 refSectionId = 10;</code>
+     * @return The refSectionId.
+     */
+    @java.lang.Override
+    public int getRefSectionId() {
+      return refSectionId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -17275,14 +17397,20 @@ public final class LayoutGraphicsProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(direction_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, direction_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refStation_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, refStation_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldrefStation_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, oldrefStation_);
       }
       if (up_ != false) {
         output.writeBool(7, up_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refSectionId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, refSectionId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldrefSectionId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, oldrefSectionId_);
+      }
+      if (refStation_ != 0) {
+        output.writeUInt32(9, refStation_);
+      }
+      if (refSectionId_ != 0) {
+        output.writeUInt32(10, refSectionId_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -17307,15 +17435,23 @@ public final class LayoutGraphicsProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(direction_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, direction_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refStation_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, refStation_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldrefStation_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, oldrefStation_);
       }
       if (up_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(7, up_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refSectionId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, refSectionId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldrefSectionId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, oldrefSectionId_);
+      }
+      if (refStation_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, refStation_);
+      }
+      if (refSectionId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, refSectionId_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -17343,12 +17479,16 @@ public final class LayoutGraphicsProto {
           != other.getHasdoor()) return false;
       if (!getDirection()
           .equals(other.getDirection())) return false;
-      if (!getRefStation()
-          .equals(other.getRefStation())) return false;
+      if (!getOldrefStation()
+          .equals(other.getOldrefStation())) return false;
       if (getUp()
           != other.getUp()) return false;
-      if (!getRefSectionId()
-          .equals(other.getRefSectionId())) return false;
+      if (!getOldrefSectionId()
+          .equals(other.getOldrefSectionId())) return false;
+      if (getRefStation()
+          != other.getRefStation()) return false;
+      if (getRefSectionId()
+          != other.getRefSectionId()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -17371,13 +17511,17 @@ public final class LayoutGraphicsProto {
           getHasdoor());
       hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
       hash = (53 * hash) + getDirection().hashCode();
-      hash = (37 * hash) + REFSTATION_FIELD_NUMBER;
-      hash = (53 * hash) + getRefStation().hashCode();
+      hash = (37 * hash) + OLDREFSTATION_FIELD_NUMBER;
+      hash = (53 * hash) + getOldrefStation().hashCode();
       hash = (37 * hash) + UP_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getUp());
+      hash = (37 * hash) + OLDREFSECTIONID_FIELD_NUMBER;
+      hash = (53 * hash) + getOldrefSectionId().hashCode();
+      hash = (37 * hash) + REFSTATION_FIELD_NUMBER;
+      hash = (53 * hash) + getRefStation();
       hash = (37 * hash) + REFSECTIONID_FIELD_NUMBER;
-      hash = (53 * hash) + getRefSectionId().hashCode();
+      hash = (53 * hash) + getRefSectionId();
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -17517,9 +17661,11 @@ public final class LayoutGraphicsProto {
         code_ = "";
         hasdoor_ = false;
         direction_ = "";
-        refStation_ = "";
+        oldrefStation_ = "";
         up_ = false;
-        refSectionId_ = "";
+        oldrefSectionId_ = "";
+        refStation_ = 0;
+        refSectionId_ = 0;
         return this;
       }
 
@@ -17568,12 +17714,18 @@ public final class LayoutGraphicsProto {
           result.direction_ = direction_;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.refStation_ = refStation_;
+          result.oldrefStation_ = oldrefStation_;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
           result.up_ = up_;
         }
         if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.oldrefSectionId_ = oldrefSectionId_;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.refStation_ = refStation_;
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
           result.refSectionId_ = refSectionId_;
         }
       }
@@ -17606,19 +17758,25 @@ public final class LayoutGraphicsProto {
           bitField0_ |= 0x00000008;
           onChanged();
         }
-        if (!other.getRefStation().isEmpty()) {
-          refStation_ = other.refStation_;
+        if (!other.getOldrefStation().isEmpty()) {
+          oldrefStation_ = other.oldrefStation_;
           bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.getUp() != false) {
           setUp(other.getUp());
         }
-        if (!other.getRefSectionId().isEmpty()) {
-          refSectionId_ = other.refSectionId_;
+        if (!other.getOldrefSectionId().isEmpty()) {
+          oldrefSectionId_ = other.oldrefSectionId_;
           bitField0_ |= 0x00000040;
           onChanged();
         }
+        if (other.getRefStation() != 0) {
+          setRefStation(other.getRefStation());
+        }
+        if (other.getRefSectionId() != 0) {
+          setRefSectionId(other.getRefSectionId());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -17668,7 +17826,7 @@ public final class LayoutGraphicsProto {
                 break;
               } // case 34
               case 50: {
-                refStation_ = input.readStringRequireUtf8();
+                oldrefStation_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000010;
                 break;
               } // case 50
@@ -17678,10 +17836,20 @@ public final class LayoutGraphicsProto {
                 break;
               } // case 56
               case 66: {
-                refSectionId_ = input.readStringRequireUtf8();
+                oldrefSectionId_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000040;
                 break;
               } // case 66
+              case 72: {
+                refStation_ = input.readUInt32();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 72
+              case 80: {
+                refSectionId_ = input.readUInt32();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 80
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -18026,22 +18194,22 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private java.lang.Object refStation_ = "";
+      private java.lang.Object oldrefStation_ = "";
       /**
        * <pre>
        * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
        * </pre>
        *
-       * <code>string refStation = 6;</code>
-       * @return The refStation.
+       * <code>string oldrefStation = 6;</code>
+       * @return The oldrefStation.
        */
-      public java.lang.String getRefStation() {
-        java.lang.Object ref = refStation_;
+      public java.lang.String getOldrefStation() {
+        java.lang.Object ref = oldrefStation_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          refStation_ = s;
+          oldrefStation_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -18052,17 +18220,17 @@ public final class LayoutGraphicsProto {
        * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
        * </pre>
        *
-       * <code>string refStation = 6;</code>
-       * @return The bytes for refStation.
+       * <code>string oldrefStation = 6;</code>
+       * @return The bytes for oldrefStation.
        */
       public com.google.protobuf.ByteString
-          getRefStationBytes() {
-        java.lang.Object ref = refStation_;
+          getOldrefStationBytes() {
+        java.lang.Object ref = oldrefStation_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          refStation_ = b;
+          oldrefStation_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
@@ -18073,14 +18241,14 @@ public final class LayoutGraphicsProto {
        * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
        * </pre>
        *
-       * <code>string refStation = 6;</code>
-       * @param value The refStation to set.
+       * <code>string oldrefStation = 6;</code>
+       * @param value The oldrefStation to set.
        * @return This builder for chaining.
        */
-      public Builder setRefStation(
+      public Builder setOldrefStation(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        refStation_ = value;
+        oldrefStation_ = value;
         bitField0_ |= 0x00000010;
         onChanged();
         return this;
@@ -18090,11 +18258,11 @@ public final class LayoutGraphicsProto {
        * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
        * </pre>
        *
-       * <code>string refStation = 6;</code>
+       * <code>string oldrefStation = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRefStation() {
-        refStation_ = getDefaultInstance().getRefStation();
+      public Builder clearOldrefStation() {
+        oldrefStation_ = getDefaultInstance().getOldrefStation();
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
@@ -18104,15 +18272,15 @@ public final class LayoutGraphicsProto {
        * string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
        * </pre>
        *
-       * <code>string refStation = 6;</code>
-       * @param value The bytes for refStation to set.
+       * <code>string oldrefStation = 6;</code>
+       * @param value The bytes for oldrefStation to set.
        * @return This builder for chaining.
        */
-      public Builder setRefStationBytes(
+      public Builder setOldrefStationBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        refStation_ = value;
+        oldrefStation_ = value;
         bitField0_ |= 0x00000010;
         onChanged();
         return this;
@@ -18162,22 +18330,22 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private java.lang.Object refSectionId_ = "";
+      private java.lang.Object oldrefSectionId_ = "";
       /**
        * <pre>
        *关联的物理区段id
        * </pre>
        *
-       * <code>string refSectionId = 8;</code>
-       * @return The refSectionId.
+       * <code>string oldrefSectionId = 8;</code>
+       * @return The oldrefSectionId.
        */
-      public java.lang.String getRefSectionId() {
-        java.lang.Object ref = refSectionId_;
+      public java.lang.String getOldrefSectionId() {
+        java.lang.Object ref = oldrefSectionId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          refSectionId_ = s;
+          oldrefSectionId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -18188,17 +18356,17 @@ public final class LayoutGraphicsProto {
        *关联的物理区段id
        * </pre>
        *
-       * <code>string refSectionId = 8;</code>
-       * @return The bytes for refSectionId.
+       * <code>string oldrefSectionId = 8;</code>
+       * @return The bytes for oldrefSectionId.
        */
       public com.google.protobuf.ByteString
-          getRefSectionIdBytes() {
-        java.lang.Object ref = refSectionId_;
+          getOldrefSectionIdBytes() {
+        java.lang.Object ref = oldrefSectionId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          refSectionId_ = b;
+          oldrefSectionId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
@@ -18209,14 +18377,14 @@ public final class LayoutGraphicsProto {
        *关联的物理区段id
        * </pre>
        *
-       * <code>string refSectionId = 8;</code>
-       * @param value The refSectionId to set.
+       * <code>string oldrefSectionId = 8;</code>
+       * @param value The oldrefSectionId to set.
        * @return This builder for chaining.
        */
-      public Builder setRefSectionId(
+      public Builder setOldrefSectionId(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        refSectionId_ = value;
+        oldrefSectionId_ = value;
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
@@ -18226,11 +18394,11 @@ public final class LayoutGraphicsProto {
        *关联的物理区段id
        * </pre>
        *
-       * <code>string refSectionId = 8;</code>
+       * <code>string oldrefSectionId = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRefSectionId() {
-        refSectionId_ = getDefaultInstance().getRefSectionId();
+      public Builder clearOldrefSectionId() {
+        oldrefSectionId_ = getDefaultInstance().getOldrefSectionId();
         bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
@@ -18240,19 +18408,107 @@ public final class LayoutGraphicsProto {
        *关联的物理区段id
        * </pre>
        *
-       * <code>string refSectionId = 8;</code>
-       * @param value The bytes for refSectionId to set.
+       * <code>string oldrefSectionId = 8;</code>
+       * @param value The bytes for oldrefSectionId to set.
        * @return This builder for chaining.
        */
-      public Builder setRefSectionIdBytes(
+      public Builder setOldrefSectionIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        refSectionId_ = value;
+        oldrefSectionId_ = value;
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
+
+      private int refStation_ ;
+      /**
+       * <pre>
+       * 关联的车站id
+       * </pre>
+       *
+       * <code>uint32 refStation = 9;</code>
+       * @return The refStation.
+       */
+      @java.lang.Override
+      public int getRefStation() {
+        return refStation_;
+      }
+      /**
+       * <pre>
+       * 关联的车站id
+       * </pre>
+       *
+       * <code>uint32 refStation = 9;</code>
+       * @param value The refStation to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRefStation(int value) {
+
+        refStation_ = value;
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 关联的车站id
+       * </pre>
+       *
+       * <code>uint32 refStation = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRefStation() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        refStation_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int refSectionId_ ;
+      /**
+       * <pre>
+       * 关联的物理区段id
+       * </pre>
+       *
+       * <code>uint32 refSectionId = 10;</code>
+       * @return The refSectionId.
+       */
+      @java.lang.Override
+      public int getRefSectionId() {
+        return refSectionId_;
+      }
+      /**
+       * <pre>
+       * 关联的物理区段id
+       * </pre>
+       *
+       * <code>uint32 refSectionId = 10;</code>
+       * @param value The refSectionId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRefSectionId(int value) {
+
+        refSectionId_ = value;
+        bitField0_ |= 0x00000100;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 关联的物理区段id
+       * </pre>
+       *
+       * <code>uint32 refSectionId = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRefSectionId() {
+        bitField0_ = (bitField0_ & ~0x00000100);
+        refSectionId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -20754,41 +21010,58 @@ public final class LayoutGraphicsProto {
      *关联的逻辑区段的id或道岔区段id
      * </pre>
      *
-     * <code>repeated string refDeviceId = 3;</code>
-     * @return A list containing the refDeviceId.
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @return A list containing the oldrefDeviceId.
      */
     java.util.List<java.lang.String>
-        getRefDeviceIdList();
+        getOldrefDeviceIdList();
     /**
      * <pre>
      *关联的逻辑区段的id或道岔区段id
      * </pre>
      *
-     * <code>repeated string refDeviceId = 3;</code>
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @return The count of oldrefDeviceId.
+     */
+    int getOldrefDeviceIdCount();
+    /**
+     * <pre>
+     *关联的逻辑区段的id或道岔区段id
+     * </pre>
+     *
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @param index The index of the element to return.
+     * @return The oldrefDeviceId at the given index.
+     */
+    java.lang.String getOldrefDeviceId(int index);
+    /**
+     * <pre>
+     *关联的逻辑区段的id或道岔区段id
+     * </pre>
+     *
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the oldrefDeviceId at the given index.
+     */
+    com.google.protobuf.ByteString
+        getOldrefDeviceIdBytes(int index);
+
+    /**
+     * <code>repeated uint32 refDeviceId = 4;</code>
+     * @return A list containing the refDeviceId.
+     */
+    java.util.List<java.lang.Integer> getRefDeviceIdList();
+    /**
+     * <code>repeated uint32 refDeviceId = 4;</code>
      * @return The count of refDeviceId.
      */
     int getRefDeviceIdCount();
     /**
-     * <pre>
-     *关联的逻辑区段的id或道岔区段id
-     * </pre>
-     *
-     * <code>repeated string refDeviceId = 3;</code>
+     * <code>repeated uint32 refDeviceId = 4;</code>
      * @param index The index of the element to return.
      * @return The refDeviceId at the given index.
      */
-    java.lang.String getRefDeviceId(int index);
-    /**
-     * <pre>
-     *关联的逻辑区段的id或道岔区段id
-     * </pre>
-     *
-     * <code>repeated string refDeviceId = 3;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the refDeviceId at the given index.
-     */
-    com.google.protobuf.ByteString
-        getRefDeviceIdBytes(int index);
+    int getRefDeviceId(int index);
   }
   /**
    * Protobuf type {@code graphicData.TrainWindow}
@@ -20804,8 +21077,9 @@ public final class LayoutGraphicsProto {
     }
     private TrainWindow() {
       code_ = "";
-      refDeviceId_ =
+      oldrefDeviceId_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
+      refDeviceId_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -20893,58 +21167,87 @@ public final class LayoutGraphicsProto {
       }
     }
 
-    public static final int REFDEVICEID_FIELD_NUMBER = 3;
+    public static final int OLDREFDEVICEID_FIELD_NUMBER = 3;
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList refDeviceId_ =
+    private com.google.protobuf.LazyStringArrayList oldrefDeviceId_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
     /**
      * <pre>
      *关联的逻辑区段的id或道岔区段id
      * </pre>
      *
-     * <code>repeated string refDeviceId = 3;</code>
-     * @return A list containing the refDeviceId.
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @return A list containing the oldrefDeviceId.
      */
     public com.google.protobuf.ProtocolStringList
-        getRefDeviceIdList() {
-      return refDeviceId_;
+        getOldrefDeviceIdList() {
+      return oldrefDeviceId_;
     }
     /**
      * <pre>
      *关联的逻辑区段的id或道岔区段id
      * </pre>
      *
-     * <code>repeated string refDeviceId = 3;</code>
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @return The count of oldrefDeviceId.
+     */
+    public int getOldrefDeviceIdCount() {
+      return oldrefDeviceId_.size();
+    }
+    /**
+     * <pre>
+     *关联的逻辑区段的id或道岔区段id
+     * </pre>
+     *
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @param index The index of the element to return.
+     * @return The oldrefDeviceId at the given index.
+     */
+    public java.lang.String getOldrefDeviceId(int index) {
+      return oldrefDeviceId_.get(index);
+    }
+    /**
+     * <pre>
+     *关联的逻辑区段的id或道岔区段id
+     * </pre>
+     *
+     * <code>repeated string oldrefDeviceId = 3;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the oldrefDeviceId at the given index.
+     */
+    public com.google.protobuf.ByteString
+        getOldrefDeviceIdBytes(int index) {
+      return oldrefDeviceId_.getByteString(index);
+    }
+
+    public static final int REFDEVICEID_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList refDeviceId_;
+    /**
+     * <code>repeated uint32 refDeviceId = 4;</code>
+     * @return A list containing the refDeviceId.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getRefDeviceIdList() {
+      return refDeviceId_;
+    }
+    /**
+     * <code>repeated uint32 refDeviceId = 4;</code>
      * @return The count of refDeviceId.
      */
     public int getRefDeviceIdCount() {
       return refDeviceId_.size();
     }
     /**
-     * <pre>
-     *关联的逻辑区段的id或道岔区段id
-     * </pre>
-     *
-     * <code>repeated string refDeviceId = 3;</code>
+     * <code>repeated uint32 refDeviceId = 4;</code>
      * @param index The index of the element to return.
      * @return The refDeviceId at the given index.
      */
-    public java.lang.String getRefDeviceId(int index) {
-      return refDeviceId_.get(index);
-    }
-    /**
-     * <pre>
-     *关联的逻辑区段的id或道岔区段id
-     * </pre>
-     *
-     * <code>repeated string refDeviceId = 3;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the refDeviceId at the given index.
-     */
-    public com.google.protobuf.ByteString
-        getRefDeviceIdBytes(int index) {
-      return refDeviceId_.getByteString(index);
+    public int getRefDeviceId(int index) {
+      return refDeviceId_.getInt(index);
     }
+    private int refDeviceIdMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -20960,14 +21263,22 @@ public final class LayoutGraphicsProto {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (common_ != null) {
         output.writeMessage(1, getCommon());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
       }
+      for (int i = 0; i < oldrefDeviceId_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, oldrefDeviceId_.getRaw(i));
+      }
+      if (getRefDeviceIdList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(refDeviceIdMemoizedSerializedSize);
+      }
       for (int i = 0; i < refDeviceId_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, refDeviceId_.getRaw(i));
+        output.writeUInt32NoTag(refDeviceId_.getInt(i));
       }
       getUnknownFields().writeTo(output);
     }
@@ -20987,11 +21298,25 @@ public final class LayoutGraphicsProto {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < refDeviceId_.size(); i++) {
-          dataSize += computeStringSizeNoTag(refDeviceId_.getRaw(i));
+        for (int i = 0; i < oldrefDeviceId_.size(); i++) {
+          dataSize += computeStringSizeNoTag(oldrefDeviceId_.getRaw(i));
         }
         size += dataSize;
-        size += 1 * getRefDeviceIdList().size();
+        size += 1 * getOldrefDeviceIdList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < refDeviceId_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(refDeviceId_.getInt(i));
+        }
+        size += dataSize;
+        if (!getRefDeviceIdList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        refDeviceIdMemoizedSerializedSize = dataSize;
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -21015,6 +21340,8 @@ public final class LayoutGraphicsProto {
       }
       if (!getCode()
           .equals(other.getCode())) return false;
+      if (!getOldrefDeviceIdList()
+          .equals(other.getOldrefDeviceIdList())) return false;
       if (!getRefDeviceIdList()
           .equals(other.getRefDeviceIdList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
@@ -21034,6 +21361,10 @@ public final class LayoutGraphicsProto {
       }
       hash = (37 * hash) + CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCode().hashCode();
+      if (getOldrefDeviceIdCount() > 0) {
+        hash = (37 * hash) + OLDREFDEVICEID_FIELD_NUMBER;
+        hash = (53 * hash) + getOldrefDeviceIdList().hashCode();
+      }
       if (getRefDeviceIdCount() > 0) {
         hash = (37 * hash) + REFDEVICEID_FIELD_NUMBER;
         hash = (53 * hash) + getRefDeviceIdList().hashCode();
@@ -21175,8 +21506,9 @@ public final class LayoutGraphicsProto {
           commonBuilder_ = null;
         }
         code_ = "";
-        refDeviceId_ =
+        oldrefDeviceId_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
+        refDeviceId_ = emptyIntList();
         return this;
       }
 
@@ -21203,11 +21535,20 @@ public final class LayoutGraphicsProto {
       @java.lang.Override
       public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.TrainWindow buildPartial() {
         club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.TrainWindow result = new club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.TrainWindow(this);
+        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.TrainWindow result) {
+        if (((bitField0_ & 0x00000008) != 0)) {
+          refDeviceId_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000008);
+        }
+        result.refDeviceId_ = refDeviceId_;
+      }
+
       private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.TrainWindow result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -21219,8 +21560,8 @@ public final class LayoutGraphicsProto {
           result.code_ = code_;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          refDeviceId_.makeImmutable();
-          result.refDeviceId_ = refDeviceId_;
+          oldrefDeviceId_.makeImmutable();
+          result.oldrefDeviceId_ = oldrefDeviceId_;
         }
       }
 
@@ -21244,10 +21585,20 @@ public final class LayoutGraphicsProto {
           bitField0_ |= 0x00000002;
           onChanged();
         }
+        if (!other.oldrefDeviceId_.isEmpty()) {
+          if (oldrefDeviceId_.isEmpty()) {
+            oldrefDeviceId_ = other.oldrefDeviceId_;
+            bitField0_ |= 0x00000004;
+          } else {
+            ensureOldrefDeviceIdIsMutable();
+            oldrefDeviceId_.addAll(other.oldrefDeviceId_);
+          }
+          onChanged();
+        }
         if (!other.refDeviceId_.isEmpty()) {
           if (refDeviceId_.isEmpty()) {
             refDeviceId_ = other.refDeviceId_;
-            bitField0_ |= 0x00000004;
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureRefDeviceIdIsMutable();
             refDeviceId_.addAll(other.refDeviceId_);
@@ -21294,10 +21645,26 @@ public final class LayoutGraphicsProto {
               } // case 18
               case 26: {
                 java.lang.String s = input.readStringRequireUtf8();
-                ensureRefDeviceIdIsMutable();
-                refDeviceId_.add(s);
+                ensureOldrefDeviceIdIsMutable();
+                oldrefDeviceId_.add(s);
                 break;
               } // case 26
+              case 32: {
+                int v = input.readUInt32();
+                ensureRefDeviceIdIsMutable();
+                refDeviceId_.addInt(v);
+                break;
+              } // case 32
+              case 34: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRefDeviceIdIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  refDeviceId_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 34
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -21506,11 +21873,11 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList refDeviceId_ =
+      private com.google.protobuf.LazyStringArrayList oldrefDeviceId_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-      private void ensureRefDeviceIdIsMutable() {
-        if (!refDeviceId_.isModifiable()) {
-          refDeviceId_ = new com.google.protobuf.LazyStringArrayList(refDeviceId_);
+      private void ensureOldrefDeviceIdIsMutable() {
+        if (!oldrefDeviceId_.isModifiable()) {
+          oldrefDeviceId_ = new com.google.protobuf.LazyStringArrayList(oldrefDeviceId_);
         }
         bitField0_ |= 0x00000004;
       }
@@ -21519,65 +21886,65 @@ public final class LayoutGraphicsProto {
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
-       * @return A list containing the refDeviceId.
+       * <code>repeated string oldrefDeviceId = 3;</code>
+       * @return A list containing the oldrefDeviceId.
        */
       public com.google.protobuf.ProtocolStringList
-          getRefDeviceIdList() {
-        refDeviceId_.makeImmutable();
-        return refDeviceId_;
+          getOldrefDeviceIdList() {
+        oldrefDeviceId_.makeImmutable();
+        return oldrefDeviceId_;
       }
       /**
        * <pre>
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
-       * @return The count of refDeviceId.
+       * <code>repeated string oldrefDeviceId = 3;</code>
+       * @return The count of oldrefDeviceId.
        */
-      public int getRefDeviceIdCount() {
-        return refDeviceId_.size();
+      public int getOldrefDeviceIdCount() {
+        return oldrefDeviceId_.size();
       }
       /**
        * <pre>
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
+       * <code>repeated string oldrefDeviceId = 3;</code>
        * @param index The index of the element to return.
-       * @return The refDeviceId at the given index.
+       * @return The oldrefDeviceId at the given index.
        */
-      public java.lang.String getRefDeviceId(int index) {
-        return refDeviceId_.get(index);
+      public java.lang.String getOldrefDeviceId(int index) {
+        return oldrefDeviceId_.get(index);
       }
       /**
        * <pre>
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
+       * <code>repeated string oldrefDeviceId = 3;</code>
        * @param index The index of the value to return.
-       * @return The bytes of the refDeviceId at the given index.
+       * @return The bytes of the oldrefDeviceId at the given index.
        */
       public com.google.protobuf.ByteString
-          getRefDeviceIdBytes(int index) {
-        return refDeviceId_.getByteString(index);
+          getOldrefDeviceIdBytes(int index) {
+        return oldrefDeviceId_.getByteString(index);
       }
       /**
        * <pre>
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
+       * <code>repeated string oldrefDeviceId = 3;</code>
        * @param index The index to set the value at.
-       * @param value The refDeviceId to set.
+       * @param value The oldrefDeviceId to set.
        * @return This builder for chaining.
        */
-      public Builder setRefDeviceId(
+      public Builder setOldrefDeviceId(
           int index, java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureRefDeviceIdIsMutable();
-        refDeviceId_.set(index, value);
+        ensureOldrefDeviceIdIsMutable();
+        oldrefDeviceId_.set(index, value);
         bitField0_ |= 0x00000004;
         onChanged();
         return this;
@@ -21587,15 +21954,15 @@ public final class LayoutGraphicsProto {
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
-       * @param value The refDeviceId to add.
+       * <code>repeated string oldrefDeviceId = 3;</code>
+       * @param value The oldrefDeviceId to add.
        * @return This builder for chaining.
        */
-      public Builder addRefDeviceId(
+      public Builder addOldrefDeviceId(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureRefDeviceIdIsMutable();
-        refDeviceId_.add(value);
+        ensureOldrefDeviceIdIsMutable();
+        oldrefDeviceId_.add(value);
         bitField0_ |= 0x00000004;
         onChanged();
         return this;
@@ -21605,15 +21972,15 @@ public final class LayoutGraphicsProto {
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
-       * @param values The refDeviceId to add.
+       * <code>repeated string oldrefDeviceId = 3;</code>
+       * @param values The oldrefDeviceId to add.
        * @return This builder for chaining.
        */
-      public Builder addAllRefDeviceId(
+      public Builder addAllOldrefDeviceId(
           java.lang.Iterable<java.lang.String> values) {
-        ensureRefDeviceIdIsMutable();
+        ensureOldrefDeviceIdIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, refDeviceId_);
+            values, oldrefDeviceId_);
         bitField0_ |= 0x00000004;
         onChanged();
         return this;
@@ -21623,11 +21990,11 @@ public final class LayoutGraphicsProto {
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
+       * <code>repeated string oldrefDeviceId = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRefDeviceId() {
-        refDeviceId_ =
+      public Builder clearOldrefDeviceId() {
+        oldrefDeviceId_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);;
         onChanged();
@@ -21638,20 +22005,101 @@ public final class LayoutGraphicsProto {
        *关联的逻辑区段的id或道岔区段id
        * </pre>
        *
-       * <code>repeated string refDeviceId = 3;</code>
-       * @param value The bytes of the refDeviceId to add.
+       * <code>repeated string oldrefDeviceId = 3;</code>
+       * @param value The bytes of the oldrefDeviceId to add.
        * @return This builder for chaining.
        */
-      public Builder addRefDeviceIdBytes(
+      public Builder addOldrefDeviceIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        ensureRefDeviceIdIsMutable();
-        refDeviceId_.add(value);
+        ensureOldrefDeviceIdIsMutable();
+        oldrefDeviceId_.add(value);
         bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList refDeviceId_ = emptyIntList();
+      private void ensureRefDeviceIdIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          refDeviceId_ = mutableCopy(refDeviceId_);
+          bitField0_ |= 0x00000008;
+        }
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @return A list containing the refDeviceId.
+       */
+      public java.util.List<java.lang.Integer>
+          getRefDeviceIdList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(refDeviceId_) : refDeviceId_;
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @return The count of refDeviceId.
+       */
+      public int getRefDeviceIdCount() {
+        return refDeviceId_.size();
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @param index The index of the element to return.
+       * @return The refDeviceId at the given index.
+       */
+      public int getRefDeviceId(int index) {
+        return refDeviceId_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The refDeviceId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRefDeviceId(
+          int index, int value) {
+
+        ensureRefDeviceIdIsMutable();
+        refDeviceId_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @param value The refDeviceId to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRefDeviceId(int value) {
+
+        ensureRefDeviceIdIsMutable();
+        refDeviceId_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @param values The refDeviceId to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRefDeviceId(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRefDeviceIdIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, refDeviceId_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 refDeviceId = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRefDeviceId() {
+        refDeviceId_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -30536,36 +30984,60 @@ public final class LayoutGraphicsProto {
         getContainStaBytes(int index);
 
     /**
-     * <code>repeated string linkPathLines = 9;</code>
-     * @return A list containing the linkPathLines.
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
+     * @return A list containing the oldlinkPathLines.
      */
     java.util.List<java.lang.String>
-        getLinkPathLinesList();
+        getOldlinkPathLinesList();
     /**
-     * <code>repeated string linkPathLines = 9;</code>
-     * @return The count of linkPathLines.
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
+     * @return The count of oldlinkPathLines.
      */
-    int getLinkPathLinesCount();
+    int getOldlinkPathLinesCount();
     /**
-     * <code>repeated string linkPathLines = 9;</code>
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
      * @param index The index of the element to return.
-     * @return The linkPathLines at the given index.
+     * @return The oldlinkPathLines at the given index.
      */
-    java.lang.String getLinkPathLines(int index);
+    java.lang.String getOldlinkPathLines(int index);
     /**
-     * <code>repeated string linkPathLines = 9;</code>
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
      * @param index The index of the value to return.
-     * @return The bytes of the linkPathLines at the given index.
+     * @return The bytes of the oldlinkPathLines at the given index.
      */
     com.google.protobuf.ByteString
-        getLinkPathLinesBytes(int index);
+        getOldlinkPathLinesBytes(int index);
 
     /**
+     * <pre>
+     * 实际线路id
+     * </pre>
+     *
      * <code>string lineId = 10;</code>
      * @return The lineId.
      */
     java.lang.String getLineId();
     /**
+     * <pre>
+     * 实际线路id
+     * </pre>
+     *
      * <code>string lineId = 10;</code>
      * @return The bytes for lineId.
      */
@@ -30631,16 +31103,53 @@ public final class LayoutGraphicsProto {
     int getGrayPointIndexs(int index);
 
     /**
+     * <pre>
+     * 线路显示颜色
+     * </pre>
+     *
      * <code>string lineColor = 13;</code>
      * @return The lineColor.
      */
     java.lang.String getLineColor();
     /**
+     * <pre>
+     * 线路显示颜色
+     * </pre>
+     *
      * <code>string lineColor = 13;</code>
      * @return The bytes for lineColor.
      */
     com.google.protobuf.ByteString
         getLineColorBytes();
+
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @return A list containing the linkPathLines.
+     */
+    java.util.List<java.lang.Integer> getLinkPathLinesList();
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @return The count of linkPathLines.
+     */
+    int getLinkPathLinesCount();
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @param index The index of the element to return.
+     * @return The linkPathLines at the given index.
+     */
+    int getLinkPathLines(int index);
   }
   /**
    * Protobuf type {@code graphicData.RunLine}
@@ -30661,12 +31170,13 @@ public final class LayoutGraphicsProto {
       nameBgColor_ = "";
       containSta_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-      linkPathLines_ =
+      oldlinkPathLines_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
       lineId_ = "";
       dashPointIndexs_ = emptyIntList();
       grayPointIndexs_ = emptyIntList();
       lineColor_ = "";
+      linkPathLines_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -30930,47 +31440,67 @@ public final class LayoutGraphicsProto {
       return containSta_.getByteString(index);
     }
 
-    public static final int LINKPATHLINES_FIELD_NUMBER = 9;
+    public static final int OLDLINKPATHLINES_FIELD_NUMBER = 9;
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList linkPathLines_ =
+    private com.google.protobuf.LazyStringArrayList oldlinkPathLines_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
     /**
-     * <code>repeated string linkPathLines = 9;</code>
-     * @return A list containing the linkPathLines.
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
+     * @return A list containing the oldlinkPathLines.
      */
     public com.google.protobuf.ProtocolStringList
-        getLinkPathLinesList() {
-      return linkPathLines_;
+        getOldlinkPathLinesList() {
+      return oldlinkPathLines_;
     }
     /**
-     * <code>repeated string linkPathLines = 9;</code>
-     * @return The count of linkPathLines.
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
+     * @return The count of oldlinkPathLines.
      */
-    public int getLinkPathLinesCount() {
-      return linkPathLines_.size();
+    public int getOldlinkPathLinesCount() {
+      return oldlinkPathLines_.size();
     }
     /**
-     * <code>repeated string linkPathLines = 9;</code>
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
      * @param index The index of the element to return.
-     * @return The linkPathLines at the given index.
+     * @return The oldlinkPathLines at the given index.
      */
-    public java.lang.String getLinkPathLines(int index) {
-      return linkPathLines_.get(index);
+    public java.lang.String getOldlinkPathLines(int index) {
+      return oldlinkPathLines_.get(index);
     }
     /**
-     * <code>repeated string linkPathLines = 9;</code>
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated string oldlinkPathLines = 9;</code>
      * @param index The index of the value to return.
-     * @return The bytes of the linkPathLines at the given index.
+     * @return The bytes of the oldlinkPathLines at the given index.
      */
     public com.google.protobuf.ByteString
-        getLinkPathLinesBytes(int index) {
-      return linkPathLines_.getByteString(index);
+        getOldlinkPathLinesBytes(int index) {
+      return oldlinkPathLines_.getByteString(index);
     }
 
     public static final int LINEID_FIELD_NUMBER = 10;
     @SuppressWarnings("serial")
     private volatile java.lang.Object lineId_ = "";
     /**
+     * <pre>
+     * 实际线路id
+     * </pre>
+     *
      * <code>string lineId = 10;</code>
      * @return The lineId.
      */
@@ -30988,6 +31518,10 @@ public final class LayoutGraphicsProto {
       }
     }
     /**
+     * <pre>
+     * 实际线路id
+     * </pre>
+     *
      * <code>string lineId = 10;</code>
      * @return The bytes for lineId.
      */
@@ -31092,6 +31626,10 @@ public final class LayoutGraphicsProto {
     @SuppressWarnings("serial")
     private volatile java.lang.Object lineColor_ = "";
     /**
+     * <pre>
+     * 线路显示颜色
+     * </pre>
+     *
      * <code>string lineColor = 13;</code>
      * @return The lineColor.
      */
@@ -31109,6 +31647,10 @@ public final class LayoutGraphicsProto {
       }
     }
     /**
+     * <pre>
+     * 线路显示颜色
+     * </pre>
+     *
      * <code>string lineColor = 13;</code>
      * @return The bytes for lineColor.
      */
@@ -31127,6 +31669,47 @@ public final class LayoutGraphicsProto {
       }
     }
 
+    public static final int LINKPATHLINES_FIELD_NUMBER = 14;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList linkPathLines_;
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @return A list containing the linkPathLines.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLinkPathLinesList() {
+      return linkPathLines_;
+    }
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @return The count of linkPathLines.
+     */
+    public int getLinkPathLinesCount() {
+      return linkPathLines_.size();
+    }
+    /**
+     * <pre>
+     *关联pathLine
+     * </pre>
+     *
+     * <code>repeated uint32 linkPathLines = 14;</code>
+     * @param index The index of the element to return.
+     * @return The linkPathLines at the given index.
+     */
+    public int getLinkPathLines(int index) {
+      return linkPathLines_.getInt(index);
+    }
+    private int linkPathLinesMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -31160,8 +31743,8 @@ public final class LayoutGraphicsProto {
       for (int i = 0; i < containSta_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 8, containSta_.getRaw(i));
       }
-      for (int i = 0; i < linkPathLines_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, linkPathLines_.getRaw(i));
+      for (int i = 0; i < oldlinkPathLines_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, oldlinkPathLines_.getRaw(i));
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lineId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 10, lineId_);
@@ -31183,6 +31766,13 @@ public final class LayoutGraphicsProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lineColor_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 13, lineColor_);
       }
+      if (getLinkPathLinesList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(linkPathLinesMemoizedSerializedSize);
+      }
+      for (int i = 0; i < linkPathLines_.size(); i++) {
+        output.writeUInt32NoTag(linkPathLines_.getInt(i));
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -31219,11 +31809,11 @@ public final class LayoutGraphicsProto {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < linkPathLines_.size(); i++) {
-          dataSize += computeStringSizeNoTag(linkPathLines_.getRaw(i));
+        for (int i = 0; i < oldlinkPathLines_.size(); i++) {
+          dataSize += computeStringSizeNoTag(oldlinkPathLines_.getRaw(i));
         }
         size += dataSize;
-        size += 1 * getLinkPathLinesList().size();
+        size += 1 * getOldlinkPathLinesList().size();
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lineId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, lineId_);
@@ -31259,6 +31849,20 @@ public final class LayoutGraphicsProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lineColor_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, lineColor_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < linkPathLines_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(linkPathLines_.getInt(i));
+        }
+        size += dataSize;
+        if (!getLinkPathLinesList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        linkPathLinesMemoizedSerializedSize = dataSize;
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -31289,8 +31893,8 @@ public final class LayoutGraphicsProto {
           .equals(other.getNameBgColor())) return false;
       if (!getContainStaList()
           .equals(other.getContainStaList())) return false;
-      if (!getLinkPathLinesList()
-          .equals(other.getLinkPathLinesList())) return false;
+      if (!getOldlinkPathLinesList()
+          .equals(other.getOldlinkPathLinesList())) return false;
       if (!getLineId()
           .equals(other.getLineId())) return false;
       if (!getDashPointIndexsList()
@@ -31299,6 +31903,8 @@ public final class LayoutGraphicsProto {
           .equals(other.getGrayPointIndexsList())) return false;
       if (!getLineColor()
           .equals(other.getLineColor())) return false;
+      if (!getLinkPathLinesList()
+          .equals(other.getLinkPathLinesList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -31328,9 +31934,9 @@ public final class LayoutGraphicsProto {
         hash = (37 * hash) + CONTAINSTA_FIELD_NUMBER;
         hash = (53 * hash) + getContainStaList().hashCode();
       }
-      if (getLinkPathLinesCount() > 0) {
-        hash = (37 * hash) + LINKPATHLINES_FIELD_NUMBER;
-        hash = (53 * hash) + getLinkPathLinesList().hashCode();
+      if (getOldlinkPathLinesCount() > 0) {
+        hash = (37 * hash) + OLDLINKPATHLINES_FIELD_NUMBER;
+        hash = (53 * hash) + getOldlinkPathLinesList().hashCode();
       }
       hash = (37 * hash) + LINEID_FIELD_NUMBER;
       hash = (53 * hash) + getLineId().hashCode();
@@ -31344,6 +31950,10 @@ public final class LayoutGraphicsProto {
       }
       hash = (37 * hash) + LINECOLOR_FIELD_NUMBER;
       hash = (53 * hash) + getLineColor().hashCode();
+      if (getLinkPathLinesCount() > 0) {
+        hash = (37 * hash) + LINKPATHLINES_FIELD_NUMBER;
+        hash = (53 * hash) + getLinkPathLinesList().hashCode();
+      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -31492,12 +32102,13 @@ public final class LayoutGraphicsProto {
         nameBgColor_ = "";
         containSta_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
-        linkPathLines_ =
+        oldlinkPathLines_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
         lineId_ = "";
         dashPointIndexs_ = emptyIntList();
         grayPointIndexs_ = emptyIntList();
         lineColor_ = "";
+        linkPathLines_ = emptyIntList();
         return this;
       }
 
@@ -31550,6 +32161,11 @@ public final class LayoutGraphicsProto {
           bitField0_ = (bitField0_ & ~0x00000200);
         }
         result.grayPointIndexs_ = grayPointIndexs_;
+        if (((bitField0_ & 0x00000800) != 0)) {
+          linkPathLines_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000800);
+        }
+        result.linkPathLines_ = linkPathLines_;
       }
 
       private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RunLine result) {
@@ -31573,8 +32189,8 @@ public final class LayoutGraphicsProto {
           result.containSta_ = containSta_;
         }
         if (((from_bitField0_ & 0x00000040) != 0)) {
-          linkPathLines_.makeImmutable();
-          result.linkPathLines_ = linkPathLines_;
+          oldlinkPathLines_.makeImmutable();
+          result.oldlinkPathLines_ = oldlinkPathLines_;
         }
         if (((from_bitField0_ & 0x00000080) != 0)) {
           result.lineId_ = lineId_;
@@ -31650,13 +32266,13 @@ public final class LayoutGraphicsProto {
           }
           onChanged();
         }
-        if (!other.linkPathLines_.isEmpty()) {
-          if (linkPathLines_.isEmpty()) {
-            linkPathLines_ = other.linkPathLines_;
+        if (!other.oldlinkPathLines_.isEmpty()) {
+          if (oldlinkPathLines_.isEmpty()) {
+            oldlinkPathLines_ = other.oldlinkPathLines_;
             bitField0_ |= 0x00000040;
           } else {
-            ensureLinkPathLinesIsMutable();
-            linkPathLines_.addAll(other.linkPathLines_);
+            ensureOldlinkPathLinesIsMutable();
+            oldlinkPathLines_.addAll(other.oldlinkPathLines_);
           }
           onChanged();
         }
@@ -31690,6 +32306,16 @@ public final class LayoutGraphicsProto {
           bitField0_ |= 0x00000400;
           onChanged();
         }
+        if (!other.linkPathLines_.isEmpty()) {
+          if (linkPathLines_.isEmpty()) {
+            linkPathLines_ = other.linkPathLines_;
+            bitField0_ = (bitField0_ & ~0x00000800);
+          } else {
+            ensureLinkPathLinesIsMutable();
+            linkPathLines_.addAll(other.linkPathLines_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -31759,8 +32385,8 @@ public final class LayoutGraphicsProto {
               } // case 66
               case 74: {
                 java.lang.String s = input.readStringRequireUtf8();
-                ensureLinkPathLinesIsMutable();
-                linkPathLines_.add(s);
+                ensureOldlinkPathLinesIsMutable();
+                oldlinkPathLines_.add(s);
                 break;
               } // case 74
               case 82: {
@@ -31805,6 +32431,22 @@ public final class LayoutGraphicsProto {
                 bitField0_ |= 0x00000400;
                 break;
               } // case 106
+              case 112: {
+                int v = input.readUInt32();
+                ensureLinkPathLinesIsMutable();
+                linkPathLines_.addInt(v);
+                break;
+              } // case 112
+              case 114: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureLinkPathLinesIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  linkPathLines_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 114
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -32553,112 +33195,148 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList linkPathLines_ =
+      private com.google.protobuf.LazyStringArrayList oldlinkPathLines_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-      private void ensureLinkPathLinesIsMutable() {
-        if (!linkPathLines_.isModifiable()) {
-          linkPathLines_ = new com.google.protobuf.LazyStringArrayList(linkPathLines_);
+      private void ensureOldlinkPathLinesIsMutable() {
+        if (!oldlinkPathLines_.isModifiable()) {
+          oldlinkPathLines_ = new com.google.protobuf.LazyStringArrayList(oldlinkPathLines_);
         }
         bitField0_ |= 0x00000040;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
-       * @return A list containing the linkPathLines.
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
+       * @return A list containing the oldlinkPathLines.
        */
       public com.google.protobuf.ProtocolStringList
-          getLinkPathLinesList() {
-        linkPathLines_.makeImmutable();
-        return linkPathLines_;
+          getOldlinkPathLinesList() {
+        oldlinkPathLines_.makeImmutable();
+        return oldlinkPathLines_;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
-       * @return The count of linkPathLines.
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
+       * @return The count of oldlinkPathLines.
        */
-      public int getLinkPathLinesCount() {
-        return linkPathLines_.size();
+      public int getOldlinkPathLinesCount() {
+        return oldlinkPathLines_.size();
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
        * @param index The index of the element to return.
-       * @return The linkPathLines at the given index.
+       * @return The oldlinkPathLines at the given index.
        */
-      public java.lang.String getLinkPathLines(int index) {
-        return linkPathLines_.get(index);
+      public java.lang.String getOldlinkPathLines(int index) {
+        return oldlinkPathLines_.get(index);
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
        * @param index The index of the value to return.
-       * @return The bytes of the linkPathLines at the given index.
+       * @return The bytes of the oldlinkPathLines at the given index.
        */
       public com.google.protobuf.ByteString
-          getLinkPathLinesBytes(int index) {
-        return linkPathLines_.getByteString(index);
+          getOldlinkPathLinesBytes(int index) {
+        return oldlinkPathLines_.getByteString(index);
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
        * @param index The index to set the value at.
-       * @param value The linkPathLines to set.
+       * @param value The oldlinkPathLines to set.
        * @return This builder for chaining.
        */
-      public Builder setLinkPathLines(
+      public Builder setOldlinkPathLines(
           int index, java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureLinkPathLinesIsMutable();
-        linkPathLines_.set(index, value);
+        ensureOldlinkPathLinesIsMutable();
+        oldlinkPathLines_.set(index, value);
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
-       * @param value The linkPathLines to add.
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
+       * @param value The oldlinkPathLines to add.
        * @return This builder for chaining.
        */
-      public Builder addLinkPathLines(
+      public Builder addOldlinkPathLines(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureLinkPathLinesIsMutable();
-        linkPathLines_.add(value);
+        ensureOldlinkPathLinesIsMutable();
+        oldlinkPathLines_.add(value);
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
-       * @param values The linkPathLines to add.
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
+       * @param values The oldlinkPathLines to add.
        * @return This builder for chaining.
        */
-      public Builder addAllLinkPathLines(
+      public Builder addAllOldlinkPathLines(
           java.lang.Iterable<java.lang.String> values) {
-        ensureLinkPathLinesIsMutable();
+        ensureOldlinkPathLinesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, linkPathLines_);
+            values, oldlinkPathLines_);
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLinkPathLines() {
-        linkPathLines_ =
+      public Builder clearOldlinkPathLines() {
+        oldlinkPathLines_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000040);;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string linkPathLines = 9;</code>
-       * @param value The bytes of the linkPathLines to add.
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated string oldlinkPathLines = 9;</code>
+       * @param value The bytes of the oldlinkPathLines to add.
        * @return This builder for chaining.
        */
-      public Builder addLinkPathLinesBytes(
+      public Builder addOldlinkPathLinesBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        ensureLinkPathLinesIsMutable();
-        linkPathLines_.add(value);
+        ensureOldlinkPathLinesIsMutable();
+        oldlinkPathLines_.add(value);
         bitField0_ |= 0x00000040;
         onChanged();
         return this;
@@ -32666,6 +33344,10 @@ public final class LayoutGraphicsProto {
 
       private java.lang.Object lineId_ = "";
       /**
+       * <pre>
+       * 实际线路id
+       * </pre>
+       *
        * <code>string lineId = 10;</code>
        * @return The lineId.
        */
@@ -32682,6 +33364,10 @@ public final class LayoutGraphicsProto {
         }
       }
       /**
+       * <pre>
+       * 实际线路id
+       * </pre>
+       *
        * <code>string lineId = 10;</code>
        * @return The bytes for lineId.
        */
@@ -32699,6 +33385,10 @@ public final class LayoutGraphicsProto {
         }
       }
       /**
+       * <pre>
+       * 实际线路id
+       * </pre>
+       *
        * <code>string lineId = 10;</code>
        * @param value The lineId to set.
        * @return This builder for chaining.
@@ -32712,6 +33402,10 @@ public final class LayoutGraphicsProto {
         return this;
       }
       /**
+       * <pre>
+       * 实际线路id
+       * </pre>
+       *
        * <code>string lineId = 10;</code>
        * @return This builder for chaining.
        */
@@ -32722,6 +33416,10 @@ public final class LayoutGraphicsProto {
         return this;
       }
       /**
+       * <pre>
+       * 实际线路id
+       * </pre>
+       *
        * <code>string lineId = 10;</code>
        * @param value The bytes for lineId to set.
        * @return This builder for chaining.
@@ -32956,6 +33654,10 @@ public final class LayoutGraphicsProto {
 
       private java.lang.Object lineColor_ = "";
       /**
+       * <pre>
+       * 线路显示颜色
+       * </pre>
+       *
        * <code>string lineColor = 13;</code>
        * @return The lineColor.
        */
@@ -32972,6 +33674,10 @@ public final class LayoutGraphicsProto {
         }
       }
       /**
+       * <pre>
+       * 线路显示颜色
+       * </pre>
+       *
        * <code>string lineColor = 13;</code>
        * @return The bytes for lineColor.
        */
@@ -32989,6 +33695,10 @@ public final class LayoutGraphicsProto {
         }
       }
       /**
+       * <pre>
+       * 线路显示颜色
+       * </pre>
+       *
        * <code>string lineColor = 13;</code>
        * @param value The lineColor to set.
        * @return This builder for chaining.
@@ -33002,6 +33712,10 @@ public final class LayoutGraphicsProto {
         return this;
       }
       /**
+       * <pre>
+       * 线路显示颜色
+       * </pre>
+       *
        * <code>string lineColor = 13;</code>
        * @return This builder for chaining.
        */
@@ -33012,6 +33726,10 @@ public final class LayoutGraphicsProto {
         return this;
       }
       /**
+       * <pre>
+       * 线路显示颜色
+       * </pre>
+       *
        * <code>string lineColor = 13;</code>
        * @param value The bytes for lineColor to set.
        * @return This builder for chaining.
@@ -33025,6 +33743,115 @@ public final class LayoutGraphicsProto {
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList linkPathLines_ = emptyIntList();
+      private void ensureLinkPathLinesIsMutable() {
+        if (!((bitField0_ & 0x00000800) != 0)) {
+          linkPathLines_ = mutableCopy(linkPathLines_);
+          bitField0_ |= 0x00000800;
+        }
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @return A list containing the linkPathLines.
+       */
+      public java.util.List<java.lang.Integer>
+          getLinkPathLinesList() {
+        return ((bitField0_ & 0x00000800) != 0) ?
+                 java.util.Collections.unmodifiableList(linkPathLines_) : linkPathLines_;
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @return The count of linkPathLines.
+       */
+      public int getLinkPathLinesCount() {
+        return linkPathLines_.size();
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @param index The index of the element to return.
+       * @return The linkPathLines at the given index.
+       */
+      public int getLinkPathLines(int index) {
+        return linkPathLines_.getInt(index);
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @param index The index to set the value at.
+       * @param value The linkPathLines to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLinkPathLines(
+          int index, int value) {
+
+        ensureLinkPathLinesIsMutable();
+        linkPathLines_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @param value The linkPathLines to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLinkPathLines(int value) {
+
+        ensureLinkPathLinesIsMutable();
+        linkPathLines_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @param values The linkPathLines to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLinkPathLines(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLinkPathLinesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, linkPathLines_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *关联pathLine
+       * </pre>
+       *
+       * <code>repeated uint32 linkPathLines = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLinkPathLines() {
+        linkPathLines_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000800);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -33263,41 +34090,41 @@ public final class LayoutGraphicsProto {
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
-     * @return A list containing the children.
+     * <code>repeated string oldchildren = 8;</code>
+     * @return A list containing the oldchildren.
      */
     java.util.List<java.lang.String>
-        getChildrenList();
+        getOldchildrenList();
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
-     * @return The count of children.
+     * <code>repeated string oldchildren = 8;</code>
+     * @return The count of oldchildren.
      */
-    int getChildrenCount();
+    int getOldchildrenCount();
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
+     * <code>repeated string oldchildren = 8;</code>
      * @param index The index of the element to return.
-     * @return The children at the given index.
+     * @return The oldchildren at the given index.
      */
-    java.lang.String getChildren(int index);
+    java.lang.String getOldchildren(int index);
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
+     * <code>repeated string oldchildren = 8;</code>
      * @param index The index of the value to return.
-     * @return The bytes of the children at the given index.
+     * @return The bytes of the oldchildren at the given index.
      */
     com.google.protobuf.ByteString
-        getChildrenBytes(int index);
+        getOldchildrenBytes(int index);
 
     /**
      * <pre>
@@ -33328,6 +34155,23 @@ public final class LayoutGraphicsProto {
      * @return The turning.
      */
     boolean getTurning();
+
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @return A list containing the children.
+     */
+    java.util.List<java.lang.Integer> getChildrenList();
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @return The count of children.
+     */
+    int getChildrenCount();
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @param index The index of the element to return.
+     * @return The children at the given index.
+     */
+    int getChildren(int index);
   }
   /**
    * <pre>
@@ -33351,9 +34195,10 @@ public final class LayoutGraphicsProto {
       sectionType_ = 0;
       axleCountings_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-      children_ =
+      oldchildren_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
       destinationCode_ = "";
+      children_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -33761,57 +34606,57 @@ public final class LayoutGraphicsProto {
       return axleCountings_.getByteString(index);
     }
 
-    public static final int CHILDREN_FIELD_NUMBER = 8;
+    public static final int OLDCHILDREN_FIELD_NUMBER = 8;
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList children_ =
+    private com.google.protobuf.LazyStringArrayList oldchildren_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
-     * @return A list containing the children.
+     * <code>repeated string oldchildren = 8;</code>
+     * @return A list containing the oldchildren.
      */
     public com.google.protobuf.ProtocolStringList
-        getChildrenList() {
-      return children_;
+        getOldchildrenList() {
+      return oldchildren_;
     }
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
-     * @return The count of children.
+     * <code>repeated string oldchildren = 8;</code>
+     * @return The count of oldchildren.
      */
-    public int getChildrenCount() {
-      return children_.size();
+    public int getOldchildrenCount() {
+      return oldchildren_.size();
     }
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
+     * <code>repeated string oldchildren = 8;</code>
      * @param index The index of the element to return.
-     * @return The children at the given index.
+     * @return The oldchildren at the given index.
      */
-    public java.lang.String getChildren(int index) {
-      return children_.get(index);
+    public java.lang.String getOldchildren(int index) {
+      return oldchildren_.get(index);
     }
     /**
      * <pre>
      * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
      * </pre>
      *
-     * <code>repeated string children = 8;</code>
+     * <code>repeated string oldchildren = 8;</code>
      * @param index The index of the value to return.
-     * @return The bytes of the children at the given index.
+     * @return The bytes of the oldchildren at the given index.
      */
     public com.google.protobuf.ByteString
-        getChildrenBytes(int index) {
-      return children_.getByteString(index);
+        getOldchildrenBytes(int index) {
+      return oldchildren_.getByteString(index);
     }
 
     public static final int DESTINATIONCODE_FIELD_NUMBER = 9;
@@ -33876,6 +34721,35 @@ public final class LayoutGraphicsProto {
       return turning_;
     }
 
+    public static final int CHILDREN_FIELD_NUMBER = 11;
+    @SuppressWarnings("serial")
+    private com.google.protobuf.Internal.IntList children_;
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @return A list containing the children.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getChildrenList() {
+      return children_;
+    }
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @return The count of children.
+     */
+    public int getChildrenCount() {
+      return children_.size();
+    }
+    /**
+     * <code>repeated uint32 children = 11;</code>
+     * @param index The index of the element to return.
+     * @return The children at the given index.
+     */
+    public int getChildren(int index) {
+      return children_.getInt(index);
+    }
+    private int childrenMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -33890,6 +34764,7 @@ public final class LayoutGraphicsProto {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (common_ != null) {
         output.writeMessage(1, getCommon());
       }
@@ -33911,8 +34786,8 @@ public final class LayoutGraphicsProto {
       for (int i = 0; i < axleCountings_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, axleCountings_.getRaw(i));
       }
-      for (int i = 0; i < children_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, children_.getRaw(i));
+      for (int i = 0; i < oldchildren_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, oldchildren_.getRaw(i));
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 9, destinationCode_);
@@ -33920,6 +34795,13 @@ public final class LayoutGraphicsProto {
       if (turning_ != false) {
         output.writeBool(10, turning_);
       }
+      if (getChildrenList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(childrenMemoizedSerializedSize);
+      }
+      for (int i = 0; i < children_.size(); i++) {
+        output.writeUInt32NoTag(children_.getInt(i));
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -33962,11 +34844,11 @@ public final class LayoutGraphicsProto {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < children_.size(); i++) {
-          dataSize += computeStringSizeNoTag(children_.getRaw(i));
+        for (int i = 0; i < oldchildren_.size(); i++) {
+          dataSize += computeStringSizeNoTag(oldchildren_.getRaw(i));
         }
         size += dataSize;
-        size += 1 * getChildrenList().size();
+        size += 1 * getOldchildrenList().size();
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, destinationCode_);
@@ -33975,6 +34857,20 @@ public final class LayoutGraphicsProto {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(10, turning_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < children_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(children_.getInt(i));
+        }
+        size += dataSize;
+        if (!getChildrenList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        childrenMemoizedSerializedSize = dataSize;
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -34012,12 +34908,14 @@ public final class LayoutGraphicsProto {
       if (sectionType_ != other.sectionType_) return false;
       if (!getAxleCountingsList()
           .equals(other.getAxleCountingsList())) return false;
-      if (!getChildrenList()
-          .equals(other.getChildrenList())) return false;
+      if (!getOldchildrenList()
+          .equals(other.getOldchildrenList())) return false;
       if (!getDestinationCode()
           .equals(other.getDestinationCode())) return false;
       if (getTurning()
           != other.getTurning()) return false;
+      if (!getChildrenList()
+          .equals(other.getChildrenList())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -34053,15 +34951,19 @@ public final class LayoutGraphicsProto {
         hash = (37 * hash) + AXLECOUNTINGS_FIELD_NUMBER;
         hash = (53 * hash) + getAxleCountingsList().hashCode();
       }
-      if (getChildrenCount() > 0) {
-        hash = (37 * hash) + CHILDREN_FIELD_NUMBER;
-        hash = (53 * hash) + getChildrenList().hashCode();
+      if (getOldchildrenCount() > 0) {
+        hash = (37 * hash) + OLDCHILDREN_FIELD_NUMBER;
+        hash = (53 * hash) + getOldchildrenList().hashCode();
       }
       hash = (37 * hash) + DESTINATIONCODE_FIELD_NUMBER;
       hash = (53 * hash) + getDestinationCode().hashCode();
       hash = (37 * hash) + TURNING_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getTurning());
+      if (getChildrenCount() > 0) {
+        hash = (37 * hash) + CHILDREN_FIELD_NUMBER;
+        hash = (53 * hash) + getChildrenList().hashCode();
+      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -34223,10 +35125,11 @@ public final class LayoutGraphicsProto {
         sectionType_ = 0;
         axleCountings_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
-        children_ =
+        oldchildren_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
         destinationCode_ = "";
         turning_ = false;
+        children_ = emptyIntList();
         return this;
       }
 
@@ -34269,6 +35172,11 @@ public final class LayoutGraphicsProto {
         } else {
           result.points_ = pointsBuilder_.build();
         }
+        if (((bitField0_ & 0x00000400) != 0)) {
+          children_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000400);
+        }
+        result.children_ = children_;
       }
 
       private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section result) {
@@ -34299,8 +35207,8 @@ public final class LayoutGraphicsProto {
           result.axleCountings_ = axleCountings_;
         }
         if (((from_bitField0_ & 0x00000080) != 0)) {
-          children_.makeImmutable();
-          result.children_ = children_;
+          oldchildren_.makeImmutable();
+          result.oldchildren_ = oldchildren_;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
           result.destinationCode_ = destinationCode_;
@@ -34375,13 +35283,13 @@ public final class LayoutGraphicsProto {
           }
           onChanged();
         }
-        if (!other.children_.isEmpty()) {
-          if (children_.isEmpty()) {
-            children_ = other.children_;
+        if (!other.oldchildren_.isEmpty()) {
+          if (oldchildren_.isEmpty()) {
+            oldchildren_ = other.oldchildren_;
             bitField0_ |= 0x00000080;
           } else {
-            ensureChildrenIsMutable();
-            children_.addAll(other.children_);
+            ensureOldchildrenIsMutable();
+            oldchildren_.addAll(other.oldchildren_);
           }
           onChanged();
         }
@@ -34393,6 +35301,16 @@ public final class LayoutGraphicsProto {
         if (other.getTurning() != false) {
           setTurning(other.getTurning());
         }
+        if (!other.children_.isEmpty()) {
+          if (children_.isEmpty()) {
+            children_ = other.children_;
+            bitField0_ = (bitField0_ & ~0x00000400);
+          } else {
+            ensureChildrenIsMutable();
+            children_.addAll(other.children_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -34471,8 +35389,8 @@ public final class LayoutGraphicsProto {
               } // case 58
               case 66: {
                 java.lang.String s = input.readStringRequireUtf8();
-                ensureChildrenIsMutable();
-                children_.add(s);
+                ensureOldchildrenIsMutable();
+                oldchildren_.add(s);
                 break;
               } // case 66
               case 74: {
@@ -34485,6 +35403,22 @@ public final class LayoutGraphicsProto {
                 bitField0_ |= 0x00000200;
                 break;
               } // case 80
+              case 88: {
+                int v = input.readUInt32();
+                ensureChildrenIsMutable();
+                children_.addInt(v);
+                break;
+              } // case 88
+              case 90: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureChildrenIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  children_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 90
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -35463,11 +36397,11 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private com.google.protobuf.LazyStringArrayList children_ =
+      private com.google.protobuf.LazyStringArrayList oldchildren_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
-      private void ensureChildrenIsMutable() {
-        if (!children_.isModifiable()) {
-          children_ = new com.google.protobuf.LazyStringArrayList(children_);
+      private void ensureOldchildrenIsMutable() {
+        if (!oldchildren_.isModifiable()) {
+          oldchildren_ = new com.google.protobuf.LazyStringArrayList(oldchildren_);
         }
         bitField0_ |= 0x00000080;
       }
@@ -35476,65 +36410,65 @@ public final class LayoutGraphicsProto {
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
-       * @return A list containing the children.
+       * <code>repeated string oldchildren = 8;</code>
+       * @return A list containing the oldchildren.
        */
       public com.google.protobuf.ProtocolStringList
-          getChildrenList() {
-        children_.makeImmutable();
-        return children_;
+          getOldchildrenList() {
+        oldchildren_.makeImmutable();
+        return oldchildren_;
       }
       /**
        * <pre>
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
-       * @return The count of children.
+       * <code>repeated string oldchildren = 8;</code>
+       * @return The count of oldchildren.
        */
-      public int getChildrenCount() {
-        return children_.size();
+      public int getOldchildrenCount() {
+        return oldchildren_.size();
       }
       /**
        * <pre>
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
+       * <code>repeated string oldchildren = 8;</code>
        * @param index The index of the element to return.
-       * @return The children at the given index.
+       * @return The oldchildren at the given index.
        */
-      public java.lang.String getChildren(int index) {
-        return children_.get(index);
+      public java.lang.String getOldchildren(int index) {
+        return oldchildren_.get(index);
       }
       /**
        * <pre>
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
+       * <code>repeated string oldchildren = 8;</code>
        * @param index The index of the value to return.
-       * @return The bytes of the children at the given index.
+       * @return The bytes of the oldchildren at the given index.
        */
       public com.google.protobuf.ByteString
-          getChildrenBytes(int index) {
-        return children_.getByteString(index);
+          getOldchildrenBytes(int index) {
+        return oldchildren_.getByteString(index);
       }
       /**
        * <pre>
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
+       * <code>repeated string oldchildren = 8;</code>
        * @param index The index to set the value at.
-       * @param value The children to set.
+       * @param value The oldchildren to set.
        * @return This builder for chaining.
        */
-      public Builder setChildren(
+      public Builder setOldchildren(
           int index, java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureChildrenIsMutable();
-        children_.set(index, value);
+        ensureOldchildrenIsMutable();
+        oldchildren_.set(index, value);
         bitField0_ |= 0x00000080;
         onChanged();
         return this;
@@ -35544,15 +36478,15 @@ public final class LayoutGraphicsProto {
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
-       * @param value The children to add.
+       * <code>repeated string oldchildren = 8;</code>
+       * @param value The oldchildren to add.
        * @return This builder for chaining.
        */
-      public Builder addChildren(
+      public Builder addOldchildren(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        ensureChildrenIsMutable();
-        children_.add(value);
+        ensureOldchildrenIsMutable();
+        oldchildren_.add(value);
         bitField0_ |= 0x00000080;
         onChanged();
         return this;
@@ -35562,15 +36496,15 @@ public final class LayoutGraphicsProto {
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
-       * @param values The children to add.
+       * <code>repeated string oldchildren = 8;</code>
+       * @param values The oldchildren to add.
        * @return This builder for chaining.
        */
-      public Builder addAllChildren(
+      public Builder addAllOldchildren(
           java.lang.Iterable<java.lang.String> values) {
-        ensureChildrenIsMutable();
+        ensureOldchildrenIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, children_);
+            values, oldchildren_);
         bitField0_ |= 0x00000080;
         onChanged();
         return this;
@@ -35580,11 +36514,11 @@ public final class LayoutGraphicsProto {
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
+       * <code>repeated string oldchildren = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearChildren() {
-        children_ =
+      public Builder clearOldchildren() {
+        oldchildren_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000080);;
         onChanged();
@@ -35595,16 +36529,16 @@ public final class LayoutGraphicsProto {
        * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
        * </pre>
        *
-       * <code>repeated string children = 8;</code>
-       * @param value The bytes of the children to add.
+       * <code>repeated string oldchildren = 8;</code>
+       * @param value The bytes of the oldchildren to add.
        * @return This builder for chaining.
        */
-      public Builder addChildrenBytes(
+      public Builder addOldchildrenBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        ensureChildrenIsMutable();
-        children_.add(value);
+        ensureOldchildrenIsMutable();
+        oldchildren_.add(value);
         bitField0_ |= 0x00000080;
         onChanged();
         return this;
@@ -35745,6 +36679,87 @@ public final class LayoutGraphicsProto {
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList children_ = emptyIntList();
+      private void ensureChildrenIsMutable() {
+        if (!((bitField0_ & 0x00000400) != 0)) {
+          children_ = mutableCopy(children_);
+          bitField0_ |= 0x00000400;
+        }
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @return A list containing the children.
+       */
+      public java.util.List<java.lang.Integer>
+          getChildrenList() {
+        return ((bitField0_ & 0x00000400) != 0) ?
+                 java.util.Collections.unmodifiableList(children_) : children_;
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @return The count of children.
+       */
+      public int getChildrenCount() {
+        return children_.size();
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @param index The index of the element to return.
+       * @return The children at the given index.
+       */
+      public int getChildren(int index) {
+        return children_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The children to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChildren(
+          int index, int value) {
+
+        ensureChildrenIsMutable();
+        children_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @param value The children to add.
+       * @return This builder for chaining.
+       */
+      public Builder addChildren(int value) {
+
+        ensureChildrenIsMutable();
+        children_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @param values The children to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllChildren(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureChildrenIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, children_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 children = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChildren() {
+        children_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000400);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -39494,20 +40509,20 @@ public final class LayoutGraphicsProto {
      *关联的设备ID
      * </pre>
      *
-     * <code>string id = 2;</code>
-     * @return The id.
+     * <code>string oldid = 2;</code>
+     * @return The oldid.
      */
-    java.lang.String getId();
+    java.lang.String getOldid();
     /**
      * <pre>
      *关联的设备ID
      * </pre>
      *
-     * <code>string id = 2;</code>
-     * @return The bytes for id.
+     * <code>string oldid = 2;</code>
+     * @return The bytes for oldid.
      */
     com.google.protobuf.ByteString
-        getIdBytes();
+        getOldidBytes();
 
     /**
      * <pre>
@@ -39527,6 +40542,12 @@ public final class LayoutGraphicsProto {
      * @return The devicePort.
      */
     club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DevicePort getDevicePort();
+
+    /**
+     * <code>uint32 id = 4;</code>
+     * @return The id.
+     */
+    int getId();
   }
   /**
    * <pre>
@@ -39546,7 +40567,7 @@ public final class LayoutGraphicsProto {
     }
     private RelatedRef() {
       deviceType_ = 0;
-      id_ = "";
+      oldid_ = "";
       devicePort_ = 0;
     }
 
@@ -39839,27 +40860,27 @@ public final class LayoutGraphicsProto {
       return result == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DeviceType.UNRECOGNIZED : result;
     }
 
-    public static final int ID_FIELD_NUMBER = 2;
+    public static final int OLDID_FIELD_NUMBER = 2;
     @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private volatile java.lang.Object oldid_ = "";
     /**
      * <pre>
      *关联的设备ID
      * </pre>
      *
-     * <code>string id = 2;</code>
-     * @return The id.
+     * <code>string oldid = 2;</code>
+     * @return The oldid.
      */
     @java.lang.Override
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
+    public java.lang.String getOldid() {
+      java.lang.Object ref = oldid_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        id_ = s;
+        oldid_ = s;
         return s;
       }
     }
@@ -39868,18 +40889,18 @@ public final class LayoutGraphicsProto {
      *关联的设备ID
      * </pre>
      *
-     * <code>string id = 2;</code>
-     * @return The bytes for id.
+     * <code>string oldid = 2;</code>
+     * @return The bytes for oldid.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
+        getOldidBytes() {
+      java.lang.Object ref = oldid_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        id_ = b;
+        oldid_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -39912,6 +40933,17 @@ public final class LayoutGraphicsProto {
       return result == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DevicePort.UNRECOGNIZED : result;
     }
 
+    public static final int ID_FIELD_NUMBER = 4;
+    private int id_ = 0;
+    /**
+     * <code>uint32 id = 4;</code>
+     * @return The id.
+     */
+    @java.lang.Override
+    public int getId() {
+      return id_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -39929,12 +40961,15 @@ public final class LayoutGraphicsProto {
       if (deviceType_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DeviceType.Section.getNumber()) {
         output.writeEnum(1, deviceType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, id_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, oldid_);
       }
       if (devicePort_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DevicePort.A.getNumber()) {
         output.writeEnum(3, devicePort_);
       }
+      if (id_ != 0) {
+        output.writeUInt32(4, id_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -39948,13 +40983,17 @@ public final class LayoutGraphicsProto {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(1, deviceType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, id_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, oldid_);
       }
       if (devicePort_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DevicePort.A.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(3, devicePort_);
       }
+      if (id_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, id_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -39971,9 +41010,11 @@ public final class LayoutGraphicsProto {
       club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef other = (club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef) obj;
 
       if (deviceType_ != other.deviceType_) return false;
-      if (!getId()
-          .equals(other.getId())) return false;
+      if (!getOldid()
+          .equals(other.getOldid())) return false;
       if (devicePort_ != other.devicePort_) return false;
+      if (getId()
+          != other.getId()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -39987,10 +41028,12 @@ public final class LayoutGraphicsProto {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + DEVICETYPE_FIELD_NUMBER;
       hash = (53 * hash) + deviceType_;
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId().hashCode();
+      hash = (37 * hash) + OLDID_FIELD_NUMBER;
+      hash = (53 * hash) + getOldid().hashCode();
       hash = (37 * hash) + DEVICEPORT_FIELD_NUMBER;
       hash = (53 * hash) + devicePort_;
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -40127,8 +41170,9 @@ public final class LayoutGraphicsProto {
         super.clear();
         bitField0_ = 0;
         deviceType_ = 0;
-        id_ = "";
+        oldid_ = "";
         devicePort_ = 0;
+        id_ = 0;
         return this;
       }
 
@@ -40166,11 +41210,14 @@ public final class LayoutGraphicsProto {
           result.deviceType_ = deviceType_;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.id_ = id_;
+          result.oldid_ = oldid_;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.devicePort_ = devicePort_;
         }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.id_ = id_;
+        }
       }
 
       @java.lang.Override
@@ -40188,14 +41235,17 @@ public final class LayoutGraphicsProto {
         if (other.deviceType_ != 0) {
           setDeviceTypeValue(other.getDeviceTypeValue());
         }
-        if (!other.getId().isEmpty()) {
-          id_ = other.id_;
+        if (!other.getOldid().isEmpty()) {
+          oldid_ = other.oldid_;
           bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.devicePort_ != 0) {
           setDevicePortValue(other.getDevicePortValue());
         }
+        if (other.getId() != 0) {
+          setId(other.getId());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -40228,7 +41278,7 @@ public final class LayoutGraphicsProto {
                 break;
               } // case 8
               case 18: {
-                id_ = input.readStringRequireUtf8();
+                oldid_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000002;
                 break;
               } // case 18
@@ -40237,6 +41287,11 @@ public final class LayoutGraphicsProto {
                 bitField0_ |= 0x00000004;
                 break;
               } // case 24
+              case 32: {
+                id_ = input.readUInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -40327,22 +41382,22 @@ public final class LayoutGraphicsProto {
         return this;
       }
 
-      private java.lang.Object id_ = "";
+      private java.lang.Object oldid_ = "";
       /**
        * <pre>
        *关联的设备ID
        * </pre>
        *
-       * <code>string id = 2;</code>
-       * @return The id.
+       * <code>string oldid = 2;</code>
+       * @return The oldid.
        */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
+      public java.lang.String getOldid() {
+        java.lang.Object ref = oldid_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          id_ = s;
+          oldid_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -40353,17 +41408,17 @@ public final class LayoutGraphicsProto {
        *关联的设备ID
        * </pre>
        *
-       * <code>string id = 2;</code>
-       * @return The bytes for id.
+       * <code>string oldid = 2;</code>
+       * @return The bytes for oldid.
        */
       public com.google.protobuf.ByteString
-          getIdBytes() {
-        java.lang.Object ref = id_;
+          getOldidBytes() {
+        java.lang.Object ref = oldid_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          id_ = b;
+          oldid_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
@@ -40374,14 +41429,14 @@ public final class LayoutGraphicsProto {
        *关联的设备ID
        * </pre>
        *
-       * <code>string id = 2;</code>
-       * @param value The id to set.
+       * <code>string oldid = 2;</code>
+       * @param value The oldid to set.
        * @return This builder for chaining.
        */
-      public Builder setId(
+      public Builder setOldid(
           java.lang.String value) {
         if (value == null) { throw new NullPointerException(); }
-        id_ = value;
+        oldid_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
         return this;
@@ -40391,11 +41446,11 @@ public final class LayoutGraphicsProto {
        *关联的设备ID
        * </pre>
        *
-       * <code>string id = 2;</code>
+       * <code>string oldid = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearId() {
-        id_ = getDefaultInstance().getId();
+      public Builder clearOldid() {
+        oldid_ = getDefaultInstance().getOldid();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -40405,15 +41460,15 @@ public final class LayoutGraphicsProto {
        *关联的设备ID
        * </pre>
        *
-       * <code>string id = 2;</code>
-       * @param value The bytes for id to set.
+       * <code>string oldid = 2;</code>
+       * @param value The bytes for oldid to set.
        * @return This builder for chaining.
        */
-      public Builder setIdBytes(
+      public Builder setOldidBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) { throw new NullPointerException(); }
         checkByteStringIsUtf8(value);
-        id_ = value;
+        oldid_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
         return this;
@@ -40491,6 +41546,38 @@ public final class LayoutGraphicsProto {
         onChanged();
         return this;
       }
+
+      private int id_ ;
+      /**
+       * <code>uint32 id = 4;</code>
+       * @return The id.
+       */
+      @java.lang.Override
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>uint32 id = 4;</code>
+       * @param value The id to set.
+       * @return This builder for chaining.
+       */
+      public Builder setId(int value) {
+
+        id_ = value;
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearId() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        id_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -41601,98 +42688,102 @@ public final class LayoutGraphicsProto {
       "Point\022\020\n\010rotation\030\003 \001(\002\022 \n\004skew\030\004 \001(\0132\022." +
       "graphicData.Point\"I\n\016ChildTransform\022\014\n\004n" +
       "ame\030\001 \001(\t\022)\n\ttransform\030\002 \001(\0132\026.graphicDa" +
-      "ta.Transform\"\216\001\n\nCommonInfo\022\n\n\002id\030\001 \001(\t\022" +
-      "\023\n\013graphicType\030\002 \001(\t\022)\n\ttransform\030\003 \001(\0132" +
-      "\026.graphicData.Transform\0224\n\017childTransfor" +
-      "ms\030\004 \003(\0132\033.graphicData.ChildTransform\"\255\001" +
-      "\n\004Link\022\'\n\006common\030\001 \001(\0132\027.graphicData.Com" +
-      "monInfo\022\014\n\004code\030\002 \001(\t\022\r\n\005curve\030\003 \001(\010\022\025\n\r" +
-      "segmentsCount\030\004 \001(\005\022\021\n\tlineWidth\030\005 \001(\005\022\021" +
-      "\n\tlineColor\030\006 \001(\t\022\"\n\006points\030\007 \003(\0132\022.grap" +
-      "hicData.Point\"\265\001\n\004Rect\022\'\n\006common\030\001 \001(\0132\027" +
-      ".graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\021\n" +
-      "\tlineWidth\030\003 \001(\005\022\021\n\tlineColor\030\004 \001(\t\022\r\n\005w" +
-      "idth\030\005 \001(\002\022\016\n\006height\030\006 \001(\002\022\016\n\006radius\030\007 \001" +
-      "(\005\022!\n\005point\030\010 \001(\0132\022.graphicData.Point\"\212\001" +
-      "\n\007Polygon\022\'\n\006common\030\001 \001(\0132\027.graphicData." +
-      "CommonInfo\022\014\n\004code\030\002 \001(\t\022\021\n\tlineWidth\030\003 " +
-      "\001(\005\022\021\n\tlineColor\030\004 \001(\t\022\"\n\006points\030\005 \003(\0132\022" +
-      ".graphicData.Point\"\233\001\n\010Platform\022\'\n\006commo" +
-      "n\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004code" +
-      "\030\002 \001(\t\022\017\n\007hasdoor\030\003 \001(\010\022\021\n\tdirection\030\004 \001" +
-      "(\t\022\022\n\nrefStation\030\006 \001(\t\022\n\n\002up\030\007 \001(\010\022\024\n\014re" +
-      "fSectionId\030\010 \001(\t\"\270\001\n\007Station\022\'\n\006common\030\001" +
-      " \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 " +
-      "\001(\t\022\022\n\nhasControl\030\003 \001(\010\022\035\n\025concentration" +
-      "Stations\030\004 \001(\010\0225\n\017kilometerSystem\030\006 \001(\0132" +
-      "\034.graphicData.KilometerSystem\022\014\n\004name\030\007 " +
-      "\001(\t\"\313\001\n\013StationLine\022\'\n\006common\030\001 \001(\0132\027.gr" +
-      "aphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\023\n\013ha" +
-      "sTransfer\030\003 \001(\010\022\020\n\010hideName\030\004 \001(\010\0228\n\tcod" +
-      "eColor\030\005 \001(\0162%.graphicData.StationLine.s" +
-      "tationColor\"$\n\014stationColor\022\n\n\006orange\020\000\022" +
-      "\010\n\004gray\020\001\"Y\n\013TrainWindow\022\'\n\006common\030\001 \001(\013" +
-      "2\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022" +
-      "\023\n\013refDeviceId\030\003 \003(\t\"\256\001\n\014AxleCounting\022\'\n" +
+      "ta.Transform\"\235\001\n\nCommonInfo\022\r\n\005oldid\030\001 \001" +
+      "(\t\022\023\n\013graphicType\030\002 \001(\t\022)\n\ttransform\030\003 \001" +
+      "(\0132\026.graphicData.Transform\0224\n\017childTrans" +
+      "forms\030\004 \003(\0132\033.graphicData.ChildTransform" +
+      "\022\n\n\002id\030\005 \001(\r\"\255\001\n\004Link\022\'\n\006common\030\001 \001(\0132\027." +
+      "graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\r\n\005" +
+      "curve\030\003 \001(\010\022\025\n\rsegmentsCount\030\004 \001(\005\022\021\n\tli" +
+      "neWidth\030\005 \001(\005\022\021\n\tlineColor\030\006 \001(\t\022\"\n\006poin" +
+      "ts\030\007 \003(\0132\022.graphicData.Point\"\265\001\n\004Rect\022\'\n" +
       "\006common\030\001 \001(\0132\027.graphicData.CommonInfo\022\014" +
-      "\n\004code\030\002 \001(\t\0225\n\017kilometerSystem\030\003 \001(\0132\034." +
-      "graphicData.KilometerSystem\0220\n\017axleCount" +
-      "ingRef\030\004 \003(\0132\027.graphicData.RelatedRef\">\n" +
-      "\005Train\022\'\n\006common\030\001 \001(\0132\027.graphicData.Com" +
-      "monInfo\022\014\n\004code\030\002 \001(\t\"B\n\tTrainLine\022\'\n\006co" +
-      "mmon\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004c" +
-      "ode\030\002 \001(\t\"@\n\007IscsFan\022\'\n\006common\030\001 \001(\0132\027.g" +
-      "raphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\"\333\002\n\007" +
-      "Turnout\022\'\n\006common\030\001 \001(\0132\027.graphicData.Co" +
-      "mmonInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006pointA\030\006 \003(\0132\022" +
-      ".graphicData.Point\022\"\n\006pointB\030\007 \003(\0132\022.gra" +
-      "phicData.Point\022\"\n\006pointC\030\010 \003(\0132\022.graphic" +
-      "Data.Point\022&\n\005paRef\030\t \001(\0132\027.graphicData." +
-      "RelatedRef\022&\n\005pbRef\030\n \001(\0132\027.graphicData." +
-      "RelatedRef\022&\n\005pcRef\030\013 \001(\0132\027.graphicData." +
-      "RelatedRef\0225\n\017kilometerSystem\030\r \003(\0132\034.gr" +
-      "aphicData.KilometerSystem\">\n\017KilometerSy" +
-      "stem\022\021\n\tkilometer\030\001 \001(\003\022\030\n\020coordinateSys" +
-      "tem\030\002 \001(\t\"\206\001\n\006Signal\022\'\n\006common\030\001 \001(\0132\027.g" +
-      "raphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\016\n\006m" +
-      "irror\030\003 \001(\010\0225\n\017kilometerSystem\030\006 \001(\0132\034.g" +
-      "raphicData.KilometerSystem\"\214\002\n\007RunLine\022\'" +
-      "\n\006common\030\001 \001(\0132\027.graphicData.CommonInfo\022" +
-      "\014\n\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicD" +
-      "ata.Point\022\021\n\tnameColor\030\004 \001(\t\022\023\n\013nameBgCo" +
-      "lor\030\005 \001(\t\022\022\n\ncontainSta\030\010 \003(\t\022\025\n\rlinkPat" +
-      "hLines\030\t \003(\t\022\016\n\006lineId\030\n \001(\t\022\027\n\017dashPoin" +
-      "tIndexs\030\013 \003(\005\022\027\n\017grayPointIndexs\030\014 \003(\005\022\021" +
-      "\n\tlineColor\030\r \001(\t\"\360\002\n\007Section\022\'\n\006common\030" +
-      "\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002" +
-      " \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Point" +
-      "\022&\n\005paRef\030\004 \001(\0132\027.graphicData.RelatedRef" +
-      "\022&\n\005pbRef\030\005 \001(\0132\027.graphicData.RelatedRef" +
-      "\0225\n\013sectionType\030\006 \001(\0162 .graphicData.Sect" +
-      "ion.SectionType\022\025\n\raxleCountings\030\007 \003(\t\022\020" +
-      "\n\010children\030\010 \003(\t\022\027\n\017destinationCode\030\t \001(" +
-      "\t\022\017\n\007turning\030\n \001(\010\"0\n\013SectionType\022\014\n\010Phy" +
-      "sical\020\000\022\023\n\017TurnoutPhysical\020\002\"i\n\014LogicSec" +
-      "tion\022\'\n\006common\030\001 \001(\0132\027.graphicData.Commo" +
-      "nInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.gr" +
-      "aphicData.Point\"V\n\016KilometerPoint\022!\n\005poi" +
-      "nt\030\001 \001(\0132\022.graphicData.Point\022\021\n\tkilomete" +
-      "r\030\002 \001(\003\022\016\n\006stName\030\003 \001(\t\"\277\001\n\010PathLine\022\'\n\006" +
-      "common\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n" +
-      "\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicDat" +
-      "a.Point\022\014\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoints" +
-      "\030\005 \003(\0132\033.graphicData.KilometerPoint\022\024\n\014i" +
-      "sKmIncrease\030\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndevi" +
-      "ceType\030\001 \001(\0162\".graphicData.RelatedRef.De" +
-      "viceType\022\n\n\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\016" +
-      "2\".graphicData.RelatedRef.DevicePort\"I\n\n" +
-      "DeviceType\022\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013" +
-      "TrainWindow\020\002\022\020\n\014AxleCounting\020\003\"!\n\nDevic" +
-      "ePort\022\005\n\001A\020\000\022\005\n\001B\020\001\022\005\n\001C\020\002\"Y\n\tSeparator\022" +
-      "\'\n\006common\030\001 \001(\0132\027.graphicData.CommonInfo" +
-      "\022\014\n\004code\030\002 \001(\t\022\025\n\rseparatorType\030\003 \001(\tB8\n" +
-      "!club.joylink.xiannccda.dto.protosB\023Layo" +
-      "utGraphicsProtob\006proto3"
+      "\n\004code\030\002 \001(\t\022\021\n\tlineWidth\030\003 \001(\005\022\021\n\tlineC" +
+      "olor\030\004 \001(\t\022\r\n\005width\030\005 \001(\002\022\016\n\006height\030\006 \001(" +
+      "\002\022\016\n\006radius\030\007 \001(\005\022!\n\005point\030\010 \001(\0132\022.graph" +
+      "icData.Point\"\212\001\n\007Polygon\022\'\n\006common\030\001 \001(\013" +
+      "2\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022" +
+      "\021\n\tlineWidth\030\003 \001(\005\022\021\n\tlineColor\030\004 \001(\t\022\"\n" +
+      "\006points\030\005 \003(\0132\022.graphicData.Point\"\313\001\n\010Pl" +
+      "atform\022\'\n\006common\030\001 \001(\0132\027.graphicData.Com" +
+      "monInfo\022\014\n\004code\030\002 \001(\t\022\017\n\007hasdoor\030\003 \001(\010\022\021" +
+      "\n\tdirection\030\004 \001(\t\022\025\n\roldrefStation\030\006 \001(\t" +
+      "\022\n\n\002up\030\007 \001(\010\022\027\n\017oldrefSectionId\030\010 \001(\t\022\022\n" +
+      "\nrefStation\030\t \001(\r\022\024\n\014refSectionId\030\n \001(\r\"" +
+      "\270\001\n\007Station\022\'\n\006common\030\001 \001(\0132\027.graphicDat" +
+      "a.CommonInfo\022\014\n\004code\030\002 \001(\t\022\022\n\nhasControl" +
+      "\030\003 \001(\010\022\035\n\025concentrationStations\030\004 \001(\010\0225\n" +
+      "\017kilometerSystem\030\006 \001(\0132\034.graphicData.Kil" +
+      "ometerSystem\022\014\n\004name\030\007 \001(\t\"\313\001\n\013StationLi" +
+      "ne\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonI" +
+      "nfo\022\014\n\004code\030\002 \001(\t\022\023\n\013hasTransfer\030\003 \001(\010\022\020" +
+      "\n\010hideName\030\004 \001(\010\0228\n\tcodeColor\030\005 \001(\0162%.gr" +
+      "aphicData.StationLine.stationColor\"$\n\014st" +
+      "ationColor\022\n\n\006orange\020\000\022\010\n\004gray\020\001\"q\n\013Trai" +
+      "nWindow\022\'\n\006common\030\001 \001(\0132\027.graphicData.Co" +
+      "mmonInfo\022\014\n\004code\030\002 \001(\t\022\026\n\016oldrefDeviceId" +
+      "\030\003 \003(\t\022\023\n\013refDeviceId\030\004 \003(\r\"\256\001\n\014AxleCoun" +
+      "ting\022\'\n\006common\030\001 \001(\0132\027.graphicData.Commo" +
+      "nInfo\022\014\n\004code\030\002 \001(\t\0225\n\017kilometerSystem\030\003" +
+      " \001(\0132\034.graphicData.KilometerSystem\0220\n\017ax" +
+      "leCountingRef\030\004 \003(\0132\027.graphicData.Relate" +
+      "dRef\">\n\005Train\022\'\n\006common\030\001 \001(\0132\027.graphicD" +
+      "ata.CommonInfo\022\014\n\004code\030\002 \001(\t\"B\n\tTrainLin" +
+      "e\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonIn" +
+      "fo\022\014\n\004code\030\002 \001(\t\"@\n\007IscsFan\022\'\n\006common\030\001 " +
+      "\001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001" +
+      "(\t\"\333\002\n\007Turnout\022\'\n\006common\030\001 \001(\0132\027.graphic" +
+      "Data.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006pointA\030" +
+      "\006 \003(\0132\022.graphicData.Point\022\"\n\006pointB\030\007 \003(" +
+      "\0132\022.graphicData.Point\022\"\n\006pointC\030\010 \003(\0132\022." +
+      "graphicData.Point\022&\n\005paRef\030\t \001(\0132\027.graph" +
+      "icData.RelatedRef\022&\n\005pbRef\030\n \001(\0132\027.graph" +
+      "icData.RelatedRef\022&\n\005pcRef\030\013 \001(\0132\027.graph" +
+      "icData.RelatedRef\0225\n\017kilometerSystem\030\r \003" +
+      "(\0132\034.graphicData.KilometerSystem\">\n\017Kilo" +
+      "meterSystem\022\021\n\tkilometer\030\001 \001(\003\022\030\n\020coordi" +
+      "nateSystem\030\002 \001(\t\"\206\001\n\006Signal\022\'\n\006common\030\001 " +
+      "\001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001" +
+      "(\t\022\016\n\006mirror\030\003 \001(\010\0225\n\017kilometerSystem\030\006 " +
+      "\001(\0132\034.graphicData.KilometerSystem\"\246\002\n\007Ru" +
+      "nLine\022\'\n\006common\030\001 \001(\0132\027.graphicData.Comm" +
+      "onInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.g" +
+      "raphicData.Point\022\021\n\tnameColor\030\004 \001(\t\022\023\n\013n" +
+      "ameBgColor\030\005 \001(\t\022\022\n\ncontainSta\030\010 \003(\t\022\030\n\020" +
+      "oldlinkPathLines\030\t \003(\t\022\016\n\006lineId\030\n \001(\t\022\027" +
+      "\n\017dashPointIndexs\030\013 \003(\005\022\027\n\017grayPointInde" +
+      "xs\030\014 \003(\005\022\021\n\tlineColor\030\r \001(\t\022\025\n\rlinkPathL" +
+      "ines\030\016 \003(\r\"\205\003\n\007Section\022\'\n\006common\030\001 \001(\0132\027" +
+      ".graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n" +
+      "\006points\030\003 \003(\0132\022.graphicData.Point\022&\n\005paR" +
+      "ef\030\004 \001(\0132\027.graphicData.RelatedRef\022&\n\005pbR" +
+      "ef\030\005 \001(\0132\027.graphicData.RelatedRef\0225\n\013sec" +
+      "tionType\030\006 \001(\0162 .graphicData.Section.Sec" +
+      "tionType\022\025\n\raxleCountings\030\007 \003(\t\022\023\n\013oldch" +
+      "ildren\030\010 \003(\t\022\027\n\017destinationCode\030\t \001(\t\022\017\n" +
+      "\007turning\030\n \001(\010\022\020\n\010children\030\013 \003(\r\"0\n\013Sect" +
+      "ionType\022\014\n\010Physical\020\000\022\023\n\017TurnoutPhysical" +
+      "\020\002\"i\n\014LogicSection\022\'\n\006common\030\001 \001(\0132\027.gra" +
+      "phicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006poi" +
+      "nts\030\003 \003(\0132\022.graphicData.Point\"V\n\016Kilomet" +
+      "erPoint\022!\n\005point\030\001 \001(\0132\022.graphicData.Poi" +
+      "nt\022\021\n\tkilometer\030\002 \001(\003\022\016\n\006stName\030\003 \001(\t\"\277\001" +
+      "\n\010PathLine\022\'\n\006common\030\001 \001(\0132\027.graphicData" +
+      ".CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(" +
+      "\0132\022.graphicData.Point\022\014\n\004isUp\030\004 \001(\010\0224\n\017k" +
+      "ilometerPoints\030\005 \003(\0132\033.graphicData.Kilom" +
+      "eterPoint\022\024\n\014isKmIncrease\030\006 \001(\010\"\205\002\n\nRela" +
+      "tedRef\0226\n\ndeviceType\030\001 \001(\0162\".graphicData" +
+      ".RelatedRef.DeviceType\022\r\n\005oldid\030\002 \001(\t\0226\n" +
+      "\ndevicePort\030\003 \001(\0162\".graphicData.RelatedR" +
+      "ef.DevicePort\022\n\n\002id\030\004 \001(\r\"I\n\nDeviceType\022" +
+      "\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013TrainWindow" +
+      "\020\002\022\020\n\014AxleCounting\020\003\"!\n\nDevicePort\022\005\n\001A\020" +
+      "\000\022\005\n\001B\020\001\022\005\n\001C\020\002\"Y\n\tSeparator\022\'\n\006common\030\001" +
+      " \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 " +
+      "\001(\t\022\025\n\rseparatorType\030\003 \001(\tB8\n!club.joyli" +
+      "nk.xiannccda.dto.protosB\023LayoutGraphicsP" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -41733,7 +42824,7 @@ public final class LayoutGraphicsProto {
     internal_static_graphicData_CommonInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_CommonInfo_descriptor,
-        new java.lang.String[] { "Id", "GraphicType", "Transform", "ChildTransforms", });
+        new java.lang.String[] { "Oldid", "GraphicType", "Transform", "ChildTransforms", "Id", });
     internal_static_graphicData_Link_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_graphicData_Link_fieldAccessorTable = new
@@ -41757,7 +42848,7 @@ public final class LayoutGraphicsProto {
     internal_static_graphicData_Platform_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_Platform_descriptor,
-        new java.lang.String[] { "Common", "Code", "Hasdoor", "Direction", "RefStation", "Up", "RefSectionId", });
+        new java.lang.String[] { "Common", "Code", "Hasdoor", "Direction", "OldrefStation", "Up", "OldrefSectionId", "RefStation", "RefSectionId", });
     internal_static_graphicData_Station_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_graphicData_Station_fieldAccessorTable = new
@@ -41775,7 +42866,7 @@ public final class LayoutGraphicsProto {
     internal_static_graphicData_TrainWindow_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_TrainWindow_descriptor,
-        new java.lang.String[] { "Common", "Code", "RefDeviceId", });
+        new java.lang.String[] { "Common", "Code", "OldrefDeviceId", "RefDeviceId", });
     internal_static_graphicData_AxleCounting_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_graphicData_AxleCounting_fieldAccessorTable = new
@@ -41823,13 +42914,13 @@ public final class LayoutGraphicsProto {
     internal_static_graphicData_RunLine_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_RunLine_descriptor,
-        new java.lang.String[] { "Common", "Code", "Points", "NameColor", "NameBgColor", "ContainSta", "LinkPathLines", "LineId", "DashPointIndexs", "GrayPointIndexs", "LineColor", });
+        new java.lang.String[] { "Common", "Code", "Points", "NameColor", "NameBgColor", "ContainSta", "OldlinkPathLines", "LineId", "DashPointIndexs", "GrayPointIndexs", "LineColor", "LinkPathLines", });
     internal_static_graphicData_Section_descriptor =
       getDescriptor().getMessageTypes().get(21);
     internal_static_graphicData_Section_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_Section_descriptor,
-        new java.lang.String[] { "Common", "Code", "Points", "PaRef", "PbRef", "SectionType", "AxleCountings", "Children", "DestinationCode", "Turning", });
+        new java.lang.String[] { "Common", "Code", "Points", "PaRef", "PbRef", "SectionType", "AxleCountings", "Oldchildren", "DestinationCode", "Turning", "Children", });
     internal_static_graphicData_LogicSection_descriptor =
       getDescriptor().getMessageTypes().get(22);
     internal_static_graphicData_LogicSection_fieldAccessorTable = new
@@ -41853,7 +42944,7 @@ public final class LayoutGraphicsProto {
     internal_static_graphicData_RelatedRef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_graphicData_RelatedRef_descriptor,
-        new java.lang.String[] { "DeviceType", "Id", "DevicePort", });
+        new java.lang.String[] { "DeviceType", "Oldid", "DevicePort", "Id", });
     internal_static_graphicData_Separator_descriptor =
       getDescriptor().getMessageTypes().get(26);
     internal_static_graphicData_Separator_fieldAccessorTable = new
diff --git a/src/main/java/club/joylink/xiannccda/service/AlertInfoService.java b/src/main/java/club/joylink/xiannccda/service/AlertInfoService.java
index 9a7a202..ab29435 100644
--- a/src/main/java/club/joylink/xiannccda/service/AlertInfoService.java
+++ b/src/main/java/club/joylink/xiannccda/service/AlertInfoService.java
@@ -36,17 +36,17 @@ public class AlertInfoService {
   }
 
 
-  public NccAlertInfo createAlert(AlertType alertType, AlertDeviceType areaDeviceType, String layoutId, MessageOrBuilder mb, String alertMsg, AlertDeviceType deviceType, boolean mockData) {
+  public NccAlertInfo createAlert(AlertType alertType, AlertDeviceType areaDeviceType, Integer layoutId, MessageOrBuilder mb, String alertMsg, AlertDeviceType deviceType, boolean mockData) {
     Integer lineId = DeviceStatusDataOperate.findFieldVal(mb, "lineId", Integer.class);
     Optional<AreaConfigVO> areaConfigOptional = this.findAreaDevice(alertType, areaDeviceType, layoutId, lineId);
-    return this.createAlert2(areaConfigOptional, alertType, mb, alertMsg, layoutId, deviceType, mockData);
+    return this.createAlert2(areaConfigOptional, alertType, mb, alertMsg, layoutId.toString(), deviceType, mockData);
   }
 
-  public NccAlertInfo createAlert2(Long areaConfigId, AlertType alertType, MessageOrBuilder mb, String alertMsg, String layoutId, AlertDeviceType deviceType, boolean mockData) {
+  public NccAlertInfo createAlert2(Long areaConfigId, AlertType alertType, MessageOrBuilder mb, String alertMsg, Integer layoutId, AlertDeviceType deviceType, boolean mockData) {
     Long timestamp = DeviceStatusDataOperate.findFieldVal(mb, "timestamp", Long.class);
     Integer lineId = DeviceStatusDataOperate.findFieldVal(mb, "lineId", Integer.class);
     LocalDateTime createTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(timestamp), ZoneId.of("+8"));
-    return this.createAlert2(areaConfigId, alertType, lineId, createTime, alertMsg, layoutId, deviceType, mockData);
+    return this.createAlert2(areaConfigId, alertType, lineId, createTime, alertMsg, layoutId.toString(), deviceType, mockData);
   }
 
   public NccAlertInfo createAlert2(Long areaConfigId, AlertType alertType, Integer lineId, LocalDateTime localDateTime, String alertMsg, String layoutId, AlertDeviceType deviceType,
@@ -64,12 +64,12 @@ public class AlertInfoService {
   }
 
 
-  public Optional<AreaConfigVO> findAreaDevice(AlertType alertType, AlertDeviceType dt, String layoutId, int lineId) {
+  public Optional<AreaConfigVO> findAreaDevice(AlertType alertType, AlertDeviceType dt, Integer layoutId, int lineId) {
     List<AreaConfigVO> areaConfigList = this.findDevice2(alertType, dt, lineId);
     return this.findAreaDevice(areaConfigList, layoutId);
   }
 
-  private Optional<AreaConfigVO> findAreaDevice(List<AreaConfigVO> areaConfigList, String layoutId) {
+  private Optional<AreaConfigVO> findAreaDevice(List<AreaConfigVO> areaConfigList, Integer layoutId) {
     if (CollectionUtils.isEmpty(areaConfigList)) {
       //TODO
       return Optional.empty();
diff --git a/src/main/java/club/joylink/xiannccda/service/AlertRecordService.java b/src/main/java/club/joylink/xiannccda/service/AlertRecordService.java
index d56482a..db8a88b 100644
--- a/src/main/java/club/joylink/xiannccda/service/AlertRecordService.java
+++ b/src/main/java/club/joylink/xiannccda/service/AlertRecordService.java
@@ -74,7 +74,7 @@ public class AlertRecordService {
       }*/
       case BLUE_DISPLAY, AXLE_LED_RED, AXLE_LED_ORANGE, SWITCH_DW_LOST, SWITCH_FW_LOST, TRAIN_EB_ATP,
           SWITCH_All_LOST/*, AXLE_LED_ORANGE_MOST, AXLE_LED_RED_MOST, AXLE_LED_ORANGE_INTERLOCK_AREA, AXLE_LED_RED_INTERLOCK_AREA*/ -> {
-        Optional<AreaConfigVO> areaConfigVOOptional = this.alertInfoService.findAreaDevice(alertType, AlertDeviceType.valueOf(ar.getAlertDeviceType()), deviceId, ar.getLineId());
+        Optional<AreaConfigVO> areaConfigVOOptional = this.alertInfoService.findAreaDevice(alertType, AlertDeviceType.valueOf(ar.getAlertDeviceType()), Integer.parseInt(deviceId), ar.getLineId());
         log.info("告警数据确认区域线路[{}] 记录id[{}] ", ar.getLineId(), ar.getId());
         return areaConfigVOOptional.map(AreaConfigVO::getId).orElse(null);
 
diff --git a/src/main/java/club/joylink/xiannccda/vo/AreaConfigVO.java b/src/main/java/club/joylink/xiannccda/vo/AreaConfigVO.java
index bbb405d..e341433 100644
--- a/src/main/java/club/joylink/xiannccda/vo/AreaConfigVO.java
+++ b/src/main/java/club/joylink/xiannccda/vo/AreaConfigVO.java
@@ -24,7 +24,7 @@ public class AreaConfigVO {
     if (StringUtils.isNotEmpty(areaConfig.getData())) {
       List<String> tmpList = Splitter.on(StringPool.COMMA).omitEmptyStrings().splitToList(areaConfig.getData());
       if (CollectionUtils.isNotEmpty(tmpList)) {
-        this.datas = new String[tmpList.size()];
+        this.datas = new Integer[tmpList.size()];
         tmpList.toArray(this.datas);
         Arrays.sort(this.datas);
       }
@@ -36,7 +36,7 @@ public class AreaConfigVO {
 
 
   private Long id;
-  private String[] datas;
+  private Integer[] datas;
   private String areaName;
   private AlertDeviceType deviceType;
   private List<String> alertTypes;
@@ -48,7 +48,7 @@ public class AreaConfigVO {
     return this.alertTypes.contains(alertType);
   }
 
-  public int findDataIndex(String deviceId) {
+  public int findDataIndex(Integer deviceId) {
     if (ArrayUtils.isEmpty(this.datas)) {
       return -1;
     }