From 3bc08e12809a9bf359edba052763036d1d362268 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 29 Jun 2023 15:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E9=87=8C=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9long=E7=B1=BB=E5=9E=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ats/cache/LineGraphicDataRepository.java | 4 +- .../collect/DeviceStatusConvertorManager.java | 1 - .../convertor/LineNetTrainInitConvertor.java | 2 +- .../LineNetTrainRecordConvertor.java | 2 +- .../LineNetTrainRemoveConvertor.java | 2 +- .../LineNetTrainUpdateConvertor.java | 2 +- .../xiannccda/dto/protos/DeviceInfoProto.java | 192 +++++------ .../dto/protos/LayoutGraphicsProto.java | 308 +++++++++++++----- .../xiannccda/dto/protos/WsMessageProto.java | 155 ++------- 9 files changed, 340 insertions(+), 328 deletions(-) diff --git a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java index ea24c44..0a575f0 100644 --- a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java +++ b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java @@ -65,7 +65,7 @@ public class LineGraphicDataRepository { * @param sectionName 区段名称 * @return 公里标 */ - public static List getSectionDefaultKmCodeList(int lineId, String sectionName) { + public static List getSectionDefaultKmCodeList(int lineId, String sectionName) { Map> lineDataMap = lineGraphMap.get(lineId); if (CollectionUtils.isNotEmpty(lineDataMap)) { Map sectionMap = lineDataMap.get(DeviceType.Section.name()); @@ -165,7 +165,7 @@ public class LineGraphicDataRepository { ref -> { DeviceInfoProto.Section.Builder sectionBuilder = (DeviceInfoProto.Section.Builder) sectionMap.get(ref.getId()); - sectionBuilder.addKilometerCode(ac.getKilometerCode()); + sectionBuilder.addKilometerCode(Long.parseLong(ac.getKilometerCode())); })); } } diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusConvertorManager.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusConvertorManager.java index 73639a7..48178c4 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusConvertorManager.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusConvertorManager.java @@ -17,7 +17,6 @@ public class DeviceStatusConvertorManager { /** * 添加转换逻辑程序 * - * @param msgId 消息ID * @param convertor 转换对象 */ public static void addStatusConvertor(DeviceStatusConvertor convertor) { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java index 4e905d6..694e8da 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java @@ -50,7 +50,7 @@ public class LineNetTrainInitConvertor extends DeviceStatusConvertor { offset.setDir(0); // 初始设置无运行方向 // 获取到当前区段公里标 if (DeviceType.DEVICE_TYPE_TRACK.equals(trainCell.getDevType())) { - List kmCodeList = + List kmCodeList = LineGraphicDataRepository.getSectionDefaultKmCodeList( response.getLineId(), trainCell.getDevName()); if (CollectionUtils.isNotEmpty(kmCodeList)) { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java index 8f514b1..5e7472a 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java @@ -44,7 +44,7 @@ public class LineNetTrainRecordConvertor extends DeviceStatusConvertor { offset.setDir(response.getDirection().getValue()); // 初始设置无运行方向 offset.setShow(true); // 显示 // 获取到当前区段公里标 - List kmCodeList = + List kmCodeList = LineGraphicDataRepository.getSectionDefaultKmCodeList( response.getLineId(), response.getTrackName()); if (CollectionUtils.isNotEmpty(kmCodeList)) { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRemoveConvertor.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRemoveConvertor.java index 54a47bc..bf93bf5 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRemoveConvertor.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRemoveConvertor.java @@ -46,7 +46,7 @@ public class LineNetTrainRemoveConvertor extends DeviceStatusConvertor { offset.setShow(false); // 获取到当前区段公里标 if (DeviceType.DEVICE_TYPE_TRACK.equals(response.getDevType())) { - List kmCodeList = + List kmCodeList = LineGraphicDataRepository.getSectionDefaultKmCodeList( response.getLineId(), response.getDevName()); if (CollectionUtils.isNotEmpty(kmCodeList)) { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java index a48af6f..de49f67 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java @@ -49,7 +49,7 @@ public class LineNetTrainUpdateConvertor extends DeviceStatusConvertor { offset.setDir(0); // 初始设置无运行方向 // 获取到当前区段公里标 if (DeviceType.DEVICE_TYPE_TRACK.equals(response.getDevType())) { - List kmCodeList = + List kmCodeList = LineGraphicDataRepository.getSectionDefaultKmCodeList( response.getLineId(), response.getDevName()); if (CollectionUtils.isNotEmpty(kmCodeList)) { diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java index 586de61..10a6726 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java @@ -74,17 +74,16 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return A list containing the kilometerCode. */ - java.util.List - getKilometerCodeList(); + java.util.List getKilometerCodeList(); /** * 
      * 公里标
      *
* - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return The count of kilometerCode. */ int getKilometerCodeCount(); @@ -93,22 +92,11 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param index The index of the element to return. * @return The kilometerCode at the given index. */ - java.lang.String getKilometerCode(int index); - /** - * 
-     * 公里标
-     *
- * - * repeated string kilometerCode = 4; - * @param index The index of the value to return. - * @return The bytes of the kilometerCode at the given index. - */ - com.google.protobuf.ByteString - getKilometerCodeBytes(int index); + long getKilometerCode(int index); /** * 
@@ -174,8 +162,7 @@ public final class DeviceInfoProto {
       id_ = "";
       code_ = "";
       type_ = 0;
-      kilometerCode_ =
-          com.google.protobuf.LazyStringArrayList.emptyList();
+      kilometerCode_ = emptyLongList();
       children_ = java.util.Collections.emptyList();
     }
 
@@ -313,17 +300,17 @@ public final class DeviceInfoProto {
 
     public static final int KILOMETERCODE_FIELD_NUMBER = 4;
     @SuppressWarnings("serial")
-    private com.google.protobuf.LazyStringArrayList kilometerCode_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.Internal.LongList kilometerCode_;
     /**
      * 
      * 公里标
      * 

      *
-     * repeated string kilometerCode = 4;
+     * repeated int64 kilometerCode = 4;
      * @return A list containing the kilometerCode.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Override
+    public java.util.List
         getKilometerCodeList() {
       return kilometerCode_;
     }
@@ -332,7 +319,7 @@ public final class DeviceInfoProto {
      * 公里标
      *
* - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return The count of kilometerCode. */ public int getKilometerCodeCount() { @@ -343,26 +330,14 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param index The index of the element to return. * @return The kilometerCode at the given index. */ - public java.lang.String getKilometerCode(int index) { - return kilometerCode_.get(index); - } - /** - * 
-     * 公里标
-     *
- * - * repeated string kilometerCode = 4; - * @param index The index of the value to return. - * @return The bytes of the kilometerCode at the given index. - */ - public com.google.protobuf.ByteString - getKilometerCodeBytes(int index) { - return kilometerCode_.getByteString(index); + public long getKilometerCode(int index) { + return kilometerCode_.getLong(index); } + private int kilometerCodeMemoizedSerializedSize = -1; public static final int CHILDREN_FIELD_NUMBER = 5; @SuppressWarnings("serial") @@ -439,6 +414,7 @@ public final class DeviceInfoProto { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + getSerializedSize(); if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_); } @@ -448,8 +424,12 @@ public final class DeviceInfoProto { if (type_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.Physical.getNumber()) { output.writeEnum(3, type_); } + if (getKilometerCodeList().size() > 0) { + output.writeUInt32NoTag(34); + output.writeUInt32NoTag(kilometerCodeMemoizedSerializedSize); + } for (int i = 0; i < kilometerCode_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, kilometerCode_.getRaw(i)); + output.writeInt64NoTag(kilometerCode_.getLong(i)); } for (int i = 0; i < children_.size(); i++) { output.writeMessage(5, children_.get(i)); @@ -476,10 +456,16 @@ public final class DeviceInfoProto { { int dataSize = 0; for (int i = 0; i < kilometerCode_.size(); i++) { - dataSize += computeStringSizeNoTag(kilometerCode_.getRaw(i)); + dataSize += com.google.protobuf.CodedOutputStream + .computeInt64SizeNoTag(kilometerCode_.getLong(i)); } size += dataSize; - size += 1 * getKilometerCodeList().size(); + if (!getKilometerCodeList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + kilometerCodeMemoizedSerializedSize = dataSize; } for (int i = 0; i < children_.size(); i++) { size += com.google.protobuf.CodedOutputStream @@ -672,8 +658,7 @@ public final class DeviceInfoProto { id_ = ""; code_ = ""; type_ = 0; - kilometerCode_ = - com.google.protobuf.LazyStringArrayList.emptyList(); + kilometerCode_ = emptyLongList(); if (childrenBuilder_ == null) { children_ = java.util.Collections.emptyList(); } else { @@ -714,6 +699,11 @@ public final class DeviceInfoProto { } private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section result) { + if (((bitField0_ & 0x00000008) != 0)) { + kilometerCode_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.kilometerCode_ = kilometerCode_; if (childrenBuilder_ == null) { if (((bitField0_ & 0x00000010) != 0)) { children_ = java.util.Collections.unmodifiableList(children_); @@ -736,10 +726,6 @@ public final class DeviceInfoProto { if (((from_bitField0_ & 0x00000004) != 0)) { result.type_ = type_; } - if (((from_bitField0_ & 0x00000008) != 0)) { - kilometerCode_.makeImmutable(); - result.kilometerCode_ = kilometerCode_; - } } @java.lang.Override @@ -770,7 +756,7 @@ public final class DeviceInfoProto { if (!other.kilometerCode_.isEmpty()) { if (kilometerCode_.isEmpty()) { kilometerCode_ = other.kilometerCode_; - bitField0_ |= 0x00000008; + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureKilometerCodeIsMutable(); kilometerCode_.addAll(other.kilometerCode_); @@ -844,10 +830,20 @@ public final class DeviceInfoProto { bitField0_ |= 0x00000004; break; } // case 24 - case 34: { - java.lang.String s = input.readStringRequireUtf8(); + case 32: { + long v = input.readInt64(); ensureKilometerCodeIsMutable(); - kilometerCode_.add(s); + kilometerCode_.addLong(v); + break; + } // case 32 + case 34: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureKilometerCodeIsMutable(); + while (input.getBytesUntilLimit() > 0) { + kilometerCode_.addLong(input.readInt64()); + } + input.popLimit(limit); break; } // case 34 case 42: { @@ -1117,33 +1113,32 @@ public final class DeviceInfoProto { return this; } - private com.google.protobuf.LazyStringArrayList kilometerCode_ = - com.google.protobuf.LazyStringArrayList.emptyList(); + private com.google.protobuf.Internal.LongList kilometerCode_ = emptyLongList(); private void ensureKilometerCodeIsMutable() { - if (!kilometerCode_.isModifiable()) { - kilometerCode_ = new com.google.protobuf.LazyStringArrayList(kilometerCode_); + if (!((bitField0_ & 0x00000008) != 0)) { + kilometerCode_ = mutableCopy(kilometerCode_); + bitField0_ |= 0x00000008; } - bitField0_ |= 0x00000008; } /** * 
        * 公里标
        *
* - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return A list containing the kilometerCode. */ - public com.google.protobuf.ProtocolStringList + public java.util.List getKilometerCodeList() { - kilometerCode_.makeImmutable(); - return kilometerCode_; + return ((bitField0_ & 0x00000008) != 0) ? + java.util.Collections.unmodifiableList(kilometerCode_) : kilometerCode_; } /** * 
        * 公里标
        *
* - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return The count of kilometerCode. */ public int getKilometerCodeCount() { @@ -1154,42 +1149,28 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param index The index of the element to return. * @return The kilometerCode at the given index. */ - public java.lang.String getKilometerCode(int index) { - return kilometerCode_.get(index); + public long getKilometerCode(int index) { + return kilometerCode_.getLong(index); } /** * 
        * 公里标
        *
* - * repeated string kilometerCode = 4; - * @param index The index of the value to return. - * @return The bytes of the kilometerCode at the given index. - */ - public com.google.protobuf.ByteString - getKilometerCodeBytes(int index) { - return kilometerCode_.getByteString(index); - } - /** - * 
-       * 公里标
-       *
- * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param index The index to set the value at. * @param value The kilometerCode to set. * @return This builder for chaining. */ public Builder setKilometerCode( - int index, java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + int index, long value) { + ensureKilometerCodeIsMutable(); - kilometerCode_.set(index, value); - bitField0_ |= 0x00000008; + kilometerCode_.setLong(index, value); onChanged(); return this; } @@ -1198,16 +1179,14 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param value The kilometerCode to add. * @return This builder for chaining. */ - public Builder addKilometerCode( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder addKilometerCode(long value) { + ensureKilometerCodeIsMutable(); - kilometerCode_.add(value); - bitField0_ |= 0x00000008; + kilometerCode_.addLong(value); onChanged(); return this; } @@ -1216,16 +1195,15 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @param values The kilometerCode to add. * @return This builder for chaining. */ public Builder addAllKilometerCode( - java.lang.Iterable values) { + java.lang.Iterable values) { ensureKilometerCodeIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, kilometerCode_); - bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1234,32 +1212,12 @@ public final class DeviceInfoProto { * 公里标 * * - * repeated string kilometerCode = 4; + * repeated int64 kilometerCode = 4; * @return This builder for chaining. */ public Builder clearKilometerCode() { - kilometerCode_ = - com.google.protobuf.LazyStringArrayList.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008);; - onChanged(); - return this; - } - /** - * 
-       * 公里标
-       *
- * - * repeated string kilometerCode = 4; - * @param value The bytes of the kilometerCode to add. - * @return This builder for chaining. - */ - public Builder addKilometerCodeBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } - checkByteStringIsUtf8(value); - ensureKilometerCodeIsMutable(); - kilometerCode_.add(value); - bitField0_ |= 0x00000008; + kilometerCode_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -2926,7 +2884,7 @@ public final class DeviceInfoProto { "tGraphics.proto\"\214\001\n\007Section\022\n\n\002id\030\001 \001(\t\022" + "\014\n\004code\030\002 \001(\t\022.\n\004type\030\003 \001(\0162 .graphicDat" + "a.Section.SectionType\022\025\n\rkilometerCode\030\004" + - " \003(\t\022 \n\010children\030\005 \003(\0132\016.state.Section\"\213" + + " \003(\003\022 \n\010children\030\005 \003(\0132\016.state.Section\"\213" + "\001\n\006Switch\022\n\n\002id\030\001 \001(\t\022\014\n\004code\030\002 \001(\t\022!\n\tp" + "aSection\030\003 \001(\0132\016.state.Section\022!\n\tpbSect" + "ion\030\004 \001(\0132\016.state.Section\022!\n\tpcSection\030\005" + 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 a64b558..bd4b1a3 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java @@ -26462,10 +26462,22 @@ public final class LayoutGraphicsProto { boolean getMirror(); /** - * float kilometer = 4; + * int64 kilometer = 4; * @return The kilometer. */ - float getKilometer(); + long getKilometer(); + + /** + * string coordinateSystem = 5; + * @return The coordinateSystem. + */ + java.lang.String getCoordinateSystem(); + /** + * string coordinateSystem = 5; + * @return The bytes for coordinateSystem. + */ + com.google.protobuf.ByteString + getCoordinateSystemBytes(); } /** * Protobuf type {@code graphicData.Signal} @@ -26481,6 +26493,7 @@ public final class LayoutGraphicsProto { } private Signal() { code_ = ""; + coordinateSystem_ = ""; } @java.lang.Override @@ -26580,16 +26593,55 @@ public final class LayoutGraphicsProto { } public static final int KILOMETER_FIELD_NUMBER = 4; - private float kilometer_ = 0F; + private long kilometer_ = 0L; /** - * float kilometer = 4; + * int64 kilometer = 4; * @return The kilometer. */ @java.lang.Override - public float getKilometer() { + public long getKilometer() { return kilometer_; } + public static final int COORDINATESYSTEM_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private volatile java.lang.Object coordinateSystem_ = ""; + /** + * string coordinateSystem = 5; + * @return The coordinateSystem. + */ + @java.lang.Override + public java.lang.String getCoordinateSystem() { + java.lang.Object ref = coordinateSystem_; + 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(); + coordinateSystem_ = s; + return s; + } + } + /** + * string coordinateSystem = 5; + * @return The bytes for coordinateSystem. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getCoordinateSystemBytes() { + java.lang.Object ref = coordinateSystem_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + coordinateSystem_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -26613,8 +26665,11 @@ public final class LayoutGraphicsProto { if (mirror_ != false) { output.writeBool(3, mirror_); } - if (java.lang.Float.floatToRawIntBits(kilometer_) != 0) { - output.writeFloat(4, kilometer_); + if (kilometer_ != 0L) { + output.writeInt64(4, kilometer_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(coordinateSystem_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, coordinateSystem_); } getUnknownFields().writeTo(output); } @@ -26636,9 +26691,12 @@ public final class LayoutGraphicsProto { size += com.google.protobuf.CodedOutputStream .computeBoolSize(3, mirror_); } - if (java.lang.Float.floatToRawIntBits(kilometer_) != 0) { + if (kilometer_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(4, kilometer_); + .computeInt64Size(4, kilometer_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(coordinateSystem_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, coordinateSystem_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -26664,9 +26722,10 @@ public final class LayoutGraphicsProto { .equals(other.getCode())) return false; if (getMirror() != other.getMirror()) return false; - if (java.lang.Float.floatToIntBits(getKilometer()) - != java.lang.Float.floatToIntBits( - other.getKilometer())) return false; + if (getKilometer() + != other.getKilometer()) return false; + if (!getCoordinateSystem() + .equals(other.getCoordinateSystem())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -26688,8 +26747,10 @@ public final class LayoutGraphicsProto { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getMirror()); hash = (37 * hash) + KILOMETER_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getKilometer()); + hash = (37 * hash) + COORDINATESYSTEM_FIELD_NUMBER; + hash = (53 * hash) + getCoordinateSystem().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -26828,7 +26889,8 @@ public final class LayoutGraphicsProto { } code_ = ""; mirror_ = false; - kilometer_ = 0F; + kilometer_ = 0L; + coordinateSystem_ = ""; return this; } @@ -26876,6 +26938,9 @@ public final class LayoutGraphicsProto { if (((from_bitField0_ & 0x00000008) != 0)) { result.kilometer_ = kilometer_; } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.coordinateSystem_ = coordinateSystem_; + } } @java.lang.Override @@ -26901,9 +26966,14 @@ public final class LayoutGraphicsProto { if (other.getMirror() != false) { setMirror(other.getMirror()); } - if (other.getKilometer() != 0F) { + if (other.getKilometer() != 0L) { setKilometer(other.getKilometer()); } + if (!other.getCoordinateSystem().isEmpty()) { + coordinateSystem_ = other.coordinateSystem_; + bitField0_ |= 0x00000010; + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -26947,11 +27017,16 @@ public final class LayoutGraphicsProto { bitField0_ |= 0x00000004; break; } // case 24 - case 37: { - kilometer_ = input.readFloat(); + case 32: { + kilometer_ = input.readInt64(); bitField0_ |= 0x00000008; break; - } // case 37 + } // case 32 + case 42: { + coordinateSystem_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -27192,21 +27267,21 @@ public final class LayoutGraphicsProto { return this; } - private float kilometer_ ; + private long kilometer_ ; /** - * float kilometer = 4; + * int64 kilometer = 4; * @return The kilometer. */ @java.lang.Override - public float getKilometer() { + public long getKilometer() { return kilometer_; } /** - * float kilometer = 4; + * int64 kilometer = 4; * @param value The kilometer to set. * @return This builder for chaining. */ - public Builder setKilometer(float value) { + public Builder setKilometer(long value) { kilometer_ = value; bitField0_ |= 0x00000008; @@ -27214,12 +27289,84 @@ public final class LayoutGraphicsProto { return this; } /** - * float kilometer = 4; + * int64 kilometer = 4; * @return This builder for chaining. */ public Builder clearKilometer() { bitField0_ = (bitField0_ & ~0x00000008); - kilometer_ = 0F; + kilometer_ = 0L; + onChanged(); + return this; + } + + private java.lang.Object coordinateSystem_ = ""; + /** + * string coordinateSystem = 5; + * @return The coordinateSystem. + */ + public java.lang.String getCoordinateSystem() { + java.lang.Object ref = coordinateSystem_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + coordinateSystem_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string coordinateSystem = 5; + * @return The bytes for coordinateSystem. + */ + public com.google.protobuf.ByteString + getCoordinateSystemBytes() { + java.lang.Object ref = coordinateSystem_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + coordinateSystem_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string coordinateSystem = 5; + * @param value The coordinateSystem to set. + * @return This builder for chaining. + */ + public Builder setCoordinateSystem( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + coordinateSystem_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * string coordinateSystem = 5; + * @return This builder for chaining. + */ + public Builder clearCoordinateSystem() { + coordinateSystem_ = getDefaultInstance().getCoordinateSystem(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * string coordinateSystem = 5; + * @param value The bytes for coordinateSystem to set. + * @return This builder for chaining. + */ + public Builder setCoordinateSystemBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + coordinateSystem_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -31353,10 +31500,10 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.PointOrBuilder getPointOrBuilder(); /** - * float kilometer = 2; + * int64 kilometer = 2; * @return The kilometer. */ - float getKilometer(); + long getKilometer(); /** * string stName = 3; @@ -31433,13 +31580,13 @@ public final class LayoutGraphicsProto { } public static final int KILOMETER_FIELD_NUMBER = 2; - private float kilometer_ = 0F; + private long kilometer_ = 0L; /** - * float kilometer = 2; + * int64 kilometer = 2; * @return The kilometer. */ @java.lang.Override - public float getKilometer() { + public long getKilometer() { return kilometer_; } @@ -31499,8 +31646,8 @@ public final class LayoutGraphicsProto { if (point_ != null) { output.writeMessage(1, getPoint()); } - if (java.lang.Float.floatToRawIntBits(kilometer_) != 0) { - output.writeFloat(2, kilometer_); + if (kilometer_ != 0L) { + output.writeInt64(2, kilometer_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, stName_); @@ -31518,9 +31665,9 @@ public final class LayoutGraphicsProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getPoint()); } - if (java.lang.Float.floatToRawIntBits(kilometer_) != 0) { + if (kilometer_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, kilometer_); + .computeInt64Size(2, kilometer_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, stName_); @@ -31545,9 +31692,8 @@ public final class LayoutGraphicsProto { if (!getPoint() .equals(other.getPoint())) return false; } - if (java.lang.Float.floatToIntBits(getKilometer()) - != java.lang.Float.floatToIntBits( - other.getKilometer())) return false; + if (getKilometer() + != other.getKilometer()) return false; if (!getStName() .equals(other.getStName())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; @@ -31566,7 +31712,7 @@ public final class LayoutGraphicsProto { hash = (53 * hash) + getPoint().hashCode(); } hash = (37 * hash) + KILOMETER_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getKilometer()); hash = (37 * hash) + STNAME_FIELD_NUMBER; hash = (53 * hash) + getStName().hashCode(); @@ -31706,7 +31852,7 @@ public final class LayoutGraphicsProto { pointBuilder_.dispose(); pointBuilder_ = null; } - kilometer_ = 0F; + kilometer_ = 0L; stName_ = ""; return this; } @@ -31769,7 +31915,7 @@ public final class LayoutGraphicsProto { if (other.hasPoint()) { mergePoint(other.getPoint()); } - if (other.getKilometer() != 0F) { + if (other.getKilometer() != 0L) { setKilometer(other.getKilometer()); } if (!other.getStName().isEmpty()) { @@ -31810,11 +31956,11 @@ public final class LayoutGraphicsProto { bitField0_ |= 0x00000001; break; } // case 10 - case 21: { - kilometer_ = input.readFloat(); + case 16: { + kilometer_ = input.readInt64(); bitField0_ |= 0x00000002; break; - } // case 21 + } // case 16 case 26: { stName_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000004; @@ -31956,21 +32102,21 @@ public final class LayoutGraphicsProto { return pointBuilder_; } - private float kilometer_ ; + private long kilometer_ ; /** - * float kilometer = 2; + * int64 kilometer = 2; * @return The kilometer. */ @java.lang.Override - public float getKilometer() { + public long getKilometer() { return kilometer_; } /** - * float kilometer = 2; + * int64 kilometer = 2; * @param value The kilometer to set. * @return This builder for chaining. */ - public Builder setKilometer(float value) { + public Builder setKilometer(long value) { kilometer_ = value; bitField0_ |= 0x00000002; @@ -31978,12 +32124,12 @@ public final class LayoutGraphicsProto { return this; } /** - * float kilometer = 2; + * int64 kilometer = 2; * @return This builder for chaining. */ public Builder clearKilometer() { bitField0_ = (bitField0_ & ~0x00000002); - kilometer_ = 0F; + kilometer_ = 0L; onChanged(); return this; } @@ -34953,37 +35099,37 @@ public final class LayoutGraphicsProto { "oint\022&\n\005paRef\030\t \001(\0132\027.graphicData.Relate" + "dRef\022&\n\005pbRef\030\n \001(\0132\027.graphicData.Relate" + "dRef\022&\n\005pcRef\030\013 \001(\0132\027.graphicData.Relate" + - "dRef\"b\n\006Signal\022\'\n\006common\030\001 \001(\0132\027.graphic" + + "dRef\"|\n\006Signal\022\'\n\006common\030\001 \001(\0132\027.graphic" + "Data.CommonInfo\022\014\n\004code\030\002 \001(\t\022\016\n\006mirror\030" + - "\003 \001(\010\022\021\n\tkilometer\030\004 \001(\002\"\316\001\n\007RunLine\022\'\n\006" + - "common\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n" + - "\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicDat" + - "a.Point\022\021\n\tnameColor\030\004 \001(\t\022\023\n\013nameBgColo" + - "r\030\005 \001(\t\022\024\n\014upPathLineId\030\006 \001(\t\022\026\n\016downPat" + - "hLineId\030\007 \001(\t\022\022\n\ncontainSta\030\010 \003(\t\"\272\002\n\007Se" + - "ction\022\'\n\006common\030\001 \001(\0132\027.graphicData.Comm" + - "onInfo\022\014\n\004code\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.g" + - "raphicData.Point\022&\n\005paRef\030\004 \001(\0132\027.graphi" + - "cData.RelatedRef\022&\n\005pbRef\030\005 \001(\0132\027.graphi" + - "cData.RelatedRef\0225\n\013sectionType\030\006 \001(\0162 ." + - "graphicData.Section.SectionType\022\020\n\010child" + - "ren\030\007 \003(\t\";\n\013SectionType\022\014\n\010Physical\020\000\022\t" + - "\n\005Logic\020\001\022\023\n\017TurnoutPhysical\020\002\"V\n\016Kilome" + - "terPoint\022!\n\005point\030\001 \001(\0132\022.graphicData.Po" + - "int\022\021\n\tkilometer\030\002 \001(\002\022\016\n\006stName\030\003 \001(\t\"\251" + - "\001\n\010PathLine\022\'\n\006common\030\001 \001(\0132\027.graphicDat" + - "a.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\017" + - "kilometerPoints\030\005 \003(\0132\033.graphicData.Kilo" + - "meterPoint\"\366\001\n\nRelatedRef\0226\n\ndeviceType\030" + - "\001 \001(\0162\".graphicData.RelatedRef.DeviceTyp" + - "e\022\n\n\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\".grap" + - "hicData.RelatedRef.DevicePort\"I\n\nDeviceT" + - "ype\022\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013TrainWi" + - "ndow\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\002B8\n!club.joylink.xian" + - "nccda.dto.protosB\023LayoutGraphicsProtob\006p" + - "roto3" + "\003 \001(\010\022\021\n\tkilometer\030\004 \001(\003\022\030\n\020coordinateSy" + + "stem\030\005 \001(\t\"\316\001\n\007RunLine\022\'\n\006common\030\001 \001(\0132\027" + + ".graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n" + + "\006points\030\003 \003(\0132\022.graphicData.Point\022\021\n\tnam" + + "eColor\030\004 \001(\t\022\023\n\013nameBgColor\030\005 \001(\t\022\024\n\014upP" + + "athLineId\030\006 \001(\t\022\026\n\016downPathLineId\030\007 \001(\t\022" + + "\022\n\ncontainSta\030\010 \003(\t\"\272\002\n\007Section\022\'\n\006commo" + + "n\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004code" + + "\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Poi" + + "nt\022&\n\005paRef\030\004 \001(\0132\027.graphicData.RelatedR" + + "ef\022&\n\005pbRef\030\005 \001(\0132\027.graphicData.RelatedR" + + "ef\0225\n\013sectionType\030\006 \001(\0162 .graphicData.Se" + + "ction.SectionType\022\020\n\010children\030\007 \003(\t\";\n\013S" + + "ectionType\022\014\n\010Physical\020\000\022\t\n\005Logic\020\001\022\023\n\017T" + + "urnoutPhysical\020\002\"V\n\016KilometerPoint\022!\n\005po" + + "int\030\001 \001(\0132\022.graphicData.Point\022\021\n\tkilomet" + + "er\030\002 \001(\003\022\016\n\006stName\030\003 \001(\t\"\251\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.graphicDa" + + "ta.Point\022\014\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoint" + + "s\030\005 \003(\0132\033.graphicData.KilometerPoint\"\366\001\n" + + "\nRelatedRef\0226\n\ndeviceType\030\001 \001(\0162\".graphi" + + "cData.RelatedRef.DeviceType\022\n\n\002id\030\002 \001(\t\022" + + "6\n\ndevicePort\030\003 \001(\0162\".graphicData.Relate" + + "dRef.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\014Axle" + + "Counting\020\003\"!\n\nDevicePort\022\005\n\001A\020\000\022\005\n\001B\020\001\022\005" + + "\n\001C\020\002B8\n!club.joylink.xiannccda.dto.prot" + + "osB\023LayoutGraphicsProtob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -35102,7 +35248,7 @@ public final class LayoutGraphicsProto { internal_static_graphicData_Signal_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_Signal_descriptor, - new java.lang.String[] { "Common", "Code", "Mirror", "Kilometer", }); + new java.lang.String[] { "Common", "Code", "Mirror", "Kilometer", "CoordinateSystem", }); internal_static_graphicData_RunLine_descriptor = getDescriptor().getMessageTypes().get(19); internal_static_graphicData_RunLine_fieldAccessorTable = new diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java index 48347eb..fa71292 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java @@ -7985,20 +7985,10 @@ public final class WsMessageProto { * 列车公里标 * * - * string kilometerCode = 6; + * int64 kilometerCode = 6; * @return The kilometerCode. */ - java.lang.String getKilometerCode(); - /** - * 
-     * 列车公里标
-     *
- * - * string kilometerCode = 6; - * @return The bytes for kilometerCode. - */ - com.google.protobuf.ByteString - getKilometerCodeBytes(); + long getKilometerCode(); /** * 
@@ -8029,7 +8019,6 @@ public final class WsMessageProto {
     private WsLineNetTrainOffsetMessage() {
       trainIndex_ = "";
       groupId_ = "";
-      kilometerCode_ = "";
     }
 
     @java.lang.Override
@@ -8192,50 +8181,18 @@ public final class WsMessageProto {
     }
 
     public static final int KILOMETERCODE_FIELD_NUMBER = 6;
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object kilometerCode_ = "";
+    private long kilometerCode_ = 0L;
     /**
      * 
      * 列车公里标
      * 

      *
-     * string kilometerCode = 6;
+     * int64 kilometerCode = 6;
      * @return The kilometerCode.
      */
     @java.lang.Override
-    public java.lang.String getKilometerCode() {
-      java.lang.Object ref = kilometerCode_;
-      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();
-        kilometerCode_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * 列车公里标
-     * 

-     *
-     * string kilometerCode = 6;
-     * @return The bytes for kilometerCode.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getKilometerCodeBytes() {
-      java.lang.Object ref = kilometerCode_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        kilometerCode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public long getKilometerCode() {
+      return kilometerCode_;
     }
 
     public static final int DIR_FIELD_NUMBER = 7;
@@ -8282,8 +8239,8 @@ public final class WsMessageProto {
       if (show_ != false) {
         output.writeBool(5, show_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kilometerCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, kilometerCode_);
+      if (kilometerCode_ != 0L) {
+        output.writeInt64(6, kilometerCode_);
       }
       if (dir_ != 0) {
         output.writeInt32(7, dir_);
@@ -8315,8 +8272,9 @@ public final class WsMessageProto {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(5, show_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kilometerCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, kilometerCode_);
+      if (kilometerCode_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(6, kilometerCode_);
       }
       if (dir_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -8347,8 +8305,8 @@ public final class WsMessageProto {
           != other.getDestinationId()) return false;
       if (getShow()
           != other.getShow()) return false;
-      if (!getKilometerCode()
-          .equals(other.getKilometerCode())) return false;
+      if (getKilometerCode()
+          != other.getKilometerCode()) return false;
       if (getDir()
           != other.getDir()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
@@ -8374,7 +8332,8 @@ public final class WsMessageProto {
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getShow());
       hash = (37 * hash) + KILOMETERCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getKilometerCode().hashCode();
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getKilometerCode());
       hash = (37 * hash) + DIR_FIELD_NUMBER;
       hash = (53 * hash) + getDir();
       hash = (29 * hash) + getUnknownFields().hashCode();
@@ -8517,7 +8476,7 @@ public final class WsMessageProto {
         groupId_ = "";
         destinationId_ = 0;
         show_ = false;
-        kilometerCode_ = "";
+        kilometerCode_ = 0L;
         dir_ = 0;
         return this;
       }
@@ -8606,10 +8565,8 @@ public final class WsMessageProto {
         if (other.getShow() != false) {
           setShow(other.getShow());
         }
-        if (!other.getKilometerCode().isEmpty()) {
-          kilometerCode_ = other.kilometerCode_;
-          bitField0_ |= 0x00000020;
-          onChanged();
+        if (other.getKilometerCode() != 0L) {
+          setKilometerCode(other.getKilometerCode());
         }
         if (other.getDir() != 0) {
           setDir(other.getDir());
@@ -8665,11 +8622,11 @@ public final class WsMessageProto {
                 bitField0_ |= 0x00000010;
                 break;
               } // case 40
-              case 50: {
-                kilometerCode_ = input.readStringRequireUtf8();
+              case 48: {
+                kilometerCode_ = input.readInt64();
                 bitField0_ |= 0x00000020;
                 break;
-              } // case 50
+              } // case 48
               case 56: {
                 dir_ = input.readInt32();
                 bitField0_ |= 0x00000040;
@@ -9008,60 +8965,30 @@ public final class WsMessageProto {
         return this;
       }
 
-      private java.lang.Object kilometerCode_ = "";
+      private long kilometerCode_ ;
       /**
        * 
        * 列车公里标
        * 

        *
-       * string kilometerCode = 6;
+       * int64 kilometerCode = 6;
        * @return The kilometerCode.
        */
-      public java.lang.String getKilometerCode() {
-        java.lang.Object ref = kilometerCode_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          kilometerCode_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public long getKilometerCode() {
+        return kilometerCode_;
       }
       /**
        * 
        * 列车公里标
        * 

        *
-       * string kilometerCode = 6;
-       * @return The bytes for kilometerCode.
-       */
-      public com.google.protobuf.ByteString
-          getKilometerCodeBytes() {
-        java.lang.Object ref = kilometerCode_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          kilometerCode_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * 列车公里标
-       * 

-       *
-       * string kilometerCode = 6;
+       * int64 kilometerCode = 6;
        * @param value The kilometerCode to set.
        * @return This builder for chaining.
        */
-      public Builder setKilometerCode(
-          java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder setKilometerCode(long value) {
+
         kilometerCode_ = value;
         bitField0_ |= 0x00000020;
         onChanged();
@@ -9072,30 +8999,12 @@ public final class WsMessageProto {
        * 列车公里标
        *
* - * string kilometerCode = 6; + * int64 kilometerCode = 6; * @return This builder for chaining. */ public Builder clearKilometerCode() { - kilometerCode_ = getDefaultInstance().getKilometerCode(); bitField0_ = (bitField0_ & ~0x00000020); - onChanged(); - return this; - } - /** - * 
-       * 列车公里标
-       *
- * - * string kilometerCode = 6; - * @param value The bytes for kilometerCode to set. - * @return This builder for chaining. - */ - public Builder setKilometerCodeBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } - checkByteStringIsUtf8(value); - kilometerCode_ = value; - bitField0_ |= 0x00000020; + kilometerCode_ = 0L; onChanged(); return this; } @@ -9254,7 +9163,7 @@ public final class WsMessageProto { "e\"\233\001\n\033WsLineNetTrainOffsetMessage\022\016\n\006lin" + "eId\030\001 \001(\005\022\022\n\ntrainIndex\030\002 \001(\t\022\017\n\007groupId" + "\030\003 \001(\t\022\025\n\rdestinationId\030\004 \001(\005\022\014\n\004show\030\005 " + - "\001(\010\022\025\n\rkilometerCode\030\006 \001(\t\022\013\n\003dir\030\007 \001(\005B" + + "\001(\010\022\025\n\rkilometerCode\030\006 \001(\003\022\013\n\003dir\030\007 \001(\005B" + "3\n!club.joylink.xiannccda.dto.protosB\016Ws" + "MessageProtob\006proto3" };