joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【调整道岔结构】

Browse Source
This commit is contained in:
weizhihong 2023-06-30 14:19:14 +08:00
parent e51f673364
commit 500f680d73
9 changed files with 1057 additions and 1189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java vendored
View File

@ -2,6 +2,7 @@ package club.joylink.xiannccda.ats.cache;
import club.joylink.xiannccda.dto.protos.DeviceInfoProto;
import club.joylink.xiannccda.dto.protos.LayoutGraphicsProto;
import club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem;
import club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.DeviceType;
import club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section;
import club.joylink.xiannccda.entity.PublishedGi;
@ -134,7 +135,7 @@ public class LineGraphicDataRepository {
DeviceInfoProto.Switch.newBuilder();
switchBuilder.setId(t.getCommon().getId());
switchBuilder.setCode(t.getCode());
switchBuilder.setSwitchKilometerSystem(t.getKilometerSystem());
switchBuilder.addAllKilometerSystem(t.getKilometerSystemList());
return switchBuilder;
}));
@ -152,26 +153,32 @@ public class LineGraphicDataRepository {
LayoutGraphicsProto.RtssGraphicStorage storage) {
Map<String, ? extends Builder> sectionMap =
dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
Map<String, ? extends Builder> turnOutMap =
dataMap.getOrDefault(DeviceType.Section.name(), Map.of());
storage
.getAxleCountingsList()
.forEach(
ac ->
ac.getAxleCountingRefList()
ac.getAxleCountingRefList().stream()
.filter(
ref ->
DeviceType.Section.equals(ref.getDeviceType())
&& sectionMap.containsKey(ref.getId()))
.forEach(
ref -> {
if (DeviceType.Section.equals(ref.getDeviceType())
&& sectionMap.containsKey(ref.getId())) {
DeviceInfoProto.Section.Builder sectionBuilder =
(DeviceInfoProto.Section.Builder) sectionMap.get(ref.getId());
sectionBuilder.addKilometerSystem(ac.getKilometerSystem());
} else if (DeviceType.Turnout.equals(ref.getDeviceType())
&& turnOutMap.containsKey(ref.getId())) {
DeviceInfoProto.Switch.Builder switchBuilder =
(DeviceInfoProto.Switch.Builder) turnOutMap.get(ref.getId());
switchBuilder.addKilometerSystem(ac.getKilometerSystem());
}
DeviceInfoProto.Section.Builder sectionBuilder =
(DeviceInfoProto.Section.Builder) sectionMap.get(ref.getId());
sectionBuilder.addKilometerSystem(ac.getKilometerSystem());
}));
}
/**
* 将出入库公里标转换为正线标
*
* @param basisKilometer 出入库基准公里标
* @param system 传入的公里标
* @return 正线公里标数字
*/
private static long convertorKilometer(KilometerSystem basisKilometer, KilometerSystem system) {
return 0L;
}
}

1
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java
View File

@ -48,7 +48,6 @@ public class LineNetTrainInitConvertor extends DeviceStatusConvertor {
offset.setLineId(response.getLineId()); // 线路id
offset.setTrainIndex(trainCell.getTrainIndex()); // 列车标示号，全线唯一
offset.setGroupId(trainCell.getGroupId()); // 车组号
offset.setDestinationId(trainCell.getDestinationId()); // 目的地ID
offset.setShow(false); // 是否显示
offset.setDir(0); // 初始设置无运行方向
// 获取到当前区段公里标

1
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java
View File

@ -41,7 +41,6 @@ public class LineNetTrainRecordConvertor extends DeviceStatusConvertor {
WsMessageProto.WsLineNetTrainOffsetMessage.newBuilder();
offset.setLineId(response.getLineId()); // 线路id
offset.setGroupId(response.getGroupId()); // 车组号
offset.setDestinationId(response.getDestinationId()); // 目的地ID
offset.setDir(response.getDirection().getValue()); // 初始设置无运行方向
offset.setShow(true); // 显示
// 获取到当前区段公里标

2
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java
View File

@ -47,9 +47,7 @@ public class LineNetTrainUpdateConvertor extends DeviceStatusConvertor {
offset.setLineId(response.getLineId()); // 线路id
offset.setTrainIndex(response.getTrainIndex()); // 列车标示号，全线唯一
offset.setGroupId(response.getGroupId()); // 车组号
offset.setDestinationId(response.getDestinationId()); // 目的地ID
offset.setShow(true); // 是否显示
offset.setDir(0); // 初始设置无运行方向
// 获取到当前区段公里标
if (DeviceType.DEVICE_TYPE_TRACK.equals(response.getDevType())) {
List<Long> kmCodeList =

1514
src/main/java/club/joylink/xiannccda/dto/protos/DeviceInfoProto.java
View File

File diff suppressed because it is too large Load Diff

486
src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
View File

@ -24242,30 +24242,47 @@ public final class LayoutGraphicsProto {
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return Whether the kilometerSystem field is set.
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
boolean hasKilometerSystem();
java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem>
getKilometerSystemList();
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return The kilometerSystem.
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem();
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index);
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder();
int getKilometerSystemCount();
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
java.util.List<? extends club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder>
getKilometerSystemOrBuilderList();
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
int index);
}
/**
* Protobuf type {@code graphicData.Turnout}
@ -24284,6 +24301,7 @@ public final class LayoutGraphicsProto {
pointA_ = java.util.Collections.emptyList();
pointB_ = java.util.Collections.emptyList();
pointC_ = java.util.Collections.emptyList();
kilometerSystem_ = java.util.Collections.emptyList();
}
@java.lang.Override
@ -24668,42 +24686,65 @@ public final class LayoutGraphicsProto {
return pcRef_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.getDefaultInstance() : pcRef_;
}
public static final int KILOMETERSYSTEM_FIELD_NUMBER = 12;
private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem kilometerSystem_;
public static final int KILOMETERSYSTEM_FIELD_NUMBER = 13;
@SuppressWarnings("serial")
private java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem> kilometerSystem_;
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return Whether the kilometerSystem field is set.
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
@java.lang.Override
public boolean hasKilometerSystem() {
return kilometerSystem_ != null;
public java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem> getKilometerSystemList() {
return kilometerSystem_;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return The kilometerSystem.
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem() {
return kilometerSystem_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance() : kilometerSystem_;
public java.util.List<? extends club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder>
getKilometerSystemOrBuilderList() {
return kilometerSystem_;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder() {
return kilometerSystem_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance() : kilometerSystem_;
public int getKilometerSystemCount() {
return kilometerSystem_.size();
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index) {
return kilometerSystem_.get(index);
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
int index) {
return kilometerSystem_.get(index);
}
private byte memoizedIsInitialized = -1;
@ -24744,8 +24785,8 @@ public final class LayoutGraphicsProto {
if (pcRef_ != null) {
output.writeMessage(11, getPcRef());
}
if (kilometerSystem_ != null) {
output.writeMessage(12, getKilometerSystem());
for (int i = 0; i < kilometerSystem_.size(); i++) {
output.writeMessage(13, kilometerSystem_.get(i));
}
getUnknownFields().writeTo(output);
}
@ -24787,9 +24828,9 @@ public final class LayoutGraphicsProto {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getPcRef());
}
if (kilometerSystem_ != null) {
for (int i = 0; i < kilometerSystem_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getKilometerSystem());
.computeMessageSize(13, kilometerSystem_.get(i));
}
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
@ -24834,11 +24875,8 @@ public final class LayoutGraphicsProto {
if (!getPcRef()
.equals(other.getPcRef())) return false;
}
if (hasKilometerSystem() != other.hasKilometerSystem()) return false;
if (hasKilometerSystem()) {
if (!getKilometerSystem()
.equals(other.getKilometerSystem())) return false;
}
if (!getKilometerSystemList()
.equals(other.getKilometerSystemList())) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@ -24880,9 +24918,9 @@ public final class LayoutGraphicsProto {
hash = (37 * hash) + PCREF_FIELD_NUMBER;
hash = (53 * hash) + getPcRef().hashCode();
}
if (hasKilometerSystem()) {
if (getKilometerSystemCount() > 0) {
hash = (37 * hash) + KILOMETERSYSTEM_FIELD_NUMBER;
hash = (53 * hash) + getKilometerSystem().hashCode();
hash = (53 * hash) + getKilometerSystemList().hashCode();
}
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
@ -25057,11 +25095,13 @@ public final class LayoutGraphicsProto {
pcRefBuilder_.dispose();
pcRefBuilder_ = null;
}
kilometerSystem_ = null;
if (kilometerSystemBuilder_ != null) {
kilometerSystemBuilder_.dispose();
kilometerSystemBuilder_ = null;
if (kilometerSystemBuilder_ == null) {
kilometerSystem_ = java.util.Collections.emptyList();
} else {
kilometerSystem_ = null;
kilometerSystemBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@ -25122,6 +25162,15 @@ public final class LayoutGraphicsProto {
} else {
result.pointC_ = pointCBuilder_.build();
}
if (kilometerSystemBuilder_ == null) {
if (((bitField0_ & 0x00000100) != 0)) {
kilometerSystem_ = java.util.Collections.unmodifiableList(kilometerSystem_);
bitField0_ = (bitField0_ & ~0x00000100);
}
result.kilometerSystem_ = kilometerSystem_;
} else {
result.kilometerSystem_ = kilometerSystemBuilder_.build();
}
}
private void buildPartial0(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Turnout result) {
@ -25149,11 +25198,6 @@ public final class LayoutGraphicsProto {
? pcRef_
: pcRefBuilder_.build();
}
if (((from_bitField0_ & 0x00000100) != 0)) {
result.kilometerSystem_ = kilometerSystemBuilder_ == null
? kilometerSystem_
: kilometerSystemBuilder_.build();
}
}
@java.lang.Override
@ -25263,8 +25307,31 @@ public final class LayoutGraphicsProto {
if (other.hasPcRef()) {
mergePcRef(other.getPcRef());
}
if (other.hasKilometerSystem()) {
mergeKilometerSystem(other.getKilometerSystem());
if (kilometerSystemBuilder_ == null) {
if (!other.kilometerSystem_.isEmpty()) {
if (kilometerSystem_.isEmpty()) {
kilometerSystem_ = other.kilometerSystem_;
bitField0_ = (bitField0_ & ~0x00000100);
} else {
ensureKilometerSystemIsMutable();
kilometerSystem_.addAll(other.kilometerSystem_);
}
onChanged();
}
} else {
if (!other.kilometerSystem_.isEmpty()) {
if (kilometerSystemBuilder_.isEmpty()) {
kilometerSystemBuilder_.dispose();
kilometerSystemBuilder_ = null;
kilometerSystem_ = other.kilometerSystem_;
bitField0_ = (bitField0_ & ~0x00000100);
kilometerSystemBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getKilometerSystemFieldBuilder() : null;
} else {
kilometerSystemBuilder_.addAllMessages(other.kilometerSystem_);
}
}
}
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
@ -25364,13 +25431,19 @@ public final class LayoutGraphicsProto {
bitField0_ |= 0x00000080;
break;
} // case 90
case 98: {
input.readMessage(
getKilometerSystemFieldBuilder().getBuilder(),
extensionRegistry);
bitField0_ |= 0x00000100;
case 106: {
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem m =
input.readMessage(
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.parser(),
extensionRegistry);
if (kilometerSystemBuilder_ == null) {
ensureKilometerSystemIsMutable();
kilometerSystem_.add(m);
} else {
kilometerSystemBuilder_.addMessage(m);
}
break;
} // case 98
} // case 106
default: {
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
done = true; // was an endgroup tag
@ -26980,154 +27053,311 @@ public final class LayoutGraphicsProto {
return pcRefBuilder_;
}
private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem kilometerSystem_;
private com.google.protobuf.SingleFieldBuilderV3<
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder> kilometerSystemBuilder_;
/**
* <pre>
* 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return Whether the kilometerSystem field is set.
*/
public boolean hasKilometerSystem() {
return ((bitField0_ & 0x00000100) != 0);
private java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem> kilometerSystem_ =
java.util.Collections.emptyList();
private void ensureKilometerSystemIsMutable() {
if (!((bitField0_ & 0x00000100) != 0)) {
kilometerSystem_ = new java.util.ArrayList<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem>(kilometerSystem_);
bitField0_ |= 0x00000100;
}
}
private com.google.protobuf.RepeatedFieldBuilderV3<
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder> kilometerSystemBuilder_;
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* @return The kilometerSystem.
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem() {
public java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem> getKilometerSystemList() {
if (kilometerSystemBuilder_ == null) {
return kilometerSystem_ == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance() : kilometerSystem_;
return java.util.Collections.unmodifiableList(kilometerSystem_);
} else {
return kilometerSystemBuilder_.getMessage();
return kilometerSystemBuilder_.getMessageList();
}
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder setKilometerSystem(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
public int getKilometerSystemCount() {
if (kilometerSystemBuilder_ == null) {
return kilometerSystem_.size();
} else {
return kilometerSystemBuilder_.getCount();
}
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index) {
if (kilometerSystemBuilder_ == null) {
return kilometerSystem_.get(index);
} else {
return kilometerSystemBuilder_.getMessage(index);
}
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder setKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
if (kilometerSystemBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
kilometerSystem_ = value;
ensureKilometerSystemIsMutable();
kilometerSystem_.set(index, value);
onChanged();
} else {
kilometerSystemBuilder_.setMessage(value);
kilometerSystemBuilder_.setMessage(index, value);
}
bitField0_ |= 0x00000100;
onChanged();
return this;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder setKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
if (kilometerSystemBuilder_ == null) {
ensureKilometerSystemIsMutable();
kilometerSystem_.set(index, builderForValue.build());
onChanged();
} else {
kilometerSystemBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder addKilometerSystem(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
if (kilometerSystemBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
ensureKilometerSystemIsMutable();
kilometerSystem_.add(value);
onChanged();
} else {
kilometerSystemBuilder_.addMessage(value);
}
return this;
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder addKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
if (kilometerSystemBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
ensureKilometerSystemIsMutable();
kilometerSystem_.add(index, value);
onChanged();
} else {
kilometerSystemBuilder_.addMessage(index, value);
}
return this;
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder addKilometerSystem(
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
if (kilometerSystemBuilder_ == null) {
kilometerSystem_ = builderForValue.build();
ensureKilometerSystemIsMutable();
kilometerSystem_.add(builderForValue.build());
onChanged();
} else {
kilometerSystemBuilder_.setMessage(builderForValue.build());
kilometerSystemBuilder_.addMessage(builderForValue.build());
}
bitField0_ |= 0x00000100;
onChanged();
return this;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder mergeKilometerSystem(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
public Builder addKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
if (kilometerSystemBuilder_ == null) {
if (((bitField0_ & 0x00000100) != 0) &&
kilometerSystem_ != null &&
kilometerSystem_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance()) {
getKilometerSystemBuilder().mergeFrom(value);
} else {
kilometerSystem_ = value;
}
ensureKilometerSystemIsMutable();
kilometerSystem_.add(index, builderForValue.build());
onChanged();
} else {
kilometerSystemBuilder_.mergeFrom(value);
kilometerSystemBuilder_.addMessage(index, builderForValue.build());
}
bitField0_ |= 0x00000100;
onChanged();
return this;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder addAllKilometerSystem(
java.lang.Iterable<? extends club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem> values) {
if (kilometerSystemBuilder_ == null) {
ensureKilometerSystemIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, kilometerSystem_);
onChanged();
} else {
kilometerSystemBuilder_.addAllMessages(values);
}
return this;
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public Builder clearKilometerSystem() {
bitField0_ = (bitField0_ & ~0x00000100);
kilometerSystem_ = null;
if (kilometerSystemBuilder_ != null) {
kilometerSystemBuilder_.dispose();
kilometerSystemBuilder_ = null;
if (kilometerSystemBuilder_ == null) {
kilometerSystem_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000100);
onChanged();
} else {
kilometerSystemBuilder_.clear();
}
onChanged();
return this;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder getKilometerSystemBuilder() {
bitField0_ |= 0x00000100;
onChanged();
return getKilometerSystemFieldBuilder().getBuilder();
public Builder removeKilometerSystem(int index) {
if (kilometerSystemBuilder_ == null) {
ensureKilometerSystemIsMutable();
kilometerSystem_.remove(index);
onChanged();
} else {
kilometerSystemBuilder_.remove(index);
}
return this;
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder() {
if (kilometerSystemBuilder_ != null) {
return kilometerSystemBuilder_.getMessageOrBuilder();
} else {
return kilometerSystem_ == null ?
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance() : kilometerSystem_;
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder getKilometerSystemBuilder(
int index) {
return getKilometerSystemFieldBuilder().getBuilder(index);
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
int index) {
if (kilometerSystemBuilder_ == null) {
return kilometerSystem_.get(index); } else {
return kilometerSystemBuilder_.getMessageOrBuilder(index);
}
}
/**
* <pre>
* 道岔公里标
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>.graphicData.KilometerSystem kilometerSystem = 12;</code>
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
public java.util.List<? extends club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder>
getKilometerSystemOrBuilderList() {
if (kilometerSystemBuilder_ != null) {
return kilometerSystemBuilder_.getMessageOrBuilderList();
} else {
return java.util.Collections.unmodifiableList(kilometerSystem_);
}
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder addKilometerSystemBuilder() {
return getKilometerSystemFieldBuilder().addBuilder(
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance());
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder addKilometerSystemBuilder(
int index) {
return getKilometerSystemFieldBuilder().addBuilder(
index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.getDefaultInstance());
}
/**
* <pre>
* KilometerSystem kilometerSystem = 12; // 道岔公里标
* </pre>
*
* <code>repeated .graphicData.KilometerSystem kilometerSystem = 13;</code>
*/
public java.util.List<club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder>
getKilometerSystemBuilderList() {
return getKilometerSystemFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilderV3<
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder>
getKilometerSystemFieldBuilder() {
if (kilometerSystemBuilder_ == null) {
kilometerSystemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
kilometerSystemBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder>(
getKilometerSystem(),
kilometerSystem_,
((bitField0_ & 0x00000100) != 0),
getParentForChildren(),
isClean());
kilometerSystem_ = null;
@ -37401,7 +37631,7 @@ public final class LayoutGraphicsProto {
"f\030\t \001(\0132\027.graphicData.RelatedRef\022&\n\005pbRe" +
"f\030\n \001(\0132\027.graphicData.RelatedRef\022&\n\005pcRe" +
"f\030\013 \001(\0132\027.graphicData.RelatedRef\0225\n\017kilo" +
"meterSystem\030\014 \001(\0132\034.graphicData.Kilomete" +
"meterSystem\030\r \003(\0132\034.graphicData.Kilomete" +
"rSystem\">\n\017KilometerSystem\022\021\n\tkilometer\030" +
"\001 \001(\003\022\030\n\020coordinateSystem\030\002 \001(\t\"\206\001\n\006Sign" +
"al\022\'\n\006common\030\001 \001(\0132\027.graphicData.CommonI" +

30
src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java
View File

@ -254,7 +254,7 @@ public final class TrainProto {
/**
* <pre>
* 到点
* 到点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 arriveTime = 15;</code>
@ -264,7 +264,7 @@ public final class TrainProto {
/**
* <pre>
* 发点
* 发点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 departTime = 16;</code>
@ -857,7 +857,7 @@ public final class TrainProto {
private long arriveTime_ = 0L;
/**
* <pre>
* 到点
* 到点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 arriveTime = 15;</code>
@ -872,7 +872,7 @@ public final class TrainProto {
private long departTime_ = 0L;
/**
* <pre>
* 发点
* 发点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 departTime = 16;</code>
@ -3030,7 +3030,7 @@ public final class TrainProto {
private long arriveTime_ ;
/**
* <pre>
* 到点
* 到点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 arriveTime = 15;</code>
@ -3042,7 +3042,7 @@ public final class TrainProto {
}
/**
* <pre>
* 到点
* 到点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 arriveTime = 15;</code>
@ -3058,7 +3058,7 @@ public final class TrainProto {
}
/**
* <pre>
* 到点
* 到点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 arriveTime = 15;</code>
@ -3074,7 +3074,7 @@ public final class TrainProto {
private long departTime_ ;
/**
* <pre>
* 发点
* 发点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 departTime = 16;</code>
@ -3086,7 +3086,7 @@ public final class TrainProto {
}
/**
* <pre>
* 发点
* 发点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 departTime = 16;</code>
@ -3102,7 +3102,7 @@ public final class TrainProto {
}
/**
* <pre>
* 发点
* 发点 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 departTime = 16;</code>
@ -7582,7 +7582,7 @@ public final class TrainProto {
/**
* <pre>
** 到发时间(7)
** 到发时间(7) 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 recordTime = 13;</code>
@ -7956,7 +7956,7 @@ public final class TrainProto {
private long recordTime_ = 0L;
/**
* <pre>
** 到发时间(7)
** 到发时间(7) 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 recordTime = 13;</code>
@ -9302,7 +9302,7 @@ public final class TrainProto {
private long recordTime_ ;
/**
* <pre>
** 到发时间(7)
** 到发时间(7) 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 recordTime = 13;</code>
@ -9314,7 +9314,7 @@ public final class TrainProto {
}
/**
* <pre>
** 到发时间(7)
** 到发时间(7) 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 recordTime = 13;</code>
@ -9330,7 +9330,7 @@ public final class TrainProto {
}
/**
* <pre>
** 到发时间(7)
** 到发时间(7) 时间戳 精确到秒 10位长度
* </pre>
*
* <code>int64 recordTime = 13;</code>

173
src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java
View File

@ -7960,22 +7960,12 @@ public final class WsMessageProto {
com.google.protobuf.ByteString
getGroupIdBytes();
/**
* <pre>
* 目的地ID
* </pre>
*
* <code>int32 destinationId = 4;</code>
* @return The destinationId.
*/
int getDestinationId();
/**
* <pre>
*是否显示
* </pre>
*
* <code>bool show = 5;</code>
* <code>bool show = 4;</code>
* @return The show.
*/
boolean getShow();
@ -7985,7 +7975,7 @@ public final class WsMessageProto {
* 列车公里标
* </pre>
*
* <code>int64 kilometerCode = 6;</code>
* <code>int64 kilometerCode = 5;</code>
* @return The kilometerCode.
*/
long getKilometerCode();
@ -7995,7 +7985,7 @@ public final class WsMessageProto {
* 运行方向
* </pre>
*
* <code>int32 dir = 7;</code>
* <code>int32 dir = 6;</code>
* @return The dir.
*/
int getDir();
@ -8150,29 +8140,14 @@ public final class WsMessageProto {
}
}
public static final int DESTINATIONID_FIELD_NUMBER = 4;
private int destinationId_ = 0;
/**
* <pre>
* 目的地ID
* </pre>
*
* <code>int32 destinationId = 4;</code>
* @return The destinationId.
*/
@java.lang.Override
public int getDestinationId() {
return destinationId_;
}
public static final int SHOW_FIELD_NUMBER = 5;
public static final int SHOW_FIELD_NUMBER = 4;
private boolean show_ = false;
/**
* <pre>
*是否显示
* </pre>
*
* <code>bool show = 5;</code>
* <code>bool show = 4;</code>
* @return The show.
*/
@java.lang.Override
@ -8180,14 +8155,14 @@ public final class WsMessageProto {
return show_;
}
public static final int KILOMETERCODE_FIELD_NUMBER = 6;
public static final int KILOMETERCODE_FIELD_NUMBER = 5;
private long kilometerCode_ = 0L;
/**
* <pre>
* 列车公里标
* </pre>
*
* <code>int64 kilometerCode = 6;</code>
* <code>int64 kilometerCode = 5;</code>
* @return The kilometerCode.
*/
@java.lang.Override
@ -8195,14 +8170,14 @@ public final class WsMessageProto {
return kilometerCode_;
}
public static final int DIR_FIELD_NUMBER = 7;
public static final int DIR_FIELD_NUMBER = 6;
private int dir_ = 0;
/**
* <pre>
* 运行方向
* </pre>
*
* <code>int32 dir = 7;</code>
* <code>int32 dir = 6;</code>
* @return The dir.
*/
@java.lang.Override
@ -8233,17 +8208,14 @@ public final class WsMessageProto {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, groupId_);
}
if (destinationId_ != 0) {
output.writeInt32(4, destinationId_);
}
if (show_ != false) {
output.writeBool(5, show_);
output.writeBool(4, show_);
}
if (kilometerCode_ != 0L) {
output.writeInt64(6, kilometerCode_);
output.writeInt64(5, kilometerCode_);
}
if (dir_ != 0) {
output.writeInt32(7, dir_);
output.writeInt32(6, dir_);
}
getUnknownFields().writeTo(output);
}
@ -8264,21 +8236,17 @@ public final class WsMessageProto {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, groupId_);
}
if (destinationId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, destinationId_);
}
if (show_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(5, show_);
.computeBoolSize(4, show_);
}
if (kilometerCode_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(6, kilometerCode_);
.computeInt64Size(5, kilometerCode_);
}
if (dir_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, dir_);
.computeInt32Size(6, dir_);
}
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
@ -8301,8 +8269,6 @@ public final class WsMessageProto {
.equals(other.getTrainIndex())) return false;
if (!getGroupId()
.equals(other.getGroupId())) return false;
if (getDestinationId()
!= other.getDestinationId()) return false;
if (getShow()
!= other.getShow()) return false;
if (getKilometerCode()
@ -8326,8 +8292,6 @@ public final class WsMessageProto {
hash = (53 * hash) + getTrainIndex().hashCode();
hash = (37 * hash) + GROUPID_FIELD_NUMBER;
hash = (53 * hash) + getGroupId().hashCode();
hash = (37 * hash) + DESTINATIONID_FIELD_NUMBER;
hash = (53 * hash) + getDestinationId();
hash = (37 * hash) + SHOW_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getShow());
@ -8474,7 +8438,6 @@ public final class WsMessageProto {
lineId_ = 0;
trainIndex_ = "";
groupId_ = "";
destinationId_ = 0;
show_ = false;
kilometerCode_ = 0L;
dir_ = 0;
@ -8521,15 +8484,12 @@ public final class WsMessageProto {
result.groupId_ = groupId_;
}
if (((from_bitField0_ & 0x00000008) != 0)) {
result.destinationId_ = destinationId_;
}
if (((from_bitField0_ & 0x00000010) != 0)) {
result.show_ = show_;
}
if (((from_bitField0_ & 0x00000020) != 0)) {
if (((from_bitField0_ & 0x00000010) != 0)) {
result.kilometerCode_ = kilometerCode_;
}
if (((from_bitField0_ & 0x00000040) != 0)) {
if (((from_bitField0_ & 0x00000020) != 0)) {
result.dir_ = dir_;
}
}
@ -8559,9 +8519,6 @@ public final class WsMessageProto {
bitField0_ |= 0x00000004;
onChanged();
}
if (other.getDestinationId() != 0) {
setDestinationId(other.getDestinationId());
}
if (other.getShow() != false) {
setShow(other.getShow());
}
@ -8613,25 +8570,20 @@ public final class WsMessageProto {
break;
} // case 26
case 32: {
destinationId_ = input.readInt32();
show_ = input.readBool();
bitField0_ |= 0x00000008;
break;
} // case 32
case 40: {
show_ = input.readBool();
kilometerCode_ = input.readInt64();
bitField0_ |= 0x00000010;
break;
} // case 40
case 48: {
kilometerCode_ = input.readInt64();
dir_ = input.readInt32();
bitField0_ |= 0x00000020;
break;
} // case 48
case 56: {
dir_ = input.readInt32();
bitField0_ |= 0x00000040;
break;
} // case 56
default: {
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
done = true; // was an endgroup tag
@ -8877,57 +8829,13 @@ public final class WsMessageProto {
return this;
}
private int destinationId_ ;
/**
* <pre>
* 目的地ID
* </pre>
*
* <code>int32 destinationId = 4;</code>
* @return The destinationId.
*/
@java.lang.Override
public int getDestinationId() {
return destinationId_;
}
/**
* <pre>
* 目的地ID
* </pre>
*
* <code>int32 destinationId = 4;</code>
* @param value The destinationId to set.
* @return This builder for chaining.
*/
public Builder setDestinationId(int value) {
destinationId_ = value;
bitField0_ |= 0x00000008;
onChanged();
return this;
}
/**
* <pre>
* 目的地ID
* </pre>
*
* <code>int32 destinationId = 4;</code>
* @return This builder for chaining.
*/
public Builder clearDestinationId() {
bitField0_ = (bitField0_ & ~0x00000008);
destinationId_ = 0;
onChanged();
return this;
}
private boolean show_ ;
/**
* <pre>
*是否显示
* </pre>
*
* <code>bool show = 5;</code>
* <code>bool show = 4;</code>
* @return The show.
*/
@java.lang.Override
@ -8939,14 +8847,14 @@ public final class WsMessageProto {
*是否显示
* </pre>
*
* <code>bool show = 5;</code>
* <code>bool show = 4;</code>
* @param value The show to set.
* @return This builder for chaining.
*/
public Builder setShow(boolean value) {
show_ = value;
bitField0_ |= 0x00000010;
bitField0_ |= 0x00000008;
onChanged();
return this;
}
@ -8955,11 +8863,11 @@ public final class WsMessageProto {
*是否显示
* </pre>
*
* <code>bool show = 5;</code>
* <code>bool show = 4;</code>
* @return This builder for chaining.
*/
public Builder clearShow() {
bitField0_ = (bitField0_ & ~0x00000010);
bitField0_ = (bitField0_ & ~0x00000008);
show_ = false;
onChanged();
return this;
@ -8971,7 +8879,7 @@ public final class WsMessageProto {
* 列车公里标
* </pre>
*
* <code>int64 kilometerCode = 6;</code>
* <code>int64 kilometerCode = 5;</code>
* @return The kilometerCode.
*/
@java.lang.Override
@ -8983,14 +8891,14 @@ public final class WsMessageProto {
* 列车公里标
* </pre>
*
* <code>int64 kilometerCode = 6;</code>
* <code>int64 kilometerCode = 5;</code>
* @param value The kilometerCode to set.
* @return This builder for chaining.
*/
public Builder setKilometerCode(long value) {
kilometerCode_ = value;
bitField0_ |= 0x00000020;
bitField0_ |= 0x00000010;
onChanged();
return this;
}
@ -8999,11 +8907,11 @@ public final class WsMessageProto {
* 列车公里标
* </pre>
*
* <code>int64 kilometerCode = 6;</code>
* <code>int64 kilometerCode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearKilometerCode() {
bitField0_ = (bitField0_ & ~0x00000020);
bitField0_ = (bitField0_ & ~0x00000010);
kilometerCode_ = 0L;
onChanged();
return this;
@ -9015,7 +8923,7 @@ public final class WsMessageProto {
* 运行方向
* </pre>
*
* <code>int32 dir = 7;</code>
* <code>int32 dir = 6;</code>
* @return The dir.
*/
@java.lang.Override
@ -9027,14 +8935,14 @@ public final class WsMessageProto {
* 运行方向
* </pre>
*
* <code>int32 dir = 7;</code>
* <code>int32 dir = 6;</code>
* @param value The dir to set.
* @return This builder for chaining.
*/
public Builder setDir(int value) {
dir_ = value;
bitField0_ |= 0x00000040;
bitField0_ |= 0x00000020;
onChanged();
return this;
}
@ -9043,11 +8951,11 @@ public final class WsMessageProto {
* 运行方向
* </pre>
*
* <code>int32 dir = 7;</code>
* <code>int32 dir = 6;</code>
* @return This builder for chaining.
*/
public Builder clearDir() {
bitField0_ = (bitField0_ & ~0x00000040);
bitField0_ = (bitField0_ & ~0x00000020);
dir_ = 0;
onChanged();
return this;
@ -9160,12 +9068,11 @@ public final class WsMessageProto {
"TrainMessage\022#\n\ttrainInfo\030\001 \003(\0132\020.train." +
"TrainInfo\"F\n\020WsLineNetMessage\0222\n\006offset\030" +
"\001 \003(\0132\".state.WsLineNetTrainOffsetMessag" +
"e\"\233\001\n\033WsLineNetTrainOffsetMessage\022\016\n\006lin" +
"e\"\204\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(\003\022\013\n\003dir\030\007 \001(\005B" +
"3\n!club.joylink.xiannccda.dto.protosB\016Ws" +
"MessageProtob\006proto3"
"\030\003 \001(\t\022\014\n\004show\030\004 \001(\010\022\025\n\rkilometerCode\030\005 " +
"\001(\003\022\013\n\003dir\030\006 \001(\005B3\n!club.joylink.xianncc" +
"da.dto.protosB\016WsMessageProtob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@ -9196,7 +9103,7 @@ public final class WsMessageProto {
internal_static_state_WsLineNetTrainOffsetMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_state_WsLineNetTrainOffsetMessage_descriptor,
new java.lang.String[] { "LineId", "TrainIndex", "GroupId", "DestinationId", "Show", "KilometerCode", "Dir", });
new java.lang.String[] { "LineId", "TrainIndex", "GroupId", "Show", "KilometerCode", "Dir", });
club.joylink.xiannccda.dto.protos.DeviceStatusProto.getDescriptor();
club.joylink.xiannccda.dto.protos.TrainProto.getDescriptor();
}

2
xian-ncc-da-message

@ -1 +1 @@
Subproject commit 3c2bb59efdec816062b4a3055fa527804f9c256a
Subproject commit 9a7b4b7a3a912970197155a149a9da463d2a68fc