From c7759c1372569843b74815c0747090468bde3cee Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 17 Jul 2023 17:30:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=BD=A6=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/line3/device/DeviceStatus.java | 8 + .../rep/TrainIndicationUpdateResponse.java | 5 +- .../dto/protos/LayoutGraphicsProto.java | 1799 +++++++++++++++-- .../dto/protos/NccAlertInfoMessageProto.java | 511 ++++- .../xiannccda/dto/protos/TrainProto.java | 154 +- 5 files changed, 2256 insertions(+), 221 deletions(-) diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java index 2ce1d16..d7c846d 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java @@ -1,5 +1,6 @@ package club.joylink.xiannccda.ats.message.line3.device; +import club.joylink.xiannccda.dto.protos.DeviceStatusProto.Signal; import com.google.common.collect.Lists; import java.util.Arrays; import java.util.Collections; @@ -170,6 +171,13 @@ public class DeviceStatus { } } + public static void main(String[] args) { + for (RTU value : RTU.values()) { + boolean b = value.isSet((short) 3, 1); + System.out.println(value.name() + " " + b); + } + } + /** * 表6.3-4设备状态定义表 – ENTRY 注：西安3号线信号系统不提供此类型设备的状态。 */ diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java index 0aa0ccd..f5ef2f8 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java @@ -76,7 +76,7 @@ public class TrainIndicationUpdateResponse extends MessageResponse { /** * 目的地号(4) */ - private Integer destinationId; + private String destinationId; /** * 编组数量(1) */ @@ -184,6 +184,7 @@ public class TrainIndicationUpdateResponse extends MessageResponse { final byte[] driverId = new byte[13]; final byte[] arriveTime = new byte[7]; final byte[] departTime = new byte[7]; + // this.lineId = buf.readShort(); type = buf.readShort(); @@ -196,7 +197,7 @@ public class TrainIndicationUpdateResponse extends MessageResponse { buf.readBytes(groupId); buf.readBytes(trainId); buf.readBytes(globalId); - this.destinationId = buf.readInt(); + this.destinationId = EntityParseUtil.convertStr(buf, 4); this.rollingStock = buf.readByte(); buf.readBytes(driverId); this.routeId = buf.readShort(); 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 19ded6c..41615ff 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java @@ -31189,7 +31189,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31198,7 +31198,7 @@ public final class LayoutGraphicsProto { boolean hasPaRef(); /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31207,7 +31207,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPaRef(); /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31216,7 +31216,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31225,7 +31225,7 @@ public final class LayoutGraphicsProto { boolean hasPbRef(); /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31234,7 +31234,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPbRef(); /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31262,7 +31262,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31272,7 +31272,7 @@ public final class LayoutGraphicsProto { getAxleCountingsList(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31281,7 +31281,7 @@ public final class LayoutGraphicsProto { int getAxleCountingsCount(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31291,7 +31291,7 @@ public final class LayoutGraphicsProto { java.lang.String getAxleCountings(int index); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31300,8 +31300,53 @@ 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); } /** + * 
+   ** 物理区段 
+   *
+ * * Protobuf type {@code graphicData.Section} */ public static final class Section extends @@ -31319,6 +31364,8 @@ public final class LayoutGraphicsProto { sectionType_ = 0; axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); + children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); } @java.lang.Override @@ -31347,14 +31394,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 +31413,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 +31455,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 +31622,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef paRef_; /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31580,7 +31634,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31592,7 +31646,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备(非岔区)
+     * 区段A端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31606,7 +31660,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef pbRef_; /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31618,7 +31672,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31630,7 +31684,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备(非岔区)
+     * 区段B端关联的物理区段或道岔(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31672,7 +31726,7 @@ public final class LayoutGraphicsProto { com.google.protobuf.LazyStringArrayList.emptyList(); /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31684,7 +31738,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31695,7 +31749,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31707,7 +31761,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 关联的计轴
+     * 关联的计轴(岔区&&非岔区)
      *
* * repeated string axleCountings = 7; @@ -31719,6 +31773,59 @@ 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); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -31754,6 +31861,9 @@ 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)); + } getUnknownFields().writeTo(output); } @@ -31794,6 +31904,14 @@ 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(); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -31831,6 +31949,8 @@ 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 (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -31866,6 +31986,10 @@ 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 = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -31964,6 +32088,10 @@ public final class LayoutGraphicsProto { return builder; } /** + * 
+     ** 物理区段 
+     *
+ * * Protobuf type {@code graphicData.Section} */ public static final class Builder extends @@ -32023,6 +32151,8 @@ public final class LayoutGraphicsProto { sectionType_ = 0; axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); + children_ = + com.google.protobuf.LazyStringArrayList.emptyList(); return this; } @@ -32094,6 +32224,10 @@ public final class LayoutGraphicsProto { axleCountings_.makeImmutable(); result.axleCountings_ = axleCountings_; } + if (((from_bitField0_ & 0x00000080) != 0)) { + children_.makeImmutable(); + result.children_ = children_; + } } @java.lang.Override @@ -32161,6 +32295,16 @@ public final class LayoutGraphicsProto { } onChanged(); } + if (!other.children_.isEmpty()) { + if (children_.isEmpty()) { + children_ = other.children_; + bitField0_ |= 0x00000080; + } else { + ensureChildrenIsMutable(); + children_.addAll(other.children_); + } + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -32237,6 +32381,12 @@ 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 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -32690,7 +32840,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 +32851,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32716,7 +32866,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32736,7 +32886,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32754,7 +32904,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32777,7 +32927,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32794,7 +32944,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32806,7 +32956,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32821,7 +32971,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备(非岔区)
+       * 区段A端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32845,7 +32995,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 +33006,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32871,7 +33021,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32891,7 +33041,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32909,7 +33059,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32932,7 +33082,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32949,7 +33099,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32961,7 +33111,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32976,7 +33126,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备(非岔区)
+       * 区段B端关联的物理区段或道岔(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -33078,7 +33228,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33091,7 +33241,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33102,7 +33252,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33114,7 +33264,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33127,7 +33277,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33146,7 +33296,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33164,7 +33314,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33182,7 +33332,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33197,7 +33347,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 关联的计轴
+       * 关联的计轴(岔区&&非岔区)
        *
* * repeated string axleCountings = 7; @@ -33214,6 +33364,153 @@ 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; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -33278,6 +33575,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 { @@ -34123,40 +35522,68 @@ public final class LayoutGraphicsProto { int index); /** + * 
+     * 是否上行
+     *
+ * * bool isUp = 4; * @return The isUp. */ boolean getIsUp(); /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ java.util.List getKilometerPointsList(); /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint getKilometerPoints(int index); /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ int getKilometerPointsCount(); /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ java.util.List getKilometerPointsOrBuilderList(); /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPointOrBuilder getKilometerPointsOrBuilder( int index); /** - * bool aToB = 6; - * @return The aToB. + * 
+     * 运行方向是否公里标递增
+     *
+ * + * bool isKmIncrease = 6; + * @return The isKmIncrease. */ - boolean getAToB(); + boolean getIsKmIncrease(); } /** * Protobuf type {@code graphicData.PathLine} @@ -34305,6 +35732,10 @@ public final class LayoutGraphicsProto { public static final int ISUP_FIELD_NUMBER = 4; private boolean isUp_ = false; /** + * 
+     * 是否上行
+     *
+ * * bool isUp = 4; * @return The isUp. */ @@ -34317,6 +35748,10 @@ public final class LayoutGraphicsProto { @SuppressWarnings("serial") private java.util.List kilometerPoints_; /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ @java.lang.Override @@ -34324,6 +35759,10 @@ public final class LayoutGraphicsProto { return kilometerPoints_; } /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ @java.lang.Override @@ -34332,6 +35771,10 @@ public final class LayoutGraphicsProto { return kilometerPoints_; } /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ @java.lang.Override @@ -34339,6 +35782,10 @@ public final class LayoutGraphicsProto { return kilometerPoints_.size(); } /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ @java.lang.Override @@ -34346,6 +35793,10 @@ public final class LayoutGraphicsProto { return kilometerPoints_.get(index); } /** + * 
+     * 车站对应的公里标以及坐标点
+     *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ @java.lang.Override @@ -34354,15 +35805,19 @@ public final class LayoutGraphicsProto { return kilometerPoints_.get(index); } - public static final int ATOB_FIELD_NUMBER = 6; - private boolean aToB_ = false; + public static final int ISKMINCREASE_FIELD_NUMBER = 6; + private boolean isKmIncrease_ = false; /** - * bool aToB = 6; - * @return The aToB. + * 
+     * 运行方向是否公里标递增
+     *
+ * + * bool isKmIncrease = 6; + * @return The isKmIncrease. */ @java.lang.Override - public boolean getAToB() { - return aToB_; + public boolean getIsKmIncrease() { + return isKmIncrease_; } private byte memoizedIsInitialized = -1; @@ -34394,8 +35849,8 @@ public final class LayoutGraphicsProto { for (int i = 0; i < kilometerPoints_.size(); i++) { output.writeMessage(5, kilometerPoints_.get(i)); } - if (aToB_ != false) { - output.writeBool(6, aToB_); + if (isKmIncrease_ != false) { + output.writeBool(6, isKmIncrease_); } getUnknownFields().writeTo(output); } @@ -34425,9 +35880,9 @@ public final class LayoutGraphicsProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, kilometerPoints_.get(i)); } - if (aToB_ != false) { + if (isKmIncrease_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, aToB_); + .computeBoolSize(6, isKmIncrease_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -34457,8 +35912,8 @@ public final class LayoutGraphicsProto { != other.getIsUp()) return false; if (!getKilometerPointsList() .equals(other.getKilometerPointsList())) return false; - if (getAToB() - != other.getAToB()) return false; + if (getIsKmIncrease() + != other.getIsKmIncrease()) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -34487,9 +35942,9 @@ public final class LayoutGraphicsProto { hash = (37 * hash) + KILOMETERPOINTS_FIELD_NUMBER; hash = (53 * hash) + getKilometerPointsList().hashCode(); } - hash = (37 * hash) + ATOB_FIELD_NUMBER; + hash = (37 * hash) + ISKMINCREASE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getAToB()); + getIsKmIncrease()); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -34642,7 +36097,7 @@ public final class LayoutGraphicsProto { kilometerPointsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); - aToB_ = false; + isKmIncrease_ = false; return this; } @@ -34710,7 +36165,7 @@ public final class LayoutGraphicsProto { result.isUp_ = isUp_; } if (((from_bitField0_ & 0x00000020) != 0)) { - result.aToB_ = aToB_; + result.isKmIncrease_ = isKmIncrease_; } } @@ -34789,8 +36244,8 @@ public final class LayoutGraphicsProto { } } } - if (other.getAToB() != false) { - setAToB(other.getAToB()); + if (other.getIsKmIncrease() != false) { + setIsKmIncrease(other.getIsKmIncrease()); } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); @@ -34862,7 +36317,7 @@ public final class LayoutGraphicsProto { break; } // case 42 case 48: { - aToB_ = input.readBool(); + isKmIncrease_ = input.readBool(); bitField0_ |= 0x00000020; break; } // case 48 @@ -35316,6 +36771,10 @@ public final class LayoutGraphicsProto { private boolean isUp_ ; /** + * 
+       * 是否上行
+       *
+ * * bool isUp = 4; * @return The isUp. */ @@ -35324,6 +36783,10 @@ public final class LayoutGraphicsProto { return isUp_; } /** + * 
+       * 是否上行
+       *
+ * * bool isUp = 4; * @param value The isUp to set. * @return This builder for chaining. @@ -35336,6 +36799,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 是否上行
+       *
+ * * bool isUp = 4; * @return This builder for chaining. */ @@ -35359,6 +36826,10 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPointOrBuilder> kilometerPointsBuilder_; /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public java.util.List getKilometerPointsList() { @@ -35369,6 +36840,10 @@ public final class LayoutGraphicsProto { } } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public int getKilometerPointsCount() { @@ -35379,6 +36854,10 @@ public final class LayoutGraphicsProto { } } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint getKilometerPoints(int index) { @@ -35389,6 +36868,10 @@ public final class LayoutGraphicsProto { } } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder setKilometerPoints( @@ -35406,6 +36889,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder setKilometerPoints( @@ -35420,6 +36907,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder addKilometerPoints(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint value) { @@ -35436,6 +36927,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder addKilometerPoints( @@ -35453,6 +36948,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder addKilometerPoints( @@ -35467,6 +36966,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder addKilometerPoints( @@ -35481,6 +36984,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder addAllKilometerPoints( @@ -35496,6 +37003,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder clearKilometerPoints() { @@ -35509,6 +37020,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public Builder removeKilometerPoints(int index) { @@ -35522,6 +37037,10 @@ public final class LayoutGraphicsProto { return this; } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.Builder getKilometerPointsBuilder( @@ -35529,6 +37048,10 @@ public final class LayoutGraphicsProto { return getKilometerPointsFieldBuilder().getBuilder(index); } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPointOrBuilder getKilometerPointsOrBuilder( @@ -35539,6 +37062,10 @@ public final class LayoutGraphicsProto { } } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public java.util.List @@ -35550,6 +37077,10 @@ public final class LayoutGraphicsProto { } } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.Builder addKilometerPointsBuilder() { @@ -35557,6 +37088,10 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.getDefaultInstance()); } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.Builder addKilometerPointsBuilder( @@ -35565,6 +37100,10 @@ public final class LayoutGraphicsProto { index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPoint.getDefaultInstance()); } /** + * 
+       * 车站对应的公里标以及坐标点
+       *
+ * * repeated .graphicData.KilometerPoint kilometerPoints = 5; */ public java.util.List @@ -35586,34 +37125,46 @@ public final class LayoutGraphicsProto { return kilometerPointsBuilder_; } - private boolean aToB_ ; + private boolean isKmIncrease_ ; /** - * bool aToB = 6; - * @return The aToB. + * 
+       * 运行方向是否公里标递增
+       *
+ * + * bool isKmIncrease = 6; + * @return The isKmIncrease. */ @java.lang.Override - public boolean getAToB() { - return aToB_; + public boolean getIsKmIncrease() { + return isKmIncrease_; } /** - * bool aToB = 6; - * @param value The aToB to set. + * 
+       * 运行方向是否公里标递增
+       *
+ * + * bool isKmIncrease = 6; + * @param value The isKmIncrease to set. * @return This builder for chaining. */ - public Builder setAToB(boolean value) { + public Builder setIsKmIncrease(boolean value) { - aToB_ = value; + isKmIncrease_ = value; bitField0_ |= 0x00000020; onChanged(); return this; } /** - * bool aToB = 6; + * 
+       * 运行方向是否公里标递增
+       *
+ * + * bool isKmIncrease = 6; * @return This builder for chaining. */ - public Builder clearAToB() { + public Builder clearIsKmIncrease() { bitField0_ = (bitField0_ & ~0x00000020); - aToB_ = false; + isKmIncrease_ = false; onChanged(); return this; } @@ -37752,6 +39303,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 @@ -37866,32 +39422,35 @@ public final class LayoutGraphicsProto { "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" + + "neId\030\n \001(\t\"\306\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\"\267\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\014\n\004aToB" + - "\030\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndeviceType\030\001 \001(" + - "\0162\".graphicData.RelatedRef.DeviceType\022\n\n" + - "\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\".graphicD" + - "ata.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.joyli" + - "nk.xiannccda.dto.protosB\023LayoutGraphicsP" + - "rotob\006proto3" + "tionType\022\025\n\raxleCountings\030\007 \003(\t\022\020\n\010child" + + "ren\030\010 \003(\t\"0\n\013SectionType\022\014\n\010Physical\020\000\022\023" + + "\n\017TurnoutPhysical\020\002\"i\n\014LogicSection\022\'\n\006c" + + "ommon\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004" + + "code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData" + + ".Point\"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\006common\030\001 " + + "\001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 \001" + + "(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Point\022\014" + + "\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoints\030\005 \003(\0132\033." + + "graphicData.KilometerPoint\022\024\n\014isKmIncrea" + + "se\030\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndeviceType\030\001 " + + "\001(\0162\".graphicData.RelatedRef.DeviceType\022" + + "\n\n\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\".graphi" + + "cData.RelatedRef.DevicePort\"I\n\nDeviceTyp" + + "e\022\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013TrainWind" + + "ow\020\002\022\020\n\014AxleCounting\020\003\"!\n\nDevicePort\022\005\n\001" + + "A\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.joy" + + "link.xiannccda.dto.protosB\023LayoutGraphic" + + "sProtob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -38028,27 +39587,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", }); + 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", "AToB", }); + 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/dto/protos/NccAlertInfoMessageProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/NccAlertInfoMessageProto.java index a204305..4326253 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/NccAlertInfoMessageProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/NccAlertInfoMessageProto.java @@ -15,39 +15,39 @@ public final class NccAlertInfoMessageProto { (com.google.protobuf.ExtensionRegistryLite) registry); } public interface NccAlertInfoMessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:state.NccAlertInfoMessage) + // @@protoc_insertion_point(interface_extends:alert.NccAlertInfoMessage) com.google.protobuf.MessageOrBuilder { /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ java.util.List getMessagesList(); /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message getMessages(int index); /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ int getMessagesCount(); /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ java.util.List getMessagesOrBuilderList(); /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.MessageOrBuilder getMessagesOrBuilder( int index); } /** - * Protobuf type {@code state.NccAlertInfoMessage} + * Protobuf type {@code alert.NccAlertInfoMessage} */ public static final class NccAlertInfoMessage extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:state.NccAlertInfoMessage) + // @@protoc_insertion_point(message_implements:alert.NccAlertInfoMessage) NccAlertInfoMessageOrBuilder { private static final long serialVersionUID = 0L; // Use NccAlertInfoMessage.newBuilder() to construct. @@ -67,19 +67,19 @@ public final class NccAlertInfoMessageProto { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_fieldAccessorTable + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.class, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Builder.class); } public interface MessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:state.NccAlertInfoMessage.Message) + // @@protoc_insertion_point(interface_extends:alert.NccAlertInfoMessage.Message) com.google.protobuf.MessageOrBuilder { /** @@ -135,13 +135,53 @@ public final class NccAlertInfoMessageProto { * @return The alertTipId. */ int getAlertTipId(); + + /** + * 
+       *故障设备信息
+       *
+ * + * string device_info = 6; + * @return The deviceInfo. + */ + java.lang.String getDeviceInfo(); + /** + * 
+       *故障设备信息
+       *
+ * + * string device_info = 6; + * @return The bytes for deviceInfo. + */ + com.google.protobuf.ByteString + getDeviceInfoBytes(); + + /** + * 
+       *导致报警的原因
+       *
+ * + * string reason = 7; + * @return The reason. + */ + java.lang.String getReason(); + /** + * 
+       *导致报警的原因
+       *
+ * + * string reason = 7; + * @return The bytes for reason. + */ + com.google.protobuf.ByteString + getReasonBytes(); } /** - * Protobuf type {@code state.NccAlertInfoMessage.Message} + * Protobuf type {@code alert.NccAlertInfoMessage.Message} */ public static final class Message extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:state.NccAlertInfoMessage.Message) + // @@protoc_insertion_point(message_implements:alert.NccAlertInfoMessage.Message) MessageOrBuilder { private static final long serialVersionUID = 0L; // Use Message.newBuilder() to construct. @@ -153,6 +193,8 @@ public final class NccAlertInfoMessageProto { level_ = ""; alertTime_ = ""; info_ = ""; + deviceInfo_ = ""; + reason_ = ""; } @java.lang.Override @@ -164,13 +206,13 @@ public final class NccAlertInfoMessageProto { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_Message_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_Message_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_Message_fieldAccessorTable + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.class, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder.class); } @@ -342,6 +384,100 @@ public final class NccAlertInfoMessageProto { return alertTipId_; } + public static final int DEVICE_INFO_FIELD_NUMBER = 6; + @SuppressWarnings("serial") + private volatile java.lang.Object deviceInfo_ = ""; + /** + * 
+       *故障设备信息
+       *
+ * + * string device_info = 6; + * @return The deviceInfo. + */ + @java.lang.Override + public java.lang.String getDeviceInfo() { + java.lang.Object ref = deviceInfo_; + 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(); + deviceInfo_ = s; + return s; + } + } + /** + * 
+       *故障设备信息
+       *
+ * + * string device_info = 6; + * @return The bytes for deviceInfo. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getDeviceInfoBytes() { + java.lang.Object ref = deviceInfo_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + deviceInfo_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int REASON_FIELD_NUMBER = 7; + @SuppressWarnings("serial") + private volatile java.lang.Object reason_ = ""; + /** + * 
+       *导致报警的原因
+       *
+ * + * string reason = 7; + * @return The reason. + */ + @java.lang.Override + public java.lang.String getReason() { + java.lang.Object ref = reason_; + 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(); + reason_ = s; + return s; + } + } + /** + * 
+       *导致报警的原因
+       *
+ * + * string reason = 7; + * @return The bytes for reason. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getReasonBytes() { + java.lang.Object ref = reason_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + reason_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -371,6 +507,12 @@ public final class NccAlertInfoMessageProto { if (alertTipId_ != 0) { output.writeInt32(5, alertTipId_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceInfo_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, deviceInfo_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 7, reason_); + } getUnknownFields().writeTo(output); } @@ -396,6 +538,12 @@ public final class NccAlertInfoMessageProto { size += com.google.protobuf.CodedOutputStream .computeInt32Size(5, alertTipId_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceInfo_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, deviceInfo_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, reason_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -421,6 +569,10 @@ public final class NccAlertInfoMessageProto { .equals(other.getInfo())) return false; if (getAlertTipId() != other.getAlertTipId()) return false; + if (!getDeviceInfo() + .equals(other.getDeviceInfo())) return false; + if (!getReason() + .equals(other.getReason())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -442,6 +594,10 @@ public final class NccAlertInfoMessageProto { hash = (53 * hash) + getInfo().hashCode(); hash = (37 * hash) + ALERT_TIP_ID_FIELD_NUMBER; hash = (53 * hash) + getAlertTipId(); + hash = (37 * hash) + DEVICE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getDeviceInfo().hashCode(); + hash = (37 * hash) + REASON_FIELD_NUMBER; + hash = (53 * hash) + getReason().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -540,21 +696,21 @@ public final class NccAlertInfoMessageProto { return builder; } /** - * Protobuf type {@code state.NccAlertInfoMessage.Message} + * Protobuf type {@code alert.NccAlertInfoMessage.Message} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:state.NccAlertInfoMessage.Message) + // @@protoc_insertion_point(builder_implements:alert.NccAlertInfoMessage.Message) club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.MessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_Message_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_Message_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_Message_fieldAccessorTable + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.class, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder.class); } @@ -578,13 +734,15 @@ public final class NccAlertInfoMessageProto { alertTime_ = ""; info_ = ""; alertTipId_ = 0; + deviceInfo_ = ""; + reason_ = ""; return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_Message_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_Message_descriptor; } @java.lang.Override @@ -626,6 +784,12 @@ public final class NccAlertInfoMessageProto { if (((from_bitField0_ & 0x00000010) != 0)) { result.alertTipId_ = alertTipId_; } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.deviceInfo_ = deviceInfo_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.reason_ = reason_; + } } @java.lang.Override @@ -663,6 +827,16 @@ public final class NccAlertInfoMessageProto { if (other.getAlertTipId() != 0) { setAlertTipId(other.getAlertTipId()); } + if (!other.getDeviceInfo().isEmpty()) { + deviceInfo_ = other.deviceInfo_; + bitField0_ |= 0x00000020; + onChanged(); + } + if (!other.getReason().isEmpty()) { + reason_ = other.reason_; + bitField0_ |= 0x00000040; + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -714,6 +888,16 @@ public final class NccAlertInfoMessageProto { bitField0_ |= 0x00000010; break; } // case 40 + case 50: { + deviceInfo_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + reason_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -1050,6 +1234,190 @@ public final class NccAlertInfoMessageProto { onChanged(); return this; } + + private java.lang.Object deviceInfo_ = ""; + /** + * 
+         *故障设备信息
+         *
+ * + * string device_info = 6; + * @return The deviceInfo. + */ + public java.lang.String getDeviceInfo() { + java.lang.Object ref = deviceInfo_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + deviceInfo_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+         *故障设备信息
+         *
+ * + * string device_info = 6; + * @return The bytes for deviceInfo. + */ + public com.google.protobuf.ByteString + getDeviceInfoBytes() { + java.lang.Object ref = deviceInfo_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + deviceInfo_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+         *故障设备信息
+         *
+ * + * string device_info = 6; + * @param value The deviceInfo to set. + * @return This builder for chaining. + */ + public Builder setDeviceInfo( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + deviceInfo_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * 
+         *故障设备信息
+         *
+ * + * string device_info = 6; + * @return This builder for chaining. + */ + public Builder clearDeviceInfo() { + deviceInfo_ = getDefaultInstance().getDeviceInfo(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + /** + * 
+         *故障设备信息
+         *
+ * + * string device_info = 6; + * @param value The bytes for deviceInfo to set. + * @return This builder for chaining. + */ + public Builder setDeviceInfoBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + deviceInfo_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + + private java.lang.Object reason_ = ""; + /** + * 
+         *导致报警的原因
+         *
+ * + * string reason = 7; + * @return The reason. + */ + public java.lang.String getReason() { + java.lang.Object ref = reason_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + reason_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+         *导致报警的原因
+         *
+ * + * string reason = 7; + * @return The bytes for reason. + */ + public com.google.protobuf.ByteString + getReasonBytes() { + java.lang.Object ref = reason_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + reason_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+         *导致报警的原因
+         *
+ * + * string reason = 7; + * @param value The reason to set. + * @return This builder for chaining. + */ + public Builder setReason( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + reason_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * 
+         *导致报警的原因
+         *
+ * + * string reason = 7; + * @return This builder for chaining. + */ + public Builder clearReason() { + reason_ = getDefaultInstance().getReason(); + bitField0_ = (bitField0_ & ~0x00000040); + onChanged(); + return this; + } + /** + * 
+         *导致报警的原因
+         *
+ * + * string reason = 7; + * @param value The bytes for reason to set. + * @return This builder for chaining. + */ + public Builder setReasonBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + reason_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1063,10 +1431,10 @@ public final class NccAlertInfoMessageProto { } - // @@protoc_insertion_point(builder_scope:state.NccAlertInfoMessage.Message) + // @@protoc_insertion_point(builder_scope:alert.NccAlertInfoMessage.Message) } - // @@protoc_insertion_point(class_scope:state.NccAlertInfoMessage.Message) + // @@protoc_insertion_point(class_scope:alert.NccAlertInfoMessage.Message) private static final club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message(); @@ -1118,14 +1486,14 @@ public final class NccAlertInfoMessageProto { @SuppressWarnings("serial") private java.util.List messages_; /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ @java.lang.Override public java.util.List getMessagesList() { return messages_; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ @java.lang.Override public java.util.List @@ -1133,21 +1501,21 @@ public final class NccAlertInfoMessageProto { return messages_; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ @java.lang.Override public int getMessagesCount() { return messages_.size(); } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message getMessages(int index) { return messages_.get(index); } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.MessageOrBuilder getMessagesOrBuilder( @@ -1315,21 +1683,21 @@ public final class NccAlertInfoMessageProto { return builder; } /** - * Protobuf type {@code state.NccAlertInfoMessage} + * Protobuf type {@code alert.NccAlertInfoMessage} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:state.NccAlertInfoMessage) + // @@protoc_insertion_point(builder_implements:alert.NccAlertInfoMessage) club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_fieldAccessorTable + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.class, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Builder.class); } @@ -1361,7 +1729,7 @@ public final class NccAlertInfoMessageProto { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_state_NccAlertInfoMessage_descriptor; + return club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.internal_static_alert_NccAlertInfoMessage_descriptor; } @java.lang.Override @@ -1510,7 +1878,7 @@ public final class NccAlertInfoMessageProto { club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.MessageOrBuilder> messagesBuilder_; /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public java.util.List getMessagesList() { if (messagesBuilder_ == null) { @@ -1520,7 +1888,7 @@ public final class NccAlertInfoMessageProto { } } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public int getMessagesCount() { if (messagesBuilder_ == null) { @@ -1530,7 +1898,7 @@ public final class NccAlertInfoMessageProto { } } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message getMessages(int index) { if (messagesBuilder_ == null) { @@ -1540,7 +1908,7 @@ public final class NccAlertInfoMessageProto { } } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder setMessages( int index, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message value) { @@ -1557,7 +1925,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder setMessages( int index, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder builderForValue) { @@ -1571,7 +1939,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder addMessages(club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message value) { if (messagesBuilder_ == null) { @@ -1587,7 +1955,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder addMessages( int index, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message value) { @@ -1604,7 +1972,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder addMessages( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder builderForValue) { @@ -1618,7 +1986,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder addMessages( int index, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder builderForValue) { @@ -1632,7 +2000,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder addAllMessages( java.lang.Iterable values) { @@ -1647,7 +2015,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder clearMessages() { if (messagesBuilder_ == null) { @@ -1660,7 +2028,7 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public Builder removeMessages(int index) { if (messagesBuilder_ == null) { @@ -1673,14 +2041,14 @@ public final class NccAlertInfoMessageProto { return this; } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder getMessagesBuilder( int index) { return getMessagesFieldBuilder().getBuilder(index); } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.MessageOrBuilder getMessagesOrBuilder( int index) { @@ -1690,7 +2058,7 @@ public final class NccAlertInfoMessageProto { } } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public java.util.List getMessagesOrBuilderList() { @@ -1701,14 +2069,14 @@ public final class NccAlertInfoMessageProto { } } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder addMessagesBuilder() { return getMessagesFieldBuilder().addBuilder( club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.getDefaultInstance()); } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.Builder addMessagesBuilder( int index) { @@ -1716,7 +2084,7 @@ public final class NccAlertInfoMessageProto { index, club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage.Message.getDefaultInstance()); } /** - * repeated .state.NccAlertInfoMessage.Message messages = 1; + * repeated .alert.NccAlertInfoMessage.Message messages = 1; */ public java.util.List getMessagesBuilderList() { @@ -1749,10 +2117,10 @@ public final class NccAlertInfoMessageProto { } - // @@protoc_insertion_point(builder_scope:state.NccAlertInfoMessage) + // @@protoc_insertion_point(builder_scope:alert.NccAlertInfoMessage) } - // @@protoc_insertion_point(class_scope:state.NccAlertInfoMessage) + // @@protoc_insertion_point(class_scope:alert.NccAlertInfoMessage) private static final club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new club.joylink.xiannccda.dto.protos.NccAlertInfoMessageProto.NccAlertInfoMessage(); @@ -1801,15 +2169,15 @@ public final class NccAlertInfoMessageProto { } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_state_NccAlertInfoMessage_descriptor; + internal_static_alert_NccAlertInfoMessage_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_state_NccAlertInfoMessage_fieldAccessorTable; + internal_static_alert_NccAlertInfoMessage_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_state_NccAlertInfoMessage_Message_descriptor; + internal_static_alert_NccAlertInfoMessage_Message_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_state_NccAlertInfoMessage_Message_fieldAccessorTable; + internal_static_alert_NccAlertInfoMessage_Message_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1819,30 +2187,31 @@ public final class NccAlertInfoMessageProto { descriptor; static { java.lang.String[] descriptorData = { - "\n\017alertInfo.proto\022\005state\"\251\001\n\023NccAlertInf" + - "oMessage\0224\n\010messages\030\001 \003(\0132\".state.NccAl" + - "ertInfoMessage.Message\032\\\n\007Message\022\n\n\002id\030" + - "\001 \001(\t\022\r\n\005level\030\002 \001(\t\022\022\n\nalert_time\030\003 \001(\t" + - "\022\014\n\004info\030\004 \001(\t\022\024\n\014alert_tip_id\030\005 \001(\005B=\n!" + - "club.joylink.xiannccda.dto.protosB\030NccAl" + - "ertInfoMessageProtob\006proto3" + "\n\017alertInfo.proto\022\005alert\"\317\001\n\023NccAlertInf" + + "oMessage\0224\n\010messages\030\001 \003(\0132\".alert.NccAl" + + "ertInfoMessage.Message\032\201\001\n\007Message\022\n\n\002id" + + "\030\001 \001(\t\022\r\n\005level\030\002 \001(\t\022\022\n\nalert_time\030\003 \001(" + + "\t\022\014\n\004info\030\004 \001(\t\022\024\n\014alert_tip_id\030\005 \001(\005\022\023\n" + + "\013device_info\030\006 \001(\t\022\016\n\006reason\030\007 \001(\tB=\n!cl" + + "ub.joylink.xiannccda.dto.protosB\030NccAler" + + "tInfoMessageProtob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_state_NccAlertInfoMessage_descriptor = + internal_static_alert_NccAlertInfoMessage_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_state_NccAlertInfoMessage_fieldAccessorTable = new + internal_static_alert_NccAlertInfoMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_state_NccAlertInfoMessage_descriptor, + internal_static_alert_NccAlertInfoMessage_descriptor, new java.lang.String[] { "Messages", }); - internal_static_state_NccAlertInfoMessage_Message_descriptor = - internal_static_state_NccAlertInfoMessage_descriptor.getNestedTypes().get(0); - internal_static_state_NccAlertInfoMessage_Message_fieldAccessorTable = new + internal_static_alert_NccAlertInfoMessage_Message_descriptor = + internal_static_alert_NccAlertInfoMessage_descriptor.getNestedTypes().get(0); + internal_static_alert_NccAlertInfoMessage_Message_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_state_NccAlertInfoMessage_Message_descriptor, - new java.lang.String[] { "Id", "Level", "AlertTime", "Info", "AlertTipId", }); + internal_static_alert_NccAlertInfoMessage_Message_descriptor, + new java.lang.String[] { "Id", "Level", "AlertTime", "Info", "AlertTipId", "DeviceInfo", "Reason", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java index 11b234a..e2128b6 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java @@ -177,10 +177,20 @@ public final class TrainProto { * 目的地ID * * - * int32 destinationId = 10; + * string destinationId = 10; * @return The destinationId. */ - int getDestinationId(); + java.lang.String getDestinationId(); + /** + * 
+     * 目的地ID
+     *
+ * + * string destinationId = 10; + * @return The bytes for destinationId. + */ + com.google.protobuf.ByteString + getDestinationIdBytes(); /** * 
@@ -380,6 +390,7 @@ public final class TrainProto {
       groupId_ = "";
       trainId_ = "";
       globalId_ = "";
+      destinationId_ = "";
       driverId_ = "";
     }
 
@@ -721,18 +732,50 @@ public final class TrainProto {
     }
 
     public static final int DESTINATIONID_FIELD_NUMBER = 10;
-    private int destinationId_ = 0;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object destinationId_ = "";
     /**
      * 
      * 目的地ID
      * 

      *
-     * int32 destinationId = 10;
+     * string destinationId = 10;
      * @return The destinationId.
      */
     @java.lang.Override
-    public int getDestinationId() {
-      return destinationId_;
+    public java.lang.String getDestinationId() {
+      java.lang.Object ref = destinationId_;
+      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();
+        destinationId_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * 目的地ID
+     * 

+     *
+     * string destinationId = 10;
+     * @return The bytes for destinationId.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getDestinationIdBytes() {
+      java.lang.Object ref = destinationId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        destinationId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     public static final int ROLLINGSTOCK_FIELD_NUMBER = 11;
@@ -1062,8 +1105,8 @@ public final class TrainProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(globalId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 9, globalId_);
       }
-      if (destinationId_ != 0) {
-        output.writeInt32(10, destinationId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, destinationId_);
       }
       if (rollingStock_ != 0) {
         output.writeInt32(11, rollingStock_);
@@ -1144,9 +1187,8 @@ public final class TrainProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(globalId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, globalId_);
       }
-      if (destinationId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, destinationId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, destinationId_);
       }
       if (rollingStock_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1234,8 +1276,8 @@ public final class TrainProto {
           .equals(other.getTrainId())) return false;
       if (!getGlobalId()
           .equals(other.getGlobalId())) return false;
-      if (getDestinationId()
-          != other.getDestinationId()) return false;
+      if (!getDestinationId()
+          .equals(other.getDestinationId())) return false;
       if (getRollingStock()
           != other.getRollingStock()) return false;
       if (!getDriverId()
@@ -1307,7 +1349,7 @@ public final class TrainProto {
       hash = (37 * hash) + GLOBALID_FIELD_NUMBER;
       hash = (53 * hash) + getGlobalId().hashCode();
       hash = (37 * hash) + DESTINATIONID_FIELD_NUMBER;
-      hash = (53 * hash) + getDestinationId();
+      hash = (53 * hash) + getDestinationId().hashCode();
       hash = (37 * hash) + ROLLINGSTOCK_FIELD_NUMBER;
       hash = (53 * hash) + getRollingStock();
       hash = (37 * hash) + DRIVERID_FIELD_NUMBER;
@@ -1494,7 +1536,7 @@ public final class TrainProto {
         groupId_ = "";
         trainId_ = "";
         globalId_ = "";
-        destinationId_ = 0;
+        destinationId_ = "";
         rollingStock_ = 0;
         driverId_ = "";
         otpTime_ = 0;
@@ -1687,8 +1729,10 @@ public final class TrainProto {
           bitField0_ |= 0x00000100;
           onChanged();
         }
-        if (other.getDestinationId() != 0) {
-          setDestinationId(other.getDestinationId());
+        if (!other.getDestinationId().isEmpty()) {
+          destinationId_ = other.destinationId_;
+          bitField0_ |= 0x00000200;
+          onChanged();
         }
         if (other.getRollingStock() != 0) {
           setRollingStock(other.getRollingStock());
@@ -1804,11 +1848,11 @@ public final class TrainProto {
                 bitField0_ |= 0x00000100;
                 break;
               } // case 74
-              case 80: {
-                destinationId_ = input.readInt32();
+              case 82: {
+                destinationId_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000200;
                 break;
-              } // case 80
+              } // case 82
               case 88: {
                 rollingStock_ = input.readInt32();
                 bitField0_ |= 0x00000400;
@@ -2639,30 +2683,60 @@ public final class TrainProto {
         return this;
       }
 
-      private int destinationId_ ;
+      private java.lang.Object destinationId_ = "";
       /**
        * 
        * 目的地ID
        * 

        *
-       * int32 destinationId = 10;
+       * string destinationId = 10;
        * @return The destinationId.
        */
-      @java.lang.Override
-      public int getDestinationId() {
-        return destinationId_;
+      public java.lang.String getDestinationId() {
+        java.lang.Object ref = destinationId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          destinationId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
        * 
        * 目的地ID
        * 

        *
-       * int32 destinationId = 10;
+       * string destinationId = 10;
+       * @return The bytes for destinationId.
+       */
+      public com.google.protobuf.ByteString
+          getDestinationIdBytes() {
+        java.lang.Object ref = destinationId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          destinationId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       * 目的地ID
+       * 

+       *
+       * string destinationId = 10;
        * @param value The destinationId to set.
        * @return This builder for chaining.
        */
-      public Builder setDestinationId(int value) {
-
+      public Builder setDestinationId(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         destinationId_ = value;
         bitField0_ |= 0x00000200;
         onChanged();
@@ -2673,12 +2747,30 @@ public final class TrainProto {
        * 目的地ID
        *
* - * int32 destinationId = 10; + * string destinationId = 10; * @return This builder for chaining. */ public Builder clearDestinationId() { + destinationId_ = getDefaultInstance().getDestinationId(); bitField0_ = (bitField0_ & ~0x00000200); - destinationId_ = 0; + onChanged(); + return this; + } + /** + * 
+       * 目的地ID
+       *
+ * + * string destinationId = 10; + * @param value The bytes for destinationId to set. + * @return This builder for chaining. + */ + public Builder setDestinationIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + destinationId_ = value; + bitField0_ |= 0x00000200; onChanged(); return this; } @@ -9446,7 +9538,7 @@ public final class TrainProto { "\022\"\n\007devType\030\004 \001(\0162\021.state.DeviceType\022\017\n\007" + "devName\030\005 \001(\t\022\022\n\ntrainIndex\030\006 \001(\t\022\017\n\007gro" + "upId\030\007 \001(\t\022\017\n\007trainId\030\010 \001(\t\022\020\n\010globalId\030" + - "\t \001(\t\022\025\n\rdestinationId\030\n \001(\005\022\024\n\014rollingS" + + "\t \001(\t\022\025\n\rdestinationId\030\n \001(\t\022\024\n\014rollingS" + "tock\030\013 \001(\005\022\020\n\010driverId\030\014 \001(\t\022\017\n\007otpTime\030" + "\r \001(\005\022\036\n\004mode\030\016 \001(\0132\020.state.TrainMode\022\022\n" + "\narriveTime\030\017 \001(\003\022\022\n\ndepartTime\030\020 \001(\003\022\r\n" +