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 b7e4391..82837e7 100644 --- a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java +++ b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java @@ -19,21 +19,15 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -/** - * 发布时缓存在内存中的线路数据 - */ +/** 发布时缓存在内存中的线路数据 */ @Slf4j public class LineGraphicDataRepository { - /** - * 线路数据信息 - */ + /** 线路数据信息 */ private static final Map>> lineGraphMap = new ConcurrentHashMap<>(); - /** - * 线路各坐标系转换关系 - */ + /** 线路各坐标系转换关系 */ private static final Map> lineCoordinateMain = new HashMap<>(); @@ -65,7 +59,7 @@ public class LineGraphicDataRepository { /** * 获取线路上区段名为【sectionName】的公里标 * - * @param lineId 线路ID + * @param lineId 线路ID * @param sectionName 区段名称 * @return 公里标 */ @@ -91,9 +85,7 @@ public class LineGraphicDataRepository { return List.of(); } - /** - * 删除线路绘图数据 - */ + /** 删除线路绘图数据 */ public static void removeLineGraph(Integer id) { lineGraphMap.remove(id); } @@ -101,7 +93,7 @@ public class LineGraphicDataRepository { /** * 构建程序中的区段信息 * - * @param lineId 线路ID + * @param lineId 线路ID * @param dataMap 缓存数据 * @param storage 地图构建数据 */ @@ -121,7 +113,8 @@ public class LineGraphicDataRepository { ? (DeviceInfoProto.Section.Builder) cacheSectionMap.get(sid) : DeviceInfoProto.Section.newBuilder().setId(sid); sectionBuilder.setCode(section.getCode()); - sectionBuilder.setType(section.getSectionType()); + // 暂时先注释，等数据正确后再做处理 + // sectionBuilder.setType(section.getSectionType()); cacheSectionMap.put(sid, sectionBuilder); }); dataMap.put(DeviceType.Section.name(), cacheSectionMap); @@ -130,7 +123,7 @@ public class LineGraphicDataRepository { /** * 构建道岔信息 * - * @param lineId 线路ID + * @param lineId 线路ID * @param dataMap 缓存数据 * @param storage 地图构建数据 */ @@ -181,7 +174,7 @@ public class LineGraphicDataRepository { /** * 设置公里标 * - * @param lineId 线路ID + * @param lineId 线路ID * @param dataMap 缓存数据 * @param storage 地图构建数据 */ @@ -232,7 +225,7 @@ public class LineGraphicDataRepository { /** * 初始化坐标转换对象 * - * @param lineId 线路ID + * @param lineId 线路ID * @param dataMap 设备集合 * @param storage 地图信息 */ @@ -324,9 +317,7 @@ public class LineGraphicDataRepository { return convertorMap.get(convertorKey).convertorKilometer(kilometer, CoordinateEnum.MAIN_LINE); } - /** - * 坐标系枚举 - */ + /** 坐标系枚举 */ @Getter private enum CoordinateEnum { MAIN_LINE("MAIN_LINE", List.of("YDK", "ZDK", "XDK", "SDK")), @@ -371,9 +362,7 @@ public class LineGraphicDataRepository { } } - /** - * 坐标转换对象 - */ + /** 坐标转换对象 */ @Getter private static class CoordinateConvertor { @@ -388,8 +377,8 @@ public class LineGraphicDataRepository { /** * 生成坐标转换对象 * - * @param configSystem 原配置坐标系信息 - * @param convertorSystem 转换坐标系类型 + * @param configSystem 原配置坐标系信息 + * @param convertorSystem 转换坐标系类型 * @param convertorCoordinate 转换坐标 * @return 转换对象 */ @@ -441,7 +430,7 @@ public class LineGraphicDataRepository { * 将出入库公里标转换为正线标 * * @param basisKilometer 出入库基准公里标 - * @param targetType 目标坐标系 + * @param targetType 目标坐标系 * @return 正线公里标数字 */ public long convertorKilometer(KilometerSystem basisKilometer, CoordinateEnum targetType) { diff --git a/src/main/java/club/joylink/xiannccda/controller/PublishedGiController.java b/src/main/java/club/joylink/xiannccda/controller/PublishedGiController.java index ba5e84d..c1eb775 100644 --- a/src/main/java/club/joylink/xiannccda/controller/PublishedGiController.java +++ b/src/main/java/club/joylink/xiannccda/controller/PublishedGiController.java @@ -1,6 +1,5 @@ package club.joylink.xiannccda.controller; -import club.joylink.xiannccda.ats.cache.LineGraphicDataRepository; import club.joylink.xiannccda.dto.PublishedGIDTO; import club.joylink.xiannccda.dto.PublishedGIDTO.LineType; import club.joylink.xiannccda.dto.PublishedGIQueryDTO; 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 c09798f..77c4791 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java @@ -440,6 +440,30 @@ public final class LayoutGraphicsProto { */ club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.SeparatorOrBuilder getSeparatorsOrBuilder( int index); + + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + java.util.List + getLogicSectionsList(); + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getLogicSections(int index); + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + int getLogicSectionsCount(); + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + java.util.List + getLogicSectionsOrBuilderList(); + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder getLogicSectionsOrBuilder( + int index); } /** * Protobuf type {@code graphicData.RtssGraphicStorage} @@ -471,6 +495,7 @@ public final class LayoutGraphicsProto { trainWindows_ = java.util.Collections.emptyList(); axleCountings_ = java.util.Collections.emptyList(); separators_ = java.util.Collections.emptyList(); + logicSections_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -1216,6 +1241,47 @@ public final class LayoutGraphicsProto { return separators_.get(index); } + public static final int LOGICSECTIONS_FIELD_NUMBER = 19; + @SuppressWarnings("serial") + private java.util.List logicSections_; + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + @java.lang.Override + public java.util.List getLogicSectionsList() { + return logicSections_; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + @java.lang.Override + public java.util.List + getLogicSectionsOrBuilderList() { + return logicSections_; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + @java.lang.Override + public int getLogicSectionsCount() { + return logicSections_.size(); + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getLogicSections(int index) { + return logicSections_.get(index); + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder getLogicSectionsOrBuilder( + int index) { + return logicSections_.get(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -1284,6 +1350,9 @@ public final class LayoutGraphicsProto { for (int i = 0; i < separators_.size(); i++) { output.writeMessage(18, separators_.get(i)); } + for (int i = 0; i < logicSections_.size(); i++) { + output.writeMessage(19, logicSections_.get(i)); + } getUnknownFields().writeTo(output); } @@ -1365,6 +1434,10 @@ public final class LayoutGraphicsProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(18, separators_.get(i)); } + for (int i = 0; i < logicSections_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(19, logicSections_.get(i)); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -1419,6 +1492,8 @@ public final class LayoutGraphicsProto { .equals(other.getAxleCountingsList())) return false; if (!getSeparatorsList() .equals(other.getSeparatorsList())) return false; + if (!getLogicSectionsList() + .equals(other.getLogicSectionsList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1502,6 +1577,10 @@ public final class LayoutGraphicsProto { hash = (37 * hash) + SEPARATORS_FIELD_NUMBER; hash = (53 * hash) + getSeparatorsList().hashCode(); } + if (getLogicSectionsCount() > 0) { + hash = (37 * hash) + LOGICSECTIONS_FIELD_NUMBER; + hash = (53 * hash) + getLogicSectionsList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -1757,6 +1836,13 @@ public final class LayoutGraphicsProto { separatorsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00020000); + if (logicSectionsBuilder_ == null) { + logicSections_ = java.util.Collections.emptyList(); + } else { + logicSections_ = null; + logicSectionsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00040000); return this; } @@ -1943,6 +2029,15 @@ public final class LayoutGraphicsProto { } else { result.separators_ = separatorsBuilder_.build(); } + if (logicSectionsBuilder_ == null) { + if (((bitField0_ & 0x00040000) != 0)) { + logicSections_ = java.util.Collections.unmodifiableList(logicSections_); + bitField0_ = (bitField0_ & ~0x00040000); + } + result.logicSections_ = logicSections_; + } else { + result.logicSections_ = logicSectionsBuilder_.build(); + } } private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RtssGraphicStorage result) { @@ -2411,6 +2506,32 @@ public final class LayoutGraphicsProto { } } } + if (logicSectionsBuilder_ == null) { + if (!other.logicSections_.isEmpty()) { + if (logicSections_.isEmpty()) { + logicSections_ = other.logicSections_; + bitField0_ = (bitField0_ & ~0x00040000); + } else { + ensureLogicSectionsIsMutable(); + logicSections_.addAll(other.logicSections_); + } + onChanged(); + } + } else { + if (!other.logicSections_.isEmpty()) { + if (logicSectionsBuilder_.isEmpty()) { + logicSectionsBuilder_.dispose(); + logicSectionsBuilder_ = null; + logicSections_ = other.logicSections_; + bitField0_ = (bitField0_ & ~0x00040000); + logicSectionsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getLogicSectionsFieldBuilder() : null; + } else { + logicSectionsBuilder_.addAllMessages(other.logicSections_); + } + } + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -2665,6 +2786,19 @@ public final class LayoutGraphicsProto { } break; } // case 146 + case 154: { + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection m = + input.readMessage( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.parser(), + extensionRegistry); + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + logicSections_.add(m); + } else { + logicSectionsBuilder_.addMessage(m); + } + break; + } // case 154 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -6880,6 +7014,246 @@ public final class LayoutGraphicsProto { } return separatorsBuilder_; } + + private java.util.List logicSections_ = + java.util.Collections.emptyList(); + private void ensureLogicSectionsIsMutable() { + if (!((bitField0_ & 0x00040000) != 0)) { + logicSections_ = new java.util.ArrayList(logicSections_); + bitField0_ |= 0x00040000; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder> logicSectionsBuilder_; + + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public java.util.List getLogicSectionsList() { + if (logicSectionsBuilder_ == null) { + return java.util.Collections.unmodifiableList(logicSections_); + } else { + return logicSectionsBuilder_.getMessageList(); + } + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public int getLogicSectionsCount() { + if (logicSectionsBuilder_ == null) { + return logicSections_.size(); + } else { + return logicSectionsBuilder_.getCount(); + } + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getLogicSections(int index) { + if (logicSectionsBuilder_ == null) { + return logicSections_.get(index); + } else { + return logicSectionsBuilder_.getMessage(index); + } + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder setLogicSections( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection value) { + if (logicSectionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicSectionsIsMutable(); + logicSections_.set(index, value); + onChanged(); + } else { + logicSectionsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder setLogicSections( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder builderForValue) { + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + logicSections_.set(index, builderForValue.build()); + onChanged(); + } else { + logicSectionsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder addLogicSections(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection value) { + if (logicSectionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicSectionsIsMutable(); + logicSections_.add(value); + onChanged(); + } else { + logicSectionsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder addLogicSections( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection value) { + if (logicSectionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicSectionsIsMutable(); + logicSections_.add(index, value); + onChanged(); + } else { + logicSectionsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder addLogicSections( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder builderForValue) { + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + logicSections_.add(builderForValue.build()); + onChanged(); + } else { + logicSectionsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder addLogicSections( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder builderForValue) { + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + logicSections_.add(index, builderForValue.build()); + onChanged(); + } else { + logicSectionsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder addAllLogicSections( + java.lang.Iterable values) { + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, logicSections_); + onChanged(); + } else { + logicSectionsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder clearLogicSections() { + if (logicSectionsBuilder_ == null) { + logicSections_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00040000); + onChanged(); + } else { + logicSectionsBuilder_.clear(); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public Builder removeLogicSections(int index) { + if (logicSectionsBuilder_ == null) { + ensureLogicSectionsIsMutable(); + logicSections_.remove(index); + onChanged(); + } else { + logicSectionsBuilder_.remove(index); + } + return this; + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder getLogicSectionsBuilder( + int index) { + return getLogicSectionsFieldBuilder().getBuilder(index); + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder getLogicSectionsOrBuilder( + int index) { + if (logicSectionsBuilder_ == null) { + return logicSections_.get(index); } else { + return logicSectionsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public java.util.List + getLogicSectionsOrBuilderList() { + if (logicSectionsBuilder_ != null) { + return logicSectionsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(logicSections_); + } + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder addLogicSectionsBuilder() { + return getLogicSectionsFieldBuilder().addBuilder( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.getDefaultInstance()); + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder addLogicSectionsBuilder( + int index) { + return getLogicSectionsFieldBuilder().addBuilder( + index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.getDefaultInstance()); + } + /** + * repeated .graphicData.LogicSection logicSections = 19; + */ + public java.util.List + getLogicSectionsBuilderList() { + return getLogicSectionsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder> + getLogicSectionsFieldBuilder() { + if (logicSectionsBuilder_ == null) { + logicSectionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder>( + logicSections_, + ((bitField0_ & 0x00040000) != 0), + getParentForChildren(), + isClean()); + logicSections_ = null; + } + return logicSectionsBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -19554,16 +19928,45 @@ public final class LayoutGraphicsProto { getCodeBytes(); /** - * string sectionId = 3; - * @return The sectionId. + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @return A list containing the refDeviceId. */ - java.lang.String getSectionId(); + java.util.List + getRefDeviceIdList(); /** - * string sectionId = 3; - * @return The bytes for sectionId. + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @return The count of refDeviceId. + */ + int getRefDeviceIdCount(); + /** + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @param index The index of the element to return. + * @return The refDeviceId at the given index. + */ + java.lang.String getRefDeviceId(int index); + /** + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @param index The index of the value to return. + * @return The bytes of the refDeviceId at the given index. */ com.google.protobuf.ByteString - getSectionIdBytes(); + getRefDeviceIdBytes(int index); } /** * Protobuf type {@code graphicData.TrainWindow} @@ -19579,7 +19982,8 @@ public final class LayoutGraphicsProto { } private TrainWindow() { code_ = ""; - sectionId_ = ""; + refDeviceId_ = + com.google.protobuf.LazyStringArrayList.emptyList(); } @java.lang.Override @@ -19667,43 +20071,57 @@ public final class LayoutGraphicsProto { } } - public static final int SECTIONID_FIELD_NUMBER = 3; + public static final int REFDEVICEID_FIELD_NUMBER = 3; @SuppressWarnings("serial") - private volatile java.lang.Object sectionId_ = ""; + private com.google.protobuf.LazyStringArrayList refDeviceId_ = + com.google.protobuf.LazyStringArrayList.emptyList(); /** - * string sectionId = 3; - * @return The sectionId. + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @return A list containing the refDeviceId. */ - @java.lang.Override - public java.lang.String getSectionId() { - java.lang.Object ref = sectionId_; - 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(); - sectionId_ = s; - return s; - } + public com.google.protobuf.ProtocolStringList + getRefDeviceIdList() { + return refDeviceId_; } /** - * string sectionId = 3; - * @return The bytes for sectionId. + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @return The count of refDeviceId. + */ + public int getRefDeviceIdCount() { + return refDeviceId_.size(); + } + /** + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @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); + } + /** + * 
+     *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+     *
+ * + * repeated string refDeviceId = 3; + * @param index The index of the value to return. + * @return The bytes of the refDeviceId at the given index. */ - @java.lang.Override public com.google.protobuf.ByteString - getSectionIdBytes() { - java.lang.Object ref = sectionId_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - sectionId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + getRefDeviceIdBytes(int index) { + return refDeviceId_.getByteString(index); } private byte memoizedIsInitialized = -1; @@ -19726,8 +20144,8 @@ public final class LayoutGraphicsProto { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sectionId_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, sectionId_); + for (int i = 0; i < refDeviceId_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, refDeviceId_.getRaw(i)); } getUnknownFields().writeTo(output); } @@ -19745,8 +20163,13 @@ public final class LayoutGraphicsProto { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sectionId_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, sectionId_); + { + int dataSize = 0; + for (int i = 0; i < refDeviceId_.size(); i++) { + dataSize += computeStringSizeNoTag(refDeviceId_.getRaw(i)); + } + size += dataSize; + size += 1 * getRefDeviceIdList().size(); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -19770,8 +20193,8 @@ public final class LayoutGraphicsProto { } if (!getCode() .equals(other.getCode())) return false; - if (!getSectionId() - .equals(other.getSectionId())) return false; + if (!getRefDeviceIdList() + .equals(other.getRefDeviceIdList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -19789,8 +20212,10 @@ public final class LayoutGraphicsProto { } hash = (37 * hash) + CODE_FIELD_NUMBER; hash = (53 * hash) + getCode().hashCode(); - hash = (37 * hash) + SECTIONID_FIELD_NUMBER; - hash = (53 * hash) + getSectionId().hashCode(); + if (getRefDeviceIdCount() > 0) { + hash = (37 * hash) + REFDEVICEID_FIELD_NUMBER; + hash = (53 * hash) + getRefDeviceIdList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -19928,7 +20353,8 @@ public final class LayoutGraphicsProto { commonBuilder_ = null; } code_ = ""; - sectionId_ = ""; + refDeviceId_ = + com.google.protobuf.LazyStringArrayList.emptyList(); return this; } @@ -19971,7 +20397,8 @@ public final class LayoutGraphicsProto { result.code_ = code_; } if (((from_bitField0_ & 0x00000004) != 0)) { - result.sectionId_ = sectionId_; + refDeviceId_.makeImmutable(); + result.refDeviceId_ = refDeviceId_; } } @@ -19995,9 +20422,14 @@ public final class LayoutGraphicsProto { bitField0_ |= 0x00000002; onChanged(); } - if (!other.getSectionId().isEmpty()) { - sectionId_ = other.sectionId_; - bitField0_ |= 0x00000004; + if (!other.refDeviceId_.isEmpty()) { + if (refDeviceId_.isEmpty()) { + refDeviceId_ = other.refDeviceId_; + bitField0_ |= 0x00000004; + } else { + ensureRefDeviceIdIsMutable(); + refDeviceId_.addAll(other.refDeviceId_); + } onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -20039,8 +20471,9 @@ public final class LayoutGraphicsProto { break; } // case 18 case 26: { - sectionId_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; + java.lang.String s = input.readStringRequireUtf8(); + ensureRefDeviceIdIsMutable(); + refDeviceId_.add(s); break; } // case 26 default: { @@ -20251,73 +20684,148 @@ public final class LayoutGraphicsProto { return this; } - private java.lang.Object sectionId_ = ""; - /** - * string sectionId = 3; - * @return The sectionId. - */ - public java.lang.String getSectionId() { - java.lang.Object ref = sectionId_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - sectionId_ = s; - return s; - } else { - return (java.lang.String) ref; + private com.google.protobuf.LazyStringArrayList refDeviceId_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + private void ensureRefDeviceIdIsMutable() { + if (!refDeviceId_.isModifiable()) { + refDeviceId_ = new com.google.protobuf.LazyStringArrayList(refDeviceId_); } + bitField0_ |= 0x00000004; } /** - * string sectionId = 3; - * @return The bytes for sectionId. + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @return A list containing the refDeviceId. + */ + public com.google.protobuf.ProtocolStringList + getRefDeviceIdList() { + refDeviceId_.makeImmutable(); + return refDeviceId_; + } + /** + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @return The count of refDeviceId. + */ + public int getRefDeviceIdCount() { + return refDeviceId_.size(); + } + /** + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @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); + } + /** + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @param index The index of the value to return. + * @return The bytes of the refDeviceId at the given index. */ public com.google.protobuf.ByteString - getSectionIdBytes() { - java.lang.Object ref = sectionId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - sectionId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + getRefDeviceIdBytes(int index) { + return refDeviceId_.getByteString(index); } /** - * string sectionId = 3; - * @param value The sectionId to set. + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @param index The index to set the value at. + * @param value The refDeviceId to set. * @return This builder for chaining. */ - public Builder setSectionId( - java.lang.String value) { + public Builder setRefDeviceId( + int index, java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sectionId_ = value; + ensureRefDeviceIdIsMutable(); + refDeviceId_.set(index, value); bitField0_ |= 0x00000004; onChanged(); return this; } /** - * string sectionId = 3; + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @param value The refDeviceId to add. * @return This builder for chaining. */ - public Builder clearSectionId() { - sectionId_ = getDefaultInstance().getSectionId(); - bitField0_ = (bitField0_ & ~0x00000004); + public Builder addRefDeviceId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + ensureRefDeviceIdIsMutable(); + refDeviceId_.add(value); + bitField0_ |= 0x00000004; onChanged(); return this; } /** - * string sectionId = 3; - * @param value The bytes for sectionId to set. + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @param values The refDeviceId to add. * @return This builder for chaining. */ - public Builder setSectionIdBytes( + public Builder addAllRefDeviceId( + java.lang.Iterable values) { + ensureRefDeviceIdIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, refDeviceId_); + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @return This builder for chaining. + */ + public Builder clearRefDeviceId() { + refDeviceId_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004);; + onChanged(); + return this; + } + /** + * 
+       *关联的逻辑区段的id或由道岔区段生成所关联的道岔id
+       *
+ * + * repeated string refDeviceId = 3; + * @param value The bytes of the refDeviceId to add. + * @return This builder for chaining. + */ + public Builder addRefDeviceIdBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sectionId_ = value; + ensureRefDeviceIdIsMutable(); + refDeviceId_.add(value); bitField0_ |= 0x00000004; onChanged(); return this; @@ -31189,7 +31697,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31198,7 +31706,7 @@ public final class LayoutGraphicsProto { boolean hasPaRef(); /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31207,7 +31715,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPaRef(); /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31216,7 +31724,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31225,7 +31733,7 @@ public final class LayoutGraphicsProto { boolean hasPbRef(); /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31234,7 +31742,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPbRef(); /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31262,7 +31770,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31272,7 +31780,7 @@ public final class LayoutGraphicsProto { getAxleCountingsList(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31281,7 +31789,7 @@ public final class LayoutGraphicsProto { int getAxleCountingsCount(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31291,7 +31799,7 @@ public final class LayoutGraphicsProto { java.lang.String getAxleCountings(int index); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31300,8 +31808,73 @@ public final class LayoutGraphicsProto { */ com.google.protobuf.ByteString getAxleCountingsBytes(int index); + + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @return A list containing the children. + */ + java.util.List + getChildrenList(); + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @return The count of children. + */ + int getChildrenCount(); + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @param index The index of the element to return. + * @return The children at the given index. + */ + java.lang.String getChildren(int index); + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @param index The index of the value to return. + * @return The bytes of the children at the given index. + */ + com.google.protobuf.ByteString + getChildrenBytes(int index); + + /** + * 
+     * 目的地码
+     *
+ * + * string destinationCode = 9; + * @return The destinationCode. + */ + java.lang.String getDestinationCode(); + /** + * 
+     * 目的地码
+     *
+ * + * string destinationCode = 9; + * @return The bytes for destinationCode. + */ + com.google.protobuf.ByteString + getDestinationCodeBytes(); } /** + * 
+   ** 物理区段 
+   *
+ * * Protobuf type {@code graphicData.Section} */ public static final class Section extends @@ -31319,6 +31892,9 @@ public final class LayoutGraphicsProto { sectionType_ = 0; axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); + children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + destinationCode_ = ""; } @java.lang.Override @@ -31347,14 +31923,18 @@ public final class LayoutGraphicsProto { public enum SectionType implements com.google.protobuf.ProtocolMessageEnum { /** + * 
+       *物理区段
+       *
+ * * Physical = 0; */ Physical(0), /** - * Logic = 1; - */ - Logic(1), - /** + * 
+       *道岔物理区段
+       *
+ * * TurnoutPhysical = 2; */ TurnoutPhysical(2), @@ -31362,14 +31942,18 @@ public final class LayoutGraphicsProto { ; /** + * 
+       *物理区段
+       *
+ * * Physical = 0; */ public static final int Physical_VALUE = 0; /** - * Logic = 1; - */ - public static final int Logic_VALUE = 1; - /** + * 
+       *道岔物理区段
+       *
+ * * TurnoutPhysical = 2; */ public static final int TurnoutPhysical_VALUE = 2; @@ -31400,7 +31984,6 @@ public final class LayoutGraphicsProto { public static SectionType forNumber(int value) { switch (value) { case 0: return Physical; - case 1: return Logic; case 2: return TurnoutPhysical; default: return null; } @@ -31568,7 +32151,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef paRef_; /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31580,7 +32163,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31592,7 +32175,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31606,7 +32189,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef pbRef_; /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31618,7 +32201,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31630,7 +32213,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31672,7 +32255,7 @@ public final class LayoutGraphicsProto { com.google.protobuf.LazyStringArrayList.emptyList(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31684,7 +32267,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31695,7 +32278,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31707,7 +32290,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31719,6 +32302,106 @@ public final class LayoutGraphicsProto { return axleCountings_.getByteString(index); } + public static final int CHILDREN_FIELD_NUMBER = 8; + @SuppressWarnings("serial") + private com.google.protobuf.LazyStringArrayList children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @return A list containing the children. + */ + public com.google.protobuf.ProtocolStringList + getChildrenList() { + return children_; + } + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @return The count of children. + */ + public int getChildrenCount() { + return children_.size(); + } + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @param index The index of the element to return. + * @return The children at the given index. + */ + public java.lang.String getChildren(int index) { + return children_.get(index); + } + /** + * 
+     * 下属逻辑区段id(非岔区)
+     *
+ * + * repeated string children = 8; + * @param index The index of the value to return. + * @return The bytes of the children at the given index. + */ + public com.google.protobuf.ByteString + getChildrenBytes(int index) { + return children_.getByteString(index); + } + + public static final int DESTINATIONCODE_FIELD_NUMBER = 9; + @SuppressWarnings("serial") + private volatile java.lang.Object destinationCode_ = ""; + /** + * 
+     * 目的地码
+     *
+ * + * string destinationCode = 9; + * @return The destinationCode. + */ + @java.lang.Override + public java.lang.String getDestinationCode() { + java.lang.Object ref = destinationCode_; + 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(); + destinationCode_ = s; + return s; + } + } + /** + * 
+     * 目的地码
+     *
+ * + * string destinationCode = 9; + * @return The bytes for destinationCode. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getDestinationCodeBytes() { + java.lang.Object ref = destinationCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + destinationCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -31754,6 +32437,12 @@ 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)); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, destinationCode_); + } getUnknownFields().writeTo(output); } @@ -31794,6 +32483,17 @@ public final class LayoutGraphicsProto { size += dataSize; size += 1 * getAxleCountingsList().size(); } + { + int dataSize = 0; + for (int i = 0; i < children_.size(); i++) { + dataSize += computeStringSizeNoTag(children_.getRaw(i)); + } + size += dataSize; + size += 1 * getChildrenList().size(); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationCode_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, destinationCode_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -31831,6 +32531,10 @@ 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 (!getDestinationCode() + .equals(other.getDestinationCode())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -31866,6 +32570,12 @@ 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(); + } + hash = (37 * hash) + DESTINATIONCODE_FIELD_NUMBER; + hash = (53 * hash) + getDestinationCode().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -31964,6 +32674,10 @@ public final class LayoutGraphicsProto { return builder; } /** + * 
+     ** 物理区段 
+     *
+ * * Protobuf type {@code graphicData.Section} */ public static final class Builder extends @@ -32023,6 +32737,9 @@ public final class LayoutGraphicsProto { sectionType_ = 0; axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); + children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + destinationCode_ = ""; return this; } @@ -32094,6 +32811,13 @@ public final class LayoutGraphicsProto { axleCountings_.makeImmutable(); result.axleCountings_ = axleCountings_; } + if (((from_bitField0_ & 0x00000080) != 0)) { + children_.makeImmutable(); + result.children_ = children_; + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.destinationCode_ = destinationCode_; + } } @java.lang.Override @@ -32161,6 +32885,21 @@ public final class LayoutGraphicsProto { } onChanged(); } + if (!other.children_.isEmpty()) { + if (children_.isEmpty()) { + children_ = other.children_; + bitField0_ |= 0x00000080; + } else { + ensureChildrenIsMutable(); + children_.addAll(other.children_); + } + onChanged(); + } + if (!other.getDestinationCode().isEmpty()) { + destinationCode_ = other.destinationCode_; + bitField0_ |= 0x00000100; + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -32237,6 +32976,17 @@ public final class LayoutGraphicsProto { axleCountings_.add(s); break; } // case 58 + case 66: { + java.lang.String s = input.readStringRequireUtf8(); + ensureChildrenIsMutable(); + children_.add(s); + break; + } // case 66 + case 74: { + destinationCode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000100; + break; + } // case 74 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -32690,7 +33440,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRefOrBuilder> paRefBuilder_; /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32701,7 +33451,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32716,7 +33466,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32736,7 +33486,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32754,7 +33504,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32777,7 +33527,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32794,7 +33544,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32806,7 +33556,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32821,7 +33571,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32845,7 +33595,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRefOrBuilder> pbRefBuilder_; /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32856,7 +33606,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32871,7 +33621,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32891,7 +33641,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32909,7 +33659,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32932,7 +33682,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32949,7 +33699,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32961,7 +33711,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32976,7 +33726,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -33078,7 +33828,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33091,7 +33841,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33102,7 +33852,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33114,7 +33864,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33127,7 +33877,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33146,7 +33896,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33164,7 +33914,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33182,7 +33932,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33197,7 +33947,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33214,6 +33964,245 @@ public final class LayoutGraphicsProto { onChanged(); return this; } + + private com.google.protobuf.LazyStringArrayList children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + private void ensureChildrenIsMutable() { + if (!children_.isModifiable()) { + children_ = new com.google.protobuf.LazyStringArrayList(children_); + } + bitField0_ |= 0x00000080; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @return A list containing the children. + */ + public com.google.protobuf.ProtocolStringList + getChildrenList() { + children_.makeImmutable(); + return children_; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @return The count of children. + */ + public int getChildrenCount() { + return children_.size(); + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @param index The index of the element to return. + * @return The children at the given index. + */ + public java.lang.String getChildren(int index) { + return children_.get(index); + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @param index The index of the value to return. + * @return The bytes of the children at the given index. + */ + public com.google.protobuf.ByteString + getChildrenBytes(int index) { + return children_.getByteString(index); + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @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, java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + ensureChildrenIsMutable(); + children_.set(index, value); + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @param value The children to add. + * @return This builder for chaining. + */ + public Builder addChildren( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + ensureChildrenIsMutable(); + children_.add(value); + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @param values The children to add. + * @return This builder for chaining. + */ + public Builder addAllChildren( + java.lang.Iterable values) { + ensureChildrenIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, children_); + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @return This builder for chaining. + */ + public Builder clearChildren() { + children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000080);; + onChanged(); + return this; + } + /** + * 
+       * 下属逻辑区段id(非岔区)
+       *
+ * + * repeated string children = 8; + * @param value The bytes of the children to add. + * @return This builder for chaining. + */ + public Builder addChildrenBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + ensureChildrenIsMutable(); + children_.add(value); + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + + private java.lang.Object destinationCode_ = ""; + /** + * 
+       * 目的地码
+       *
+ * + * string destinationCode = 9; + * @return The destinationCode. + */ + public java.lang.String getDestinationCode() { + java.lang.Object ref = destinationCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + destinationCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 目的地码
+       *
+ * + * string destinationCode = 9; + * @return The bytes for destinationCode. + */ + public com.google.protobuf.ByteString + getDestinationCodeBytes() { + java.lang.Object ref = destinationCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + destinationCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 目的地码
+       *
+ * + * string destinationCode = 9; + * @param value The destinationCode to set. + * @return This builder for chaining. + */ + public Builder setDestinationCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + destinationCode_ = value; + bitField0_ |= 0x00000100; + onChanged(); + return this; + } + /** + * 
+       * 目的地码
+       *
+ * + * string destinationCode = 9; + * @return This builder for chaining. + */ + public Builder clearDestinationCode() { + destinationCode_ = getDefaultInstance().getDestinationCode(); + bitField0_ = (bitField0_ & ~0x00000100); + onChanged(); + return this; + } + /** + * 
+       * 目的地码
+       *
+ * + * string destinationCode = 9; + * @param value The bytes for destinationCode to set. + * @return This builder for chaining. + */ + public Builder setDestinationCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + destinationCode_ = value; + bitField0_ |= 0x00000100; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -33278,6 +34267,1108 @@ public final class LayoutGraphicsProto { } + public interface LogicSectionOrBuilder extends + // @@protoc_insertion_point(interface_extends:graphicData.LogicSection) + com.google.protobuf.MessageOrBuilder { + + /** + * .graphicData.CommonInfo common = 1; + * @return Whether the common field is set. + */ + boolean hasCommon(); + /** + * .graphicData.CommonInfo common = 1; + * @return The common. + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo getCommon(); + /** + * .graphicData.CommonInfo common = 1; + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder getCommonOrBuilder(); + + /** + * string code = 2; + * @return The code. + */ + java.lang.String getCode(); + /** + * string code = 2; + * @return The bytes for code. + */ + com.google.protobuf.ByteString + getCodeBytes(); + + /** + * repeated .graphicData.Point points = 3; + */ + java.util.List + getPointsList(); + /** + * repeated .graphicData.Point points = 3; + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point getPoints(int index); + /** + * repeated .graphicData.Point points = 3; + */ + int getPointsCount(); + /** + * repeated .graphicData.Point points = 3; + */ + java.util.List + getPointsOrBuilderList(); + /** + * repeated .graphicData.Point points = 3; + */ + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder getPointsOrBuilder( + int index); + } + /** + * 
+   ** 逻辑区段 
+   *
+ * + * Protobuf type {@code graphicData.LogicSection} + */ + public static final class LogicSection extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:graphicData.LogicSection) + LogicSectionOrBuilder { + private static final long serialVersionUID = 0L; + // Use LogicSection.newBuilder() to construct. + private LogicSection(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private LogicSection() { + code_ = ""; + points_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new LogicSection(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.internal_static_graphicData_LogicSection_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.internal_static_graphicData_LogicSection_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.class, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder.class); + } + + public static final int COMMON_FIELD_NUMBER = 1; + private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo common_; + /** + * .graphicData.CommonInfo common = 1; + * @return Whether the common field is set. + */ + @java.lang.Override + public boolean hasCommon() { + return common_ != null; + } + /** + * .graphicData.CommonInfo common = 1; + * @return The common. + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo getCommon() { + return common_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance() : common_; + } + /** + * .graphicData.CommonInfo common = 1; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder getCommonOrBuilder() { + return common_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance() : common_; + } + + public static final int CODE_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object code_ = ""; + /** + * string code = 2; + * @return The code. + */ + @java.lang.Override + public java.lang.String getCode() { + java.lang.Object ref = code_; + 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(); + code_ = s; + return s; + } + } + /** + * string code = 2; + * @return The bytes for code. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getCodeBytes() { + java.lang.Object ref = code_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + code_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int POINTS_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private java.util.List points_; + /** + * repeated .graphicData.Point points = 3; + */ + @java.lang.Override + public java.util.List getPointsList() { + return points_; + } + /** + * repeated .graphicData.Point points = 3; + */ + @java.lang.Override + public java.util.List + getPointsOrBuilderList() { + return points_; + } + /** + * repeated .graphicData.Point points = 3; + */ + @java.lang.Override + public int getPointsCount() { + return points_.size(); + } + /** + * repeated .graphicData.Point points = 3; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point getPoints(int index) { + return points_.get(index); + } + /** + * repeated .graphicData.Point points = 3; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder getPointsOrBuilder( + int index) { + return points_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + 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 < points_.size(); i++) { + output.writeMessage(3, points_.get(i)); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (common_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getCommon()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_); + } + for (int i = 0; i < points_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, points_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection)) { + return super.equals(obj); + } + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection other = (club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection) obj; + + if (hasCommon() != other.hasCommon()) return false; + if (hasCommon()) { + if (!getCommon() + .equals(other.getCommon())) return false; + } + if (!getCode() + .equals(other.getCode())) return false; + if (!getPointsList() + .equals(other.getPointsList())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasCommon()) { + hash = (37 * hash) + COMMON_FIELD_NUMBER; + hash = (53 * hash) + getCommon().hashCode(); + } + hash = (37 * hash) + CODE_FIELD_NUMBER; + hash = (53 * hash) + getCode().hashCode(); + if (getPointsCount() > 0) { + hash = (37 * hash) + POINTS_FIELD_NUMBER; + hash = (53 * hash) + getPointsList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     ** 逻辑区段 
+     *
+ * + * Protobuf type {@code graphicData.LogicSection} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:graphicData.LogicSection) + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSectionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.internal_static_graphicData_LogicSection_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.internal_static_graphicData_LogicSection_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.class, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.Builder.class); + } + + // Construct using club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + common_ = null; + if (commonBuilder_ != null) { + commonBuilder_.dispose(); + commonBuilder_ = null; + } + code_ = ""; + if (pointsBuilder_ == null) { + points_ = java.util.Collections.emptyList(); + } else { + points_ = null; + pointsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.internal_static_graphicData_LogicSection_descriptor; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getDefaultInstanceForType() { + return club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.getDefaultInstance(); + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection build() { + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection buildPartial() { + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection result = new club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection result) { + if (pointsBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0)) { + points_ = java.util.Collections.unmodifiableList(points_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.points_ = points_; + } else { + result.points_ = pointsBuilder_.build(); + } + } + + private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.common_ = commonBuilder_ == null + ? common_ + : commonBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.code_ = code_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection) { + return mergeFrom((club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection other) { + if (other == club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection.getDefaultInstance()) return this; + if (other.hasCommon()) { + mergeCommon(other.getCommon()); + } + if (!other.getCode().isEmpty()) { + code_ = other.code_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (pointsBuilder_ == null) { + if (!other.points_.isEmpty()) { + if (points_.isEmpty()) { + points_ = other.points_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensurePointsIsMutable(); + points_.addAll(other.points_); + } + onChanged(); + } + } else { + if (!other.points_.isEmpty()) { + if (pointsBuilder_.isEmpty()) { + pointsBuilder_.dispose(); + pointsBuilder_ = null; + points_ = other.points_; + bitField0_ = (bitField0_ & ~0x00000004); + pointsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getPointsFieldBuilder() : null; + } else { + pointsBuilder_.addAllMessages(other.points_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getCommonFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + code_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point m = + input.readMessage( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.parser(), + extensionRegistry); + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + points_.add(m); + } else { + pointsBuilder_.addMessage(m); + } + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo common_; + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder> commonBuilder_; + /** + * .graphicData.CommonInfo common = 1; + * @return Whether the common field is set. + */ + public boolean hasCommon() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .graphicData.CommonInfo common = 1; + * @return The common. + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo getCommon() { + if (commonBuilder_ == null) { + return common_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance() : common_; + } else { + return commonBuilder_.getMessage(); + } + } + /** + * .graphicData.CommonInfo common = 1; + */ + public Builder setCommon(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo value) { + if (commonBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + common_ = value; + } else { + commonBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .graphicData.CommonInfo common = 1; + */ + public Builder setCommon( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder builderForValue) { + if (commonBuilder_ == null) { + common_ = builderForValue.build(); + } else { + commonBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .graphicData.CommonInfo common = 1; + */ + public Builder mergeCommon(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo value) { + if (commonBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + common_ != null && + common_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance()) { + getCommonBuilder().mergeFrom(value); + } else { + common_ = value; + } + } else { + commonBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .graphicData.CommonInfo common = 1; + */ + public Builder clearCommon() { + bitField0_ = (bitField0_ & ~0x00000001); + common_ = null; + if (commonBuilder_ != null) { + commonBuilder_.dispose(); + commonBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .graphicData.CommonInfo common = 1; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder getCommonBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getCommonFieldBuilder().getBuilder(); + } + /** + * .graphicData.CommonInfo common = 1; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder getCommonOrBuilder() { + if (commonBuilder_ != null) { + return commonBuilder_.getMessageOrBuilder(); + } else { + return common_ == null ? + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.getDefaultInstance() : common_; + } + } + /** + * .graphicData.CommonInfo common = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder> + getCommonFieldBuilder() { + if (commonBuilder_ == null) { + commonBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfo.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.CommonInfoOrBuilder>( + getCommon(), + getParentForChildren(), + isClean()); + common_ = null; + } + return commonBuilder_; + } + + private java.lang.Object code_ = ""; + /** + * string code = 2; + * @return The code. + */ + public java.lang.String getCode() { + java.lang.Object ref = code_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + code_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string code = 2; + * @return The bytes for code. + */ + public com.google.protobuf.ByteString + getCodeBytes() { + java.lang.Object ref = code_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + code_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string code = 2; + * @param value The code to set. + * @return This builder for chaining. + */ + public Builder setCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + code_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string code = 2; + * @return This builder for chaining. + */ + public Builder clearCode() { + code_ = getDefaultInstance().getCode(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string code = 2; + * @param value The bytes for code to set. + * @return This builder for chaining. + */ + public Builder setCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + code_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private java.util.List points_ = + java.util.Collections.emptyList(); + private void ensurePointsIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + points_ = new java.util.ArrayList(points_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder> pointsBuilder_; + + /** + * repeated .graphicData.Point points = 3; + */ + public java.util.List getPointsList() { + if (pointsBuilder_ == null) { + return java.util.Collections.unmodifiableList(points_); + } else { + return pointsBuilder_.getMessageList(); + } + } + /** + * repeated .graphicData.Point points = 3; + */ + public int getPointsCount() { + if (pointsBuilder_ == null) { + return points_.size(); + } else { + return pointsBuilder_.getCount(); + } + } + /** + * repeated .graphicData.Point points = 3; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point getPoints(int index) { + if (pointsBuilder_ == null) { + return points_.get(index); + } else { + return pointsBuilder_.getMessage(index); + } + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder setPoints( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point value) { + if (pointsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePointsIsMutable(); + points_.set(index, value); + onChanged(); + } else { + pointsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder setPoints( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder builderForValue) { + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + points_.set(index, builderForValue.build()); + onChanged(); + } else { + pointsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder addPoints(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point value) { + if (pointsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePointsIsMutable(); + points_.add(value); + onChanged(); + } else { + pointsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder addPoints( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point value) { + if (pointsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePointsIsMutable(); + points_.add(index, value); + onChanged(); + } else { + pointsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder addPoints( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder builderForValue) { + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + points_.add(builderForValue.build()); + onChanged(); + } else { + pointsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder addPoints( + int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder builderForValue) { + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + points_.add(index, builderForValue.build()); + onChanged(); + } else { + pointsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder addAllPoints( + java.lang.Iterable values) { + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, points_); + onChanged(); + } else { + pointsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder clearPoints() { + if (pointsBuilder_ == null) { + points_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + pointsBuilder_.clear(); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public Builder removePoints(int index) { + if (pointsBuilder_ == null) { + ensurePointsIsMutable(); + points_.remove(index); + onChanged(); + } else { + pointsBuilder_.remove(index); + } + return this; + } + /** + * repeated .graphicData.Point points = 3; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder getPointsBuilder( + int index) { + return getPointsFieldBuilder().getBuilder(index); + } + /** + * repeated .graphicData.Point points = 3; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder getPointsOrBuilder( + int index) { + if (pointsBuilder_ == null) { + return points_.get(index); } else { + return pointsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .graphicData.Point points = 3; + */ + public java.util.List + getPointsOrBuilderList() { + if (pointsBuilder_ != null) { + return pointsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(points_); + } + } + /** + * repeated .graphicData.Point points = 3; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder addPointsBuilder() { + return getPointsFieldBuilder().addBuilder( + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.getDefaultInstance()); + } + /** + * repeated .graphicData.Point points = 3; + */ + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder addPointsBuilder( + int index) { + return getPointsFieldBuilder().addBuilder( + index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.getDefaultInstance()); + } + /** + * repeated .graphicData.Point points = 3; + */ + public java.util.List + getPointsBuilderList() { + return getPointsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder> + getPointsFieldBuilder() { + if (pointsBuilder_ == null) { + pointsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Point.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder>( + points_, + ((bitField0_ & 0x00000004) != 0), + getParentForChildren(), + isClean()); + points_ = null; + } + return pointsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:graphicData.LogicSection) + } + + // @@protoc_insertion_point(class_scope:graphicData.LogicSection) + private static final club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection(); + } + + public static club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public LogicSection parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.LogicSection getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public interface KilometerPointOrBuilder extends // @@protoc_insertion_point(interface_extends:graphicData.KilometerPoint) com.google.protobuf.MessageOrBuilder { @@ -37904,6 +39995,11 @@ public final class LayoutGraphicsProto { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_graphicData_Section_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_graphicData_LogicSection_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_graphicData_LogicSection_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_graphicData_KilometerPoint_descriptor; private static final @@ -37934,7 +40030,7 @@ public final class LayoutGraphicsProto { static { java.lang.String[] descriptorData = { "\n\033stationLayoutGraphics.proto\022\013graphicDa" + - "ta\"\363\005\n\022RtssGraphicStorage\022#\n\006canvas\030\001 \001(" + + "ta\"\245\006\n\022RtssGraphicStorage\022#\n\006canvas\030\001 \001(" + "\0132\023.graphicData.Canvas\022 \n\005links\030\002 \003(\0132\021." + "graphicData.Link\022&\n\010iscsFans\030\003 \003(\0132\024.gra" + "phicData.IscsFan\022(\n\tPlatforms\030\004 \003(\0132\025.gr" + @@ -37953,97 +40049,102 @@ public final class LayoutGraphicsProto { "2\030.graphicData.TrainWindow\0220\n\raxleCounti" + "ngs\030\021 \003(\0132\031.graphicData.AxleCounting\022*\n\n" + "separators\030\022 \003(\0132\026.graphicData.Separator" + - "\"s\n\006Canvas\022\r\n\005width\030\001 \001(\005\022\016\n\006height\030\002 \001(" + - "\005\022\027\n\017backgroundColor\030\003 \001(\t\0221\n\021viewportTr" + - "ansform\030\004 \001(\0132\026.graphicData.Transform\"\035\n" + - "\005Point\022\t\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\"\210\001\n\tTransfo" + - "rm\022$\n\010position\030\001 \001(\0132\022.graphicData.Point" + - "\022!\n\005scale\030\002 \001(\0132\022.graphicData.Point\022\020\n\010r" + - "otation\030\003 \001(\002\022 \n\004skew\030\004 \001(\0132\022.graphicDat" + - "a.Point\"I\n\016ChildTransform\022\014\n\004name\030\001 \001(\t\022" + - ")\n\ttransform\030\002 \001(\0132\026.graphicData.Transfo" + - "rm\"\216\001\n\nCommonInfo\022\n\n\002id\030\001 \001(\t\022\023\n\013graphic" + - "Type\030\002 \001(\t\022)\n\ttransform\030\003 \001(\0132\026.graphicD" + - "ata.Transform\0224\n\017childTransforms\030\004 \003(\0132\033" + - ".graphicData.ChildTransform\"\255\001\n\004Link\022\'\n\006" + - "common\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n" + - "\004code\030\002 \001(\t\022\r\n\005curve\030\003 \001(\010\022\025\n\rsegmentsCo" + - "unt\030\004 \001(\005\022\021\n\tlineWidth\030\005 \001(\005\022\021\n\tlineColo" + - "r\030\006 \001(\t\022\"\n\006points\030\007 \003(\0132\022.graphicData.Po" + - "int\"\265\001\n\004Rect\022\'\n\006common\030\001 \001(\0132\027.graphicDa" + - "ta.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\005width\030\005 \001(\002" + - "\022\016\n\006height\030\006 \001(\002\022\016\n\006radius\030\007 \001(\005\022!\n\005poin" + - "t\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\tlin" + - "eColor\030\004 \001(\t\022\"\n\006points\030\005 \003(\0132\022.graphicDa" + - "ta.Point\"e\n\010Platform\022\'\n\006common\030\001 \001(\0132\027.g" + - "raphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\017\n\007h" + - "asdoor\030\003 \001(\010\022\021\n\tdirection\030\004 \001(\t\"\252\001\n\007Stat" + - "ion\022\'\n\006common\030\001 \001(\0132\027.graphicData.Common" + - "Info\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\017kilomet" + - "erSystem\030\006 \001(\0132\034.graphicData.KilometerSy" + - "stem\"k\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\"W\n\013Tra" + - "inWindow\022\'\n\006common\030\001 \001(\0132\027.graphicData.C" + - "ommonInfo\022\014\n\004code\030\002 \001(\t\022\021\n\tsectionId\030\003 \001" + - "(\t\"\256\001\n\014AxleCounting\022\'\n\006common\030\001 \001(\0132\027.gr" + - "aphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\0225\n\017ki" + - "lometerSystem\030\003 \001(\0132\034.graphicData.Kilome" + - "terSystem\0220\n\017axleCountingRef\030\004 \003(\0132\027.gra" + - "phicData.RelatedRef\">\n\005Train\022\'\n\006common\030\001" + - " \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 " + - "\001(\t\"B\n\tTrainLine\022\'\n\006common\030\001 \001(\0132\027.graph" + - "icData.CommonInfo\022\014\n\004code\030\002 \001(\t\"@\n\007IscsF" + - "an\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonI" + - "nfo\022\014\n\004code\030\002 \001(\t\"\333\002\n\007Turnout\022\'\n\006common\030" + + "\0220\n\rlogicSections\030\023 \003(\0132\031.graphicData.Lo" + + "gicSection\"s\n\006Canvas\022\r\n\005width\030\001 \001(\005\022\016\n\006h" + + "eight\030\002 \001(\005\022\027\n\017backgroundColor\030\003 \001(\t\0221\n\021" + + "viewportTransform\030\004 \001(\0132\026.graphicData.Tr" + + "ansform\"\035\n\005Point\022\t\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\"\210" + + "\001\n\tTransform\022$\n\010position\030\001 \001(\0132\022.graphic" + + "Data.Point\022!\n\005scale\030\002 \001(\0132\022.graphicData." + + "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\"e\n\010Platform\022\'\n\006common" + + "\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\"\252\001\n\007Station\022\'\n\006common\030\001 \001(\0132\027.graphicD" + + "ata.CommonInfo\022\014\n\004code\030\002 \001(\t\022\022\n\nhasContr" + + "ol\030\003 \001(\010\022\035\n\025concentrationStations\030\004 \001(\010\022" + + "5\n\017kilometerSystem\030\006 \001(\0132\034.graphicData.K" + + "ilometerSystem\"k\n\013StationLine\022\'\n\006common\030" + "\001 \001(\0132\027.graphicData.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\006" + - "pointC\030\010 \003(\0132\022.graphicData.Point\022&\n\005paRe" + - "f\030\t \001(\0132\027.graphicData.RelatedRef\022&\n\005pbRe" + - "f\030\n \001(\0132\027.graphicData.RelatedRef\022&\n\005pcRe" + - "f\030\013 \001(\0132\027.graphicData.RelatedRef\0225\n\017kilo" + - "meterSystem\030\r \003(\0132\034.graphicData.Kilomete" + - "rSystem\">\n\017KilometerSystem\022\021\n\tkilometer\030" + - "\001 \001(\003\022\030\n\020coordinateSystem\030\002 \001(\t\"\206\001\n\006Sign" + - "al\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonI" + - "nfo\022\014\n\004code\030\002 \001(\t\022\016\n\006mirror\030\003 \001(\010\0225\n\017kil" + - "ometerSystem\030\006 \001(\0132\034.graphicData.Kilomet" + - "erSystem\"\307\001\n\007RunLine\022\'\n\006common\030\001 \001(\0132\027.g" + - "raphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006p" + - "oints\030\003 \003(\0132\022.graphicData.Point\022\021\n\tnameC" + - "olor\030\004 \001(\t\022\023\n\013nameBgColor\030\005 \001(\t\022\022\n\nconta" + - "inSta\030\010 \003(\t\022\025\n\rlinkPathLines\030\t \003(\t\022\016\n\006li" + - "neId\030\n \001(\t\"\277\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\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\";\n\013Secti" + - "onType\022\014\n\010Physical\020\000\022\t\n\005Logic\020\001\022\023\n\017Turno" + - "utPhysical\020\002\"V\n\016KilometerPoint\022!\n\005point\030" + - "\001 \001(\0132\022.graphicData.Point\022\021\n\tkilometer\030\002" + - " \001(\003\022\016\n\006stName\030\003 \001(\t\"\277\001\n\010PathLine\022\'\n\006com" + - "mon\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004co" + - "de\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.P" + - "oint\022\014\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoints\030\005 " + - "\003(\0132\033.graphicData.KilometerPoint\022\024\n\014isKm" + - "Increase\030\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndeviceT" + - "ype\030\001 \001(\0162\".graphicData.RelatedRef.Devic" + - "eType\022\n\n\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\"." + - "graphicData.RelatedRef.DevicePort\"I\n\nDev" + - "iceType\022\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013Tra" + - "inWindow\020\002\022\020\n\014AxleCounting\020\003\"!\n\nDevicePo" + - "rt\022\005\n\001A\020\000\022\005\n\001B\020\001\022\005\n\001C\020\002\"Y\n\tSeparator\022\'\n\006" + - "common\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n" + - "\004code\030\002 \001(\t\022\025\n\rseparatorType\030\003 \001(\tB8\n!cl" + - "ub.joylink.xiannccda.dto.protosB\023LayoutG" + - "raphicsProtob\006proto3" + " \001(\t\022\023\n\013hasTransfer\030\003 \001(\010\022\020\n\010hideName\030\004 " + + "\001(\010\"Y\n\013TrainWindow\022\'\n\006common\030\001 \001(\0132\027.gra" + + "phicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\023\n\013ref" + + "DeviceId\030\003 \003(\t\"\256\001\n\014AxleCounting\022\'\n\006commo" + + "n\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004code" + + "\030\002 \001(\t\0225\n\017kilometerSystem\030\003 \001(\0132\034.graphi" + + "cData.KilometerSystem\0220\n\017axleCountingRef" + + "\030\004 \003(\0132\027.graphicData.RelatedRef\">\n\005Train" + + "\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonInf" + + "o\022\014\n\004code\030\002 \001(\t\"B\n\tTrainLine\022\'\n\006common\030\001" + + " \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 " + + "\001(\t\"@\n\007IscsFan\022\'\n\006common\030\001 \001(\0132\027.graphic" + + "Data.CommonInfo\022\014\n\004code\030\002 \001(\t\"\333\002\n\007Turnou" + + "t\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonIn" + + "fo\022\014\n\004code\030\002 \001(\t\022\"\n\006pointA\030\006 \003(\0132\022.graph" + + "icData.Point\022\"\n\006pointB\030\007 \003(\0132\022.graphicDa" + + "ta.Point\022\"\n\006pointC\030\010 \003(\0132\022.graphicData.P" + + "oint\022&\n\005paRef\030\t \001(\0132\027.graphicData.Relate" + + "dRef\022&\n\005pbRef\030\n \001(\0132\027.graphicData.Relate" + + "dRef\022&\n\005pcRef\030\013 \001(\0132\027.graphicData.Relate" + + "dRef\0225\n\017kilometerSystem\030\r \003(\0132\034.graphicD" + + "ata.KilometerSystem\">\n\017KilometerSystem\022\021" + + "\n\tkilometer\030\001 \001(\003\022\030\n\020coordinateSystem\030\002 " + + "\001(\t\"\206\001\n\006Signal\022\'\n\006common\030\001 \001(\0132\027.graphic" + + "Data.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.graphic" + + "Data.KilometerSystem\"\307\001\n\007RunLine\022\'\n\006comm" + + "on\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004cod" + + "e\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Po" + + "int\022\021\n\tnameColor\030\004 \001(\t\022\023\n\013nameBgColor\030\005 " + + "\001(\t\022\022\n\ncontainSta\030\010 \003(\t\022\025\n\rlinkPathLines" + + "\030\t \003(\t\022\016\n\006lineId\030\n \001(\t\"\337\002\n\007Section\022\'\n\006co" + + "mmon\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004c" + + "ode\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData." + + "Point\022&\n\005paRef\030\004 \001(\0132\027.graphicData.Relat" + + "edRef\022&\n\005pbRef\030\005 \001(\0132\027.graphicData.Relat" + + "edRef\0225\n\013sectionType\030\006 \001(\0162 .graphicData" + + ".Section.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\"0\n\013SectionType\022\014\n\010Physical\020\000\022\023\n\017T" + + "urnoutPhysical\020\002\"i\n\014LogicSection\022\'\n\006comm" + + "on\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004cod" + + "e\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Po" + + "int\"V\n\016KilometerPoint\022!\n\005point\030\001 \001(\0132\022.g" + + "raphicData.Point\022\021\n\tkilometer\030\002 \001(\003\022\016\n\006s" + + "tName\030\003 \001(\t\"\277\001\n\010PathLine\022\'\n\006common\030\001 \001(\013" + + "2\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022" + + "\"\n\006points\030\003 \003(\0132\022.graphicData.Point\022\014\n\004i" + + "sUp\030\004 \001(\010\0224\n\017kilometerPoints\030\005 \003(\0132\033.gra" + + "phicData.KilometerPoint\022\024\n\014isKmIncrease\030" + + "\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndeviceType\030\001 \001(\016" + + "2\".graphicData.RelatedRef.DeviceType\022\n\n\002" + + "id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\".graphicDa" + + "ta.RelatedRef.DevicePort\"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.joylin" + + "k.xiannccda.dto.protosB\023LayoutGraphicsPr" + + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -38054,7 +40155,7 @@ public final class LayoutGraphicsProto { internal_static_graphicData_RtssGraphicStorage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_RtssGraphicStorage_descriptor, - new java.lang.String[] { "Canvas", "Links", "IscsFans", "Platforms", "Stations", "Rects", "Train", "Signals", "Turnouts", "Section", "StationLines", "RunLines", "TrainLines", "PathLines", "Polygons", "TrainWindows", "AxleCountings", "Separators", }); + new java.lang.String[] { "Canvas", "Links", "IscsFans", "Platforms", "Stations", "Rects", "Train", "Signals", "Turnouts", "Section", "StationLines", "RunLines", "TrainLines", "PathLines", "Polygons", "TrainWindows", "AxleCountings", "Separators", "LogicSections", }); internal_static_graphicData_Canvas_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_graphicData_Canvas_fieldAccessorTable = new @@ -38126,7 +40227,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", "SectionId", }); + new java.lang.String[] { "Common", "Code", "RefDeviceId", }); internal_static_graphicData_AxleCounting_descriptor = getDescriptor().getMessageTypes().get(13); internal_static_graphicData_AxleCounting_fieldAccessorTable = new @@ -38180,27 +40281,33 @@ public final class LayoutGraphicsProto { 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", }); - internal_static_graphicData_KilometerPoint_descriptor = + new java.lang.String[] { "Common", "Code", "Points", "PaRef", "PbRef", "SectionType", "AxleCountings", "Children", "DestinationCode", }); + internal_static_graphicData_LogicSection_descriptor = getDescriptor().getMessageTypes().get(22); + internal_static_graphicData_LogicSection_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_graphicData_LogicSection_descriptor, + new java.lang.String[] { "Common", "Code", "Points", }); + internal_static_graphicData_KilometerPoint_descriptor = + getDescriptor().getMessageTypes().get(23); internal_static_graphicData_KilometerPoint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_KilometerPoint_descriptor, new java.lang.String[] { "Point", "Kilometer", "StName", }); internal_static_graphicData_PathLine_descriptor = - getDescriptor().getMessageTypes().get(23); + getDescriptor().getMessageTypes().get(24); internal_static_graphicData_PathLine_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_PathLine_descriptor, new java.lang.String[] { "Common", "Code", "Points", "IsUp", "KilometerPoints", "IsKmIncrease", }); internal_static_graphicData_RelatedRef_descriptor = - getDescriptor().getMessageTypes().get(24); + getDescriptor().getMessageTypes().get(25); internal_static_graphicData_RelatedRef_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_RelatedRef_descriptor, new java.lang.String[] { "DeviceType", "Id", "DevicePort", }); internal_static_graphicData_Separator_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(26); internal_static_graphicData_Separator_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_Separator_descriptor, diff --git a/src/main/java/club/joylink/xiannccda/service/LineDeviceStatusService.java b/src/main/java/club/joylink/xiannccda/service/LineDeviceStatusService.java index c833dc1..986f967 100644 --- a/src/main/java/club/joylink/xiannccda/service/LineDeviceStatusService.java +++ b/src/main/java/club/joylink/xiannccda/service/LineDeviceStatusService.java @@ -4,8 +4,6 @@ import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.collect.DeviceStatusConvertorManager; -import club.joylink.xiannccda.ats.message.collect.DeviceDataRepository; -import club.joylink.xiannccda.ats.message.collect.DeviceStatusDataRepository; import club.joylink.xiannccda.ats.message.collect.convertor.DeviceChangeStatusConvertor; import club.joylink.xiannccda.ats.message.collect.convertor.DeviceInitConvertor; import club.joylink.xiannccda.ats.message.collect.convertor.LineNetTrainInitConvertor; @@ -16,9 +14,7 @@ import club.joylink.xiannccda.ats.message.collect.convertor.TrainInitConvertor; import club.joylink.xiannccda.ats.message.collect.convertor.TrainRecordConvertor; import club.joylink.xiannccda.ats.message.collect.convertor.TrainRemoveConvertor; import club.joylink.xiannccda.ats.message.collect.convertor.TrainUpdateConvertor; -import club.joylink.xiannccda.ats.message.collect.datasource.DeviceStatusData; import club.joylink.xiannccda.mock.message.NccMockDataService; -import club.joylink.xiannccda.ws.IMessageServer; import club.joylink.xiannccda.ws.LineDeviceMessageServer; import club.joylink.xiannccda.ws.LineNetMessageServer; import club.joylink.xiannccda.ws.LineTrainMessageServer; @@ -36,8 +32,6 @@ import org.springframework.stereotype.Service; @Service public class LineDeviceStatusService { - public static final String DATA_KEY = "lineNet"; - private final WsMessageServerManager wsMessageServerManager; private final NccMockDataService nccMockDataService; diff --git a/xian-ncc-da-message b/xian-ncc-da-message index e8ac230..f1dfb5e 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit e8ac23070828a1eca3bd68b6f78e4e419123d139 +Subproject commit f1dfb5e4bdcce8df58c34c0c2cbce545db559a68