【增加线路ID】
This commit is contained in:
weizhihong
parent
e1580dcac4
commit
48078e2186
@ -19302,6 +19302,16 @@ public final class DeviceStatusProto {
|
||||
* @return The show.
|
||||
*/
|
||||
boolean getShow();
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
*线路id
|
||||
* </pre>
|
||||
*
|
||||
* <code>int32 lineId = 24;</code>
|
||||
* @return The lineId.
|
||||
*/
|
||||
int getLineId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
@ -19911,6 +19921,21 @@ public final class DeviceStatusProto {
|
||||
return show_;
|
||||
}
|
||||
|
||||
public static final int LINEID_FIELD_NUMBER = 24;
|
||||
private int lineId_ = 0;
|
||||
/**
|
||||
* <pre>
|
||||
*线路id
|
||||
* </pre>
|
||||
*
|
||||
* <code>int32 lineId = 24;</code>
|
||||
* @return The lineId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getLineId() {
|
||||
return lineId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@ -19994,6 +20019,9 @@ public final class DeviceStatusProto {
|
||||
if (show_ != false) {
|
||||
output.writeBool(23, show_);
|
||||
}
|
||||
if (lineId_ != 0) {
|
||||
output.writeInt32(24, lineId_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
@ -20089,6 +20117,10 @@ public final class DeviceStatusProto {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(23, show_);
|
||||
}
|
||||
if (lineId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(24, lineId_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@ -20154,6 +20186,8 @@ public final class DeviceStatusProto {
|
||||
!= other.getBlockFlag()) return false;
|
||||
if (getShow()
|
||||
!= other.getShow()) return false;
|
||||
if (getLineId()
|
||||
!= other.getLineId()) return false;
|
||||
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
|
||||
return true;
|
||||
}
|
||||
@ -20217,6 +20251,8 @@ public final class DeviceStatusProto {
|
||||
hash = (37 * hash) + SHOW_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getShow());
|
||||
hash = (37 * hash) + LINEID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getLineId();
|
||||
hash = (29 * hash) + getUnknownFields().hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@ -20379,6 +20415,7 @@ public final class DeviceStatusProto {
|
||||
devName_ = "";
|
||||
blockFlag_ = 0;
|
||||
show_ = false;
|
||||
lineId_ = 0;
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -20483,6 +20520,9 @@ public final class DeviceStatusProto {
|
||||
if (((from_bitField0_ & 0x00400000) != 0)) {
|
||||
result.show_ = show_;
|
||||
}
|
||||
if (((from_bitField0_ & 0x00800000) != 0)) {
|
||||
result.lineId_ = lineId_;
|
||||
}
|
||||
}
|
||||
|
||||
@java.lang.Override
|
||||
@ -20578,6 +20618,9 @@ public final class DeviceStatusProto {
|
||||
if (other.getShow() != false) {
|
||||
setShow(other.getShow());
|
||||
}
|
||||
if (other.getLineId() != 0) {
|
||||
setLineId(other.getLineId());
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
onChanged();
|
||||
return this;
|
||||
@ -20721,6 +20764,11 @@ public final class DeviceStatusProto {
|
||||
bitField0_ |= 0x00400000;
|
||||
break;
|
||||
} // case 184
|
||||
case 192: {
|
||||
lineId_ = input.readInt32();
|
||||
bitField0_ |= 0x00800000;
|
||||
break;
|
||||
} // case 192
|
||||
default: {
|
||||
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
|
||||
done = true; // was an endgroup tag
|
||||
@ -22156,6 +22204,50 @@ public final class DeviceStatusProto {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int lineId_ ;
|
||||
/**
|
||||
* <pre>
|
||||
*线路id
|
||||
* </pre>
|
||||
*
|
||||
* <code>int32 lineId = 24;</code>
|
||||
* @return The lineId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getLineId() {
|
||||
return lineId_;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*线路id
|
||||
* </pre>
|
||||
*
|
||||
* <code>int32 lineId = 24;</code>
|
||||
* @param value The lineId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setLineId(int value) {
|
||||
|
||||
lineId_ = value;
|
||||
bitField0_ |= 0x00800000;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*线路id
|
||||
* </pre>
|
||||
*
|
||||
* <code>int32 lineId = 24;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearLineId() {
|
||||
bitField0_ = (bitField0_ & ~0x00800000);
|
||||
lineId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@ -22416,7 +22508,7 @@ public final class DeviceStatusProto {
|
||||
"ipModeTrainDriveModeRmr\030! \001(\010\022 \n\030ipModeT" +
|
||||
"rainDriveModeWash\030\" \001(\010\022\n\n\002id\030# \001(\t\".\n\020O" +
|
||||
"ccNccFepNetwork\022\n\n\002id\030\001 \001(\t\022\016\n\006active\030\002 " +
|
||||
"\001(\010\"\271\003\n\005Train\022\017\n\007trainId\030\001 \001(\t\022\020\n\010global" +
|
||||
"\001(\010\"\311\003\n\005Train\022\017\n\007trainId\030\001 \001(\t\022\020\n\010global" +
|
||||
"Id\030\002 \001(\t\022\017\n\007groupId\030\003 \001(\t\022\022\n\nlocalSubId\030" +
|
||||
"\004 \001(\005\022\021\n\ttrainType\030\005 \001(\005\022\r\n\005speed\030\006 \001(\002\022" +
|
||||
"\021\n\tdirection\030\007 \001(\005\022\025\n\rdestinationId\030\010 \001(" +
|
||||
@ -22427,8 +22519,9 @@ public final class DeviceStatusProto {
|
||||
"de\022\021\n\tnccWindow\030\021 \001(\005\022\027\n\017nccWindowOffset" +
|
||||
"\030\022 \001(\005\022\014\n\004rate\030\023 \001(\005\022\017\n\007devType\030\024 \001(\005\022\017\n" +
|
||||
"\007devName\030\025 \001(\t\022\021\n\tblockFlag\030\026 \001(\005\022\014\n\004sho" +
|
||||
"w\030\027 \001(\010B6\n!club.joylink.xiannccda.dto.pr" +
|
||||
"otosB\021DeviceStatusProtob\006proto3"
|
||||
"w\030\027 \001(\010\022\016\n\006lineId\030\030 \001(\005B6\n!club.joylink." +
|
||||
"xiannccda.dto.protosB\021DeviceStatusProtob" +
|
||||
"\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@ -22517,7 +22610,7 @@ public final class DeviceStatusProto {
|
||||
internal_static_state_Train_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_state_Train_descriptor,
|
||||
new java.lang.String[] { "TrainId", "GlobalId", "GroupId", "LocalSubId", "TrainType", "Speed", "Direction", "DestinationId", "StationId", "SideId", "TrackName", "RecordType", "RecordTime", "DriverId", "RouteId", "Mode", "NccWindow", "NccWindowOffset", "Rate", "DevType", "DevName", "BlockFlag", "Show", });
|
||||
new java.lang.String[] { "TrainId", "GlobalId", "GroupId", "LocalSubId", "TrainType", "Speed", "Direction", "DestinationId", "StationId", "SideId", "TrackName", "RecordType", "RecordTime", "DriverId", "RouteId", "Mode", "NccWindow", "NccWindowOffset", "Rate", "DevType", "DevName", "BlockFlag", "Show", "LineId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
@ -109,6 +109,7 @@ public class LineDeviceStatusService {
|
||||
for (int i = 0, len = trainList.size(); i < len; i++) {
|
||||
String code = trainList.get(i);
|
||||
Train.Builder builder = Train.newBuilder(); // 列车信息
|
||||
builder.setLineId(3);
|
||||
builder.setGroupId(code);
|
||||
builder.setDevType(DeviceType.DEVICE_TYPE_TRACK.getVal());
|
||||
builder.setShow(true);
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 1695d7f64eafed6f402886e05bb23e5b988bdb81
|
||||
Subproject commit 01222c99bad173afa8541aa44f2043408d946503
|
||||
Loading…
Reference in New Issue
Block a user