Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
This commit is contained in:
weizhihong
commit
df92af2318
@ -14,6 +14,204 @@ public final class DeviceStatusProto {
|
||||
registerAllExtensions(
|
||||
(com.google.protobuf.ExtensionRegistryLite) registry);
|
||||
}
|
||||
/**
|
||||
* Protobuf enum {@code state.DeviceType}
|
||||
*/
|
||||
public enum DeviceType
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>UNKNOW = 0;</code>
|
||||
*/
|
||||
UNKNOW(0),
|
||||
/**
|
||||
* <code>RTU = 1;</code>
|
||||
*/
|
||||
RTU(1),
|
||||
/**
|
||||
* <code>STATION = 2;</code>
|
||||
*/
|
||||
STATION(2),
|
||||
/**
|
||||
* <code>SIGNAL = 3;</code>
|
||||
*/
|
||||
SIGNAL(3),
|
||||
/**
|
||||
* <code>SWITCH = 4;</code>
|
||||
*/
|
||||
SWITCH(4),
|
||||
/**
|
||||
* <code>TRACK = 5;</code>
|
||||
*/
|
||||
TRACK(5),
|
||||
/**
|
||||
* <code>ENTRY = 6;</code>
|
||||
*/
|
||||
ENTRY(6),
|
||||
/**
|
||||
* <code>PLATFORM = 7;</code>
|
||||
*/
|
||||
PLATFORM(7),
|
||||
/**
|
||||
* <code>SCADA = 8;</code>
|
||||
*/
|
||||
SCADA(8),
|
||||
/**
|
||||
* <code>WATERPROOF_DOOR = 9;</code>
|
||||
*/
|
||||
WATERPROOF_DOOR(9),
|
||||
/**
|
||||
* <code>WORK_AREA = 10;</code>
|
||||
*/
|
||||
WORK_AREA(10),
|
||||
/**
|
||||
* <code>GAMA = 11;</code>
|
||||
*/
|
||||
GAMA(11),
|
||||
UNRECOGNIZED(-1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>UNKNOW = 0;</code>
|
||||
*/
|
||||
public static final int UNKNOW_VALUE = 0;
|
||||
/**
|
||||
* <code>RTU = 1;</code>
|
||||
*/
|
||||
public static final int RTU_VALUE = 1;
|
||||
/**
|
||||
* <code>STATION = 2;</code>
|
||||
*/
|
||||
public static final int STATION_VALUE = 2;
|
||||
/**
|
||||
* <code>SIGNAL = 3;</code>
|
||||
*/
|
||||
public static final int SIGNAL_VALUE = 3;
|
||||
/**
|
||||
* <code>SWITCH = 4;</code>
|
||||
*/
|
||||
public static final int SWITCH_VALUE = 4;
|
||||
/**
|
||||
* <code>TRACK = 5;</code>
|
||||
*/
|
||||
public static final int TRACK_VALUE = 5;
|
||||
/**
|
||||
* <code>ENTRY = 6;</code>
|
||||
*/
|
||||
public static final int ENTRY_VALUE = 6;
|
||||
/**
|
||||
* <code>PLATFORM = 7;</code>
|
||||
*/
|
||||
public static final int PLATFORM_VALUE = 7;
|
||||
/**
|
||||
* <code>SCADA = 8;</code>
|
||||
*/
|
||||
public static final int SCADA_VALUE = 8;
|
||||
/**
|
||||
* <code>WATERPROOF_DOOR = 9;</code>
|
||||
*/
|
||||
public static final int WATERPROOF_DOOR_VALUE = 9;
|
||||
/**
|
||||
* <code>WORK_AREA = 10;</code>
|
||||
*/
|
||||
public static final int WORK_AREA_VALUE = 10;
|
||||
/**
|
||||
* <code>GAMA = 11;</code>
|
||||
*/
|
||||
public static final int GAMA_VALUE = 11;
|
||||
|
||||
|
||||
public final int getNumber() {
|
||||
if (this == UNRECOGNIZED) {
|
||||
throw new java.lang.IllegalArgumentException(
|
||||
"Can't get the number of an unknown enum value.");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param value The numeric wire value of the corresponding enum entry.
|
||||
* @return The enum associated with the given numeric wire value.
|
||||
* @deprecated Use {@link #forNumber(int)} instead.
|
||||
*/
|
||||
@java.lang.Deprecated
|
||||
public static DeviceType valueOf(int value) {
|
||||
return forNumber(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param value The numeric wire value of the corresponding enum entry.
|
||||
* @return The enum associated with the given numeric wire value.
|
||||
*/
|
||||
public static DeviceType forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return UNKNOW;
|
||||
case 1: return RTU;
|
||||
case 2: return STATION;
|
||||
case 3: return SIGNAL;
|
||||
case 4: return SWITCH;
|
||||
case 5: return TRACK;
|
||||
case 6: return ENTRY;
|
||||
case 7: return PLATFORM;
|
||||
case 8: return SCADA;
|
||||
case 9: return WATERPROOF_DOOR;
|
||||
case 10: return WORK_AREA;
|
||||
case 11: return GAMA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<DeviceType>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
DeviceType> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<DeviceType>() {
|
||||
public DeviceType findValueByNumber(int number) {
|
||||
return DeviceType.forNumber(number);
|
||||
}
|
||||
};
|
||||
|
||||
public final com.google.protobuf.Descriptors.EnumValueDescriptor
|
||||
getValueDescriptor() {
|
||||
if (this == UNRECOGNIZED) {
|
||||
throw new java.lang.IllegalStateException(
|
||||
"Can't get the descriptor of an unrecognized enum value.");
|
||||
}
|
||||
return getDescriptor().getValues().get(ordinal());
|
||||
}
|
||||
public final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptorForType() {
|
||||
return getDescriptor();
|
||||
}
|
||||
public static final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptor() {
|
||||
return club.joylink.xiannccda.dto.protos.DeviceStatusProto.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final DeviceType[] VALUES = values();
|
||||
|
||||
public static DeviceType valueOf(
|
||||
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
|
||||
if (desc.getType() != getDescriptor()) {
|
||||
throw new java.lang.IllegalArgumentException(
|
||||
"EnumValueDescriptor is not for this type.");
|
||||
}
|
||||
if (desc.getIndex() == -1) {
|
||||
return UNRECOGNIZED;
|
||||
}
|
||||
return VALUES[desc.getIndex()];
|
||||
}
|
||||
|
||||
private final int value;
|
||||
|
||||
private DeviceType(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:state.DeviceType)
|
||||
}
|
||||
|
||||
public interface RtuOrBuilder extends
|
||||
// @@protoc_insertion_point(interface_extends:state.Rtu)
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
@ -19362,6 +19560,16 @@ public final class DeviceStatusProto {
|
||||
* @return The departTime.
|
||||
*/
|
||||
long getDepartTime();
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
*车次号变化状态
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool type = 31;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
boolean getType();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
@ -20083,6 +20291,21 @@ public final class DeviceStatusProto {
|
||||
return departTime_;
|
||||
}
|
||||
|
||||
public static final int TYPE_FIELD_NUMBER = 31;
|
||||
private boolean type_ = false;
|
||||
/**
|
||||
* <pre>
|
||||
*车次号变化状态
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool type = 31;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getType() {
|
||||
return type_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@ -20187,6 +20410,9 @@ public final class DeviceStatusProto {
|
||||
if (departTime_ != 0L) {
|
||||
output.writeInt64(30, departTime_);
|
||||
}
|
||||
if (type_ != false) {
|
||||
output.writeBool(31, type_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
@ -20309,6 +20535,10 @@ public final class DeviceStatusProto {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt64Size(30, departTime_);
|
||||
}
|
||||
if (type_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(31, type_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@ -20385,6 +20615,8 @@ public final class DeviceStatusProto {
|
||||
!= other.getArriveTime()) return false;
|
||||
if (getDepartTime()
|
||||
!= other.getDepartTime()) return false;
|
||||
if (getType()
|
||||
!= other.getType()) return false;
|
||||
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
|
||||
return true;
|
||||
}
|
||||
@ -20462,6 +20694,9 @@ public final class DeviceStatusProto {
|
||||
hash = (37 * hash) + DEPARTTIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getDepartTime());
|
||||
hash = (37 * hash) + TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getType());
|
||||
hash = (29 * hash) + getUnknownFields().hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@ -20627,6 +20862,7 @@ public final class DeviceStatusProto {
|
||||
rtuId_ = 0;
|
||||
arriveTime_ = 0L;
|
||||
departTime_ = 0L;
|
||||
type_ = false;
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -20750,6 +20986,9 @@ public final class DeviceStatusProto {
|
||||
if (((from_bitField0_ & 0x20000000) != 0)) {
|
||||
result.departTime_ = departTime_;
|
||||
}
|
||||
if (((from_bitField0_ & 0x40000000) != 0)) {
|
||||
result.type_ = type_;
|
||||
}
|
||||
}
|
||||
|
||||
@java.lang.Override
|
||||
@ -20868,6 +21107,9 @@ public final class DeviceStatusProto {
|
||||
if (other.getDepartTime() != 0L) {
|
||||
setDepartTime(other.getDepartTime());
|
||||
}
|
||||
if (other.getType() != false) {
|
||||
setType(other.getType());
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
onChanged();
|
||||
return this;
|
||||
@ -21044,6 +21286,11 @@ public final class DeviceStatusProto {
|
||||
bitField0_ |= 0x20000000;
|
||||
break;
|
||||
} // case 240
|
||||
case 248: {
|
||||
type_ = input.readBool();
|
||||
bitField0_ |= 0x40000000;
|
||||
break;
|
||||
} // case 248
|
||||
default: {
|
||||
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
|
||||
done = true; // was an endgroup tag
|
||||
@ -22716,6 +22963,50 @@ public final class DeviceStatusProto {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean type_ ;
|
||||
/**
|
||||
* <pre>
|
||||
*车次号变化状态
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool type = 31;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getType() {
|
||||
return type_;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*车次号变化状态
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool type = 31;</code>
|
||||
* @param value The type to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setType(boolean value) {
|
||||
|
||||
type_ = value;
|
||||
bitField0_ |= 0x40000000;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*车次号变化状态
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool type = 31;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearType() {
|
||||
bitField0_ = (bitField0_ & ~0x40000000);
|
||||
type_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@ -22976,7 +23267,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\"\251\004\n\005Train\022\017\n\007trainId\030\001 \001(\t\022\020\n\010global" +
|
||||
"\001(\010\"\267\004\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(" +
|
||||
@ -22989,9 +23280,14 @@ public final class DeviceStatusProto {
|
||||
"blockFlag\030\026 \001(\005\022\014\n\004show\030\027 \001(\010\022\016\n\006lineId\030" +
|
||||
"\030 \001(\005\022\022\n\ntrainIndex\030\031 \001(\t\022\024\n\014rollingStoc" +
|
||||
"k\030\032 \001(\005\022\017\n\007otpTime\030\033 \001(\005\022\r\n\005rtuId\030\034 \001(\005\022" +
|
||||
"\022\n\narriveTime\030\035 \001(\003\022\022\n\ndepartTime\030\036 \001(\003B" +
|
||||
"6\n!club.joylink.xiannccda.dto.protosB\021De" +
|
||||
"viceStatusProtob\006proto3"
|
||||
"\022\n\narriveTime\030\035 \001(\003\022\022\n\ndepartTime\030\036 \001(\003\022" +
|
||||
"\014\n\004type\030\037 \001(\010*\243\001\n\nDeviceType\022\n\n\006UNKNOW\020\000" +
|
||||
"\022\007\n\003RTU\020\001\022\013\n\007STATION\020\002\022\n\n\006SIGNAL\020\003\022\n\n\006SW" +
|
||||
"ITCH\020\004\022\t\n\005TRACK\020\005\022\t\n\005ENTRY\020\006\022\014\n\010PLATFORM" +
|
||||
"\020\007\022\t\n\005SCADA\020\010\022\023\n\017WATERPROOF_DOOR\020\t\022\r\n\tWO" +
|
||||
"RK_AREA\020\n\022\010\n\004GAMA\020\013B6\n!club.joylink.xian" +
|
||||
"nccda.dto.protosB\021DeviceStatusProtob\006pro" +
|
||||
"to3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@ -23080,7 +23376,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", "LineId", "TrainIndex", "RollingStock", "OtpTime", "RtuId", "ArriveTime", "DepartTime", });
|
||||
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", "TrainIndex", "RollingStock", "OtpTime", "RtuId", "ArriveTime", "DepartTime", "Type", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6f2622cd7ffbebc42d4af8bac4e79116e8ab6a0b
|
||||
Subproject commit 911d1999d0df58db7fefb59471487bd5c524269f
|
||||
Loading…
Reference in New Issue
Block a user