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 56b0c74..dde9f8d 100644 --- a/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java +++ b/src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java @@ -104,19 +104,6 @@ public class LineGraphicDataRepository { : DeviceInfoProto.Section.newBuilder().setId(sid); sectionBuilder.setCode(section.getCode()); sectionBuilder.setType(section.getSectionType()); - List childList = section.getChildrenList(); - if (CollectionUtils.isNotEmpty(childList)) { - childList.forEach( - id -> { - DeviceInfoProto.Section.Builder cb = - cacheSectionMap.containsKey(id) - ? (DeviceInfoProto.Section.Builder) cacheSectionMap.get(id) - : DeviceInfoProto.Section.newBuilder().setId(id); - cb.setId(id); - sectionBuilder.addChildren(cb); - cacheSectionMap.put(id, cb); - }); - } cacheSectionMap.put(sid, sectionBuilder); }); dataMap.put(DeviceType.Section.name(), cacheSectionMap); diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceStatusProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceStatusProto.java index 1e32a1c..2162e83 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/DeviceStatusProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/DeviceStatusProto.java @@ -6383,162 +6383,197 @@ public final class DeviceStatusProto { com.google.protobuf.MessageOrBuilder { /** + * 
+     * 连锁报告道岔占用
+     *
+ * * bool ipSingleSwitchStusCiOccupied = 1; * @return The ipSingleSwitchStusCiOccupied. */ boolean getIpSingleSwitchStusCiOccupied(); /** + * 
+     * CBTC报告道岔占用
+     *
+ * * bool ipSingleSwitchStusCbtcOccupied = 2; * @return The ipSingleSwitchStusCbtcOccupied. */ boolean getIpSingleSwitchStusCbtcOccupied(); /** + * 
+     * 道岔锁闭
+     *
+ * * bool ipSingleSwitchStusLocked = 3; * @return The ipSingleSwitchStusLocked. */ boolean getIpSingleSwitchStusLocked(); /** + * 
+     * 道岔故障锁闭
+     *
+ * * bool ipSingleSwitchStusFailLocked = 4; * @return The ipSingleSwitchStusFailLocked. */ boolean getIpSingleSwitchStusFailLocked(); /** + * 
+     * 定位
+     *
+ * * bool ipSingleSwitchStusNormal = 5; * @return The ipSingleSwitchStusNormal. */ boolean getIpSingleSwitchStusNormal(); /** + * 
+     * 反位
+     *
+ * * bool ipSingleSwitchStusReverse = 6; * @return The ipSingleSwitchStusReverse. */ boolean getIpSingleSwitchStusReverse(); /** + * 
+     * 单锁
+     *
+ * * bool ipSingleSwitchStusBlocked1 = 7; * @return The ipSingleSwitchStusBlocked1. */ boolean getIpSingleSwitchStusBlocked1(); /** + * 
+     * 挤岔
+     *
+ * * bool ipSingleSwitchStusJammed = 8; * @return The ipSingleSwitchStusJammed. */ boolean getIpSingleSwitchStusJammed(); /** - * bool ipSingleSwitchStusExpectLock = 9; - * @return The ipSingleSwitchStusExpectLock. - */ - boolean getIpSingleSwitchStusExpectLock(); - - /** - * bool ipSingleSwitchStusExpectUnlock = 10; - * @return The ipSingleSwitchStusExpectUnlock. - */ - boolean getIpSingleSwitchStusExpectUnlock(); - - /** - * bool ipSingleSwitchStusExpectNormal = 11; - * @return The ipSingleSwitchStusExpectNormal. - */ - boolean getIpSingleSwitchStusExpectNormal(); - - /** - * bool ipSingleSwitchStusExpectReverse = 12; - * @return The ipSingleSwitchStusExpectReverse. - */ - boolean getIpSingleSwitchStusExpectReverse(); - - /** - * bool ipSingleSwitchStusExpectBlock = 13; - * @return The ipSingleSwitchStusExpectBlock. - */ - boolean getIpSingleSwitchStusExpectBlock(); - - /** - * bool ipSingleSwitchStusExpectUnblock = 14; - * @return The ipSingleSwitchStusExpectUnblock. - */ - boolean getIpSingleSwitchStusExpectUnblock(); - - /** - * bool ipSingleSwitchStusInRoute = 15; - * @return The ipSingleSwitchStusInRoute. - */ - boolean getIpSingleSwitchStusInRoute(); - - /** - * bool ipSingleSwitchStusManualMode = 16; - * @return The ipSingleSwitchStusManualMode. - */ - boolean getIpSingleSwitchStusManualMode(); - - /** + * 
+     * bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+     * bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+     * bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+     * bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+     * bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+     * bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+     * bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+     * bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+     *
+ * * bool ipSingleSwitchStusCut = 17; * @return The ipSingleSwitchStusCut. */ boolean getIpSingleSwitchStusCut(); /** + * 
+     * 道岔区段被ATC报告失效
+     *
+ * * bool ipSingleSwitchStusAtcInvalid = 18; * @return The ipSingleSwitchStusAtcInvalid. */ boolean getIpSingleSwitchStusAtcInvalid(); /** + * 
+     * OVERLAP
+     *
+ * * bool ipSingleSwitchStusOverlap = 19; * @return The ipSingleSwitchStusOverlap. */ boolean getIpSingleSwitchStusOverlap(); /** + * 
+     * CBTC岔前限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcMain = 20; * @return The ipSingleSwitchStusTsrCbtcMain. */ boolean getIpSingleSwitchStusTsrCbtcMain(); /** + * 
+     * CBTC定位限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcNormal = 21; * @return The ipSingleSwitchStusTsrCbtcNormal. */ boolean getIpSingleSwitchStusTsrCbtcNormal(); /** + * 
+     * CBTC反位限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcReverse = 22; * @return The ipSingleSwitchStusTsrCbtcReverse. */ boolean getIpSingleSwitchStusTsrCbtcReverse(); /** + * 
+     * BM岔前限速
+     *
+ * * bool ipSingleSwitchStusTsrBmMain = 23; * @return The ipSingleSwitchStusTsrBmMain. */ boolean getIpSingleSwitchStusTsrBmMain(); /** + * 
+     * BM定位限速
+     *
+ * * bool ipSingleSwitchStusTsrBmNormal = 24; * @return The ipSingleSwitchStusTsrBmNormal. */ boolean getIpSingleSwitchStusTsrBmNormal(); /** + * 
+     * BM反位限速
+     *
+ * * bool ipSingleSwitchStusTsrBmReverse = 25; * @return The ipSingleSwitchStusTsrBmReverse. */ boolean getIpSingleSwitchStusTsrBmReverse(); /** + * 
+     * 道岔封锁
+     *
+ * * bool ipSingleSwitchStusBlocked2 = 26; * @return The ipSingleSwitchStusBlocked2. */ boolean getIpSingleSwitchStusBlocked2(); /** + * 
+     * 道岔失表示
+     *
+ * * bool ipSingleSwitchStusLostIndication = 27; * @return The ipSingleSwitchStusLostIndication. */ @@ -6613,6 +6648,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSCIOCCUPIED_FIELD_NUMBER = 1; private boolean ipSingleSwitchStusCiOccupied_ = false; /** + * 
+     * 连锁报告道岔占用
+     *
+ * * bool ipSingleSwitchStusCiOccupied = 1; * @return The ipSingleSwitchStusCiOccupied. */ @@ -6624,6 +6663,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSCBTCOCCUPIED_FIELD_NUMBER = 2; private boolean ipSingleSwitchStusCbtcOccupied_ = false; /** + * 
+     * CBTC报告道岔占用
+     *
+ * * bool ipSingleSwitchStusCbtcOccupied = 2; * @return The ipSingleSwitchStusCbtcOccupied. */ @@ -6635,6 +6678,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSLOCKED_FIELD_NUMBER = 3; private boolean ipSingleSwitchStusLocked_ = false; /** + * 
+     * 道岔锁闭
+     *
+ * * bool ipSingleSwitchStusLocked = 3; * @return The ipSingleSwitchStusLocked. */ @@ -6646,6 +6693,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSFAILLOCKED_FIELD_NUMBER = 4; private boolean ipSingleSwitchStusFailLocked_ = false; /** + * 
+     * 道岔故障锁闭
+     *
+ * * bool ipSingleSwitchStusFailLocked = 4; * @return The ipSingleSwitchStusFailLocked. */ @@ -6657,6 +6708,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSNORMAL_FIELD_NUMBER = 5; private boolean ipSingleSwitchStusNormal_ = false; /** + * 
+     * 定位
+     *
+ * * bool ipSingleSwitchStusNormal = 5; * @return The ipSingleSwitchStusNormal. */ @@ -6668,6 +6723,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSREVERSE_FIELD_NUMBER = 6; private boolean ipSingleSwitchStusReverse_ = false; /** + * 
+     * 反位
+     *
+ * * bool ipSingleSwitchStusReverse = 6; * @return The ipSingleSwitchStusReverse. */ @@ -6679,6 +6738,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSBLOCKED1_FIELD_NUMBER = 7; private boolean ipSingleSwitchStusBlocked1_ = false; /** + * 
+     * 单锁
+     *
+ * * bool ipSingleSwitchStusBlocked1 = 7; * @return The ipSingleSwitchStusBlocked1. */ @@ -6690,6 +6753,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSJAMMED_FIELD_NUMBER = 8; private boolean ipSingleSwitchStusJammed_ = false; /** + * 
+     * 挤岔
+     *
+ * * bool ipSingleSwitchStusJammed = 8; * @return The ipSingleSwitchStusJammed. */ @@ -6698,97 +6765,20 @@ public final class DeviceStatusProto { return ipSingleSwitchStusJammed_; } - public static final int IPSINGLESWITCHSTUSEXPECTLOCK_FIELD_NUMBER = 9; - private boolean ipSingleSwitchStusExpectLock_ = false; - /** - * bool ipSingleSwitchStusExpectLock = 9; - * @return The ipSingleSwitchStusExpectLock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectLock() { - return ipSingleSwitchStusExpectLock_; - } - - public static final int IPSINGLESWITCHSTUSEXPECTUNLOCK_FIELD_NUMBER = 10; - private boolean ipSingleSwitchStusExpectUnlock_ = false; - /** - * bool ipSingleSwitchStusExpectUnlock = 10; - * @return The ipSingleSwitchStusExpectUnlock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectUnlock() { - return ipSingleSwitchStusExpectUnlock_; - } - - public static final int IPSINGLESWITCHSTUSEXPECTNORMAL_FIELD_NUMBER = 11; - private boolean ipSingleSwitchStusExpectNormal_ = false; - /** - * bool ipSingleSwitchStusExpectNormal = 11; - * @return The ipSingleSwitchStusExpectNormal. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectNormal() { - return ipSingleSwitchStusExpectNormal_; - } - - public static final int IPSINGLESWITCHSTUSEXPECTREVERSE_FIELD_NUMBER = 12; - private boolean ipSingleSwitchStusExpectReverse_ = false; - /** - * bool ipSingleSwitchStusExpectReverse = 12; - * @return The ipSingleSwitchStusExpectReverse. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectReverse() { - return ipSingleSwitchStusExpectReverse_; - } - - public static final int IPSINGLESWITCHSTUSEXPECTBLOCK_FIELD_NUMBER = 13; - private boolean ipSingleSwitchStusExpectBlock_ = false; - /** - * bool ipSingleSwitchStusExpectBlock = 13; - * @return The ipSingleSwitchStusExpectBlock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectBlock() { - return ipSingleSwitchStusExpectBlock_; - } - - public static final int IPSINGLESWITCHSTUSEXPECTUNBLOCK_FIELD_NUMBER = 14; - private boolean ipSingleSwitchStusExpectUnblock_ = false; - /** - * bool ipSingleSwitchStusExpectUnblock = 14; - * @return The ipSingleSwitchStusExpectUnblock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectUnblock() { - return ipSingleSwitchStusExpectUnblock_; - } - - public static final int IPSINGLESWITCHSTUSINROUTE_FIELD_NUMBER = 15; - private boolean ipSingleSwitchStusInRoute_ = false; - /** - * bool ipSingleSwitchStusInRoute = 15; - * @return The ipSingleSwitchStusInRoute. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusInRoute() { - return ipSingleSwitchStusInRoute_; - } - - public static final int IPSINGLESWITCHSTUSMANUALMODE_FIELD_NUMBER = 16; - private boolean ipSingleSwitchStusManualMode_ = false; - /** - * bool ipSingleSwitchStusManualMode = 16; - * @return The ipSingleSwitchStusManualMode. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusManualMode() { - return ipSingleSwitchStusManualMode_; - } - public static final int IPSINGLESWITCHSTUSCUT_FIELD_NUMBER = 17; private boolean ipSingleSwitchStusCut_ = false; /** + * 
+     * bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+     * bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+     * bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+     * bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+     * bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+     * bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+     * bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+     * bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+     *
+ * * bool ipSingleSwitchStusCut = 17; * @return The ipSingleSwitchStusCut. */ @@ -6800,6 +6790,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSATCINVALID_FIELD_NUMBER = 18; private boolean ipSingleSwitchStusAtcInvalid_ = false; /** + * 
+     * 道岔区段被ATC报告失效
+     *
+ * * bool ipSingleSwitchStusAtcInvalid = 18; * @return The ipSingleSwitchStusAtcInvalid. */ @@ -6811,6 +6805,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSOVERLAP_FIELD_NUMBER = 19; private boolean ipSingleSwitchStusOverlap_ = false; /** + * 
+     * OVERLAP
+     *
+ * * bool ipSingleSwitchStusOverlap = 19; * @return The ipSingleSwitchStusOverlap. */ @@ -6822,6 +6820,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRCBTCMAIN_FIELD_NUMBER = 20; private boolean ipSingleSwitchStusTsrCbtcMain_ = false; /** + * 
+     * CBTC岔前限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcMain = 20; * @return The ipSingleSwitchStusTsrCbtcMain. */ @@ -6833,6 +6835,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRCBTCNORMAL_FIELD_NUMBER = 21; private boolean ipSingleSwitchStusTsrCbtcNormal_ = false; /** + * 
+     * CBTC定位限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcNormal = 21; * @return The ipSingleSwitchStusTsrCbtcNormal. */ @@ -6844,6 +6850,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRCBTCREVERSE_FIELD_NUMBER = 22; private boolean ipSingleSwitchStusTsrCbtcReverse_ = false; /** + * 
+     * CBTC反位限速
+     *
+ * * bool ipSingleSwitchStusTsrCbtcReverse = 22; * @return The ipSingleSwitchStusTsrCbtcReverse. */ @@ -6855,6 +6865,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRBMMAIN_FIELD_NUMBER = 23; private boolean ipSingleSwitchStusTsrBmMain_ = false; /** + * 
+     * BM岔前限速
+     *
+ * * bool ipSingleSwitchStusTsrBmMain = 23; * @return The ipSingleSwitchStusTsrBmMain. */ @@ -6866,6 +6880,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRBMNORMAL_FIELD_NUMBER = 24; private boolean ipSingleSwitchStusTsrBmNormal_ = false; /** + * 
+     * BM定位限速
+     *
+ * * bool ipSingleSwitchStusTsrBmNormal = 24; * @return The ipSingleSwitchStusTsrBmNormal. */ @@ -6877,6 +6895,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSTSRBMREVERSE_FIELD_NUMBER = 25; private boolean ipSingleSwitchStusTsrBmReverse_ = false; /** + * 
+     * BM反位限速
+     *
+ * * bool ipSingleSwitchStusTsrBmReverse = 25; * @return The ipSingleSwitchStusTsrBmReverse. */ @@ -6888,6 +6910,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSBLOCKED2_FIELD_NUMBER = 26; private boolean ipSingleSwitchStusBlocked2_ = false; /** + * 
+     * 道岔封锁
+     *
+ * * bool ipSingleSwitchStusBlocked2 = 26; * @return The ipSingleSwitchStusBlocked2. */ @@ -6899,6 +6925,10 @@ public final class DeviceStatusProto { public static final int IPSINGLESWITCHSTUSLOSTINDICATION_FIELD_NUMBER = 27; private boolean ipSingleSwitchStusLostIndication_ = false; /** + * 
+     * 道岔失表示
+     *
+ * * bool ipSingleSwitchStusLostIndication = 27; * @return The ipSingleSwitchStusLostIndication. */ @@ -7007,30 +7037,6 @@ public final class DeviceStatusProto { if (ipSingleSwitchStusJammed_ != false) { output.writeBool(8, ipSingleSwitchStusJammed_); } - if (ipSingleSwitchStusExpectLock_ != false) { - output.writeBool(9, ipSingleSwitchStusExpectLock_); - } - if (ipSingleSwitchStusExpectUnlock_ != false) { - output.writeBool(10, ipSingleSwitchStusExpectUnlock_); - } - if (ipSingleSwitchStusExpectNormal_ != false) { - output.writeBool(11, ipSingleSwitchStusExpectNormal_); - } - if (ipSingleSwitchStusExpectReverse_ != false) { - output.writeBool(12, ipSingleSwitchStusExpectReverse_); - } - if (ipSingleSwitchStusExpectBlock_ != false) { - output.writeBool(13, ipSingleSwitchStusExpectBlock_); - } - if (ipSingleSwitchStusExpectUnblock_ != false) { - output.writeBool(14, ipSingleSwitchStusExpectUnblock_); - } - if (ipSingleSwitchStusInRoute_ != false) { - output.writeBool(15, ipSingleSwitchStusInRoute_); - } - if (ipSingleSwitchStusManualMode_ != false) { - output.writeBool(16, ipSingleSwitchStusManualMode_); - } if (ipSingleSwitchStusCut_ != false) { output.writeBool(17, ipSingleSwitchStusCut_); } @@ -7111,38 +7117,6 @@ public final class DeviceStatusProto { size += com.google.protobuf.CodedOutputStream .computeBoolSize(8, ipSingleSwitchStusJammed_); } - if (ipSingleSwitchStusExpectLock_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, ipSingleSwitchStusExpectLock_); - } - if (ipSingleSwitchStusExpectUnlock_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(10, ipSingleSwitchStusExpectUnlock_); - } - if (ipSingleSwitchStusExpectNormal_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(11, ipSingleSwitchStusExpectNormal_); - } - if (ipSingleSwitchStusExpectReverse_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, ipSingleSwitchStusExpectReverse_); - } - if (ipSingleSwitchStusExpectBlock_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(13, ipSingleSwitchStusExpectBlock_); - } - if (ipSingleSwitchStusExpectUnblock_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(14, ipSingleSwitchStusExpectUnblock_); - } - if (ipSingleSwitchStusInRoute_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, ipSingleSwitchStusInRoute_); - } - if (ipSingleSwitchStusManualMode_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(16, ipSingleSwitchStusManualMode_); - } if (ipSingleSwitchStusCut_ != false) { size += com.google.protobuf.CodedOutputStream .computeBoolSize(17, ipSingleSwitchStusCut_); @@ -7225,22 +7199,6 @@ public final class DeviceStatusProto { != other.getIpSingleSwitchStusBlocked1()) return false; if (getIpSingleSwitchStusJammed() != other.getIpSingleSwitchStusJammed()) return false; - if (getIpSingleSwitchStusExpectLock() - != other.getIpSingleSwitchStusExpectLock()) return false; - if (getIpSingleSwitchStusExpectUnlock() - != other.getIpSingleSwitchStusExpectUnlock()) return false; - if (getIpSingleSwitchStusExpectNormal() - != other.getIpSingleSwitchStusExpectNormal()) return false; - if (getIpSingleSwitchStusExpectReverse() - != other.getIpSingleSwitchStusExpectReverse()) return false; - if (getIpSingleSwitchStusExpectBlock() - != other.getIpSingleSwitchStusExpectBlock()) return false; - if (getIpSingleSwitchStusExpectUnblock() - != other.getIpSingleSwitchStusExpectUnblock()) return false; - if (getIpSingleSwitchStusInRoute() - != other.getIpSingleSwitchStusInRoute()) return false; - if (getIpSingleSwitchStusManualMode() - != other.getIpSingleSwitchStusManualMode()) return false; if (getIpSingleSwitchStusCut() != other.getIpSingleSwitchStusCut()) return false; if (getIpSingleSwitchStusAtcInvalid() @@ -7302,30 +7260,6 @@ public final class DeviceStatusProto { hash = (37 * hash) + IPSINGLESWITCHSTUSJAMMED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIpSingleSwitchStusJammed()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTLOCK_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectLock()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTUNLOCK_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectUnlock()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTNORMAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectNormal()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTREVERSE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectReverse()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTBLOCK_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectBlock()); - hash = (37 * hash) + IPSINGLESWITCHSTUSEXPECTUNBLOCK_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusExpectUnblock()); - hash = (37 * hash) + IPSINGLESWITCHSTUSINROUTE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusInRoute()); - hash = (37 * hash) + IPSINGLESWITCHSTUSMANUALMODE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIpSingleSwitchStusManualMode()); hash = (37 * hash) + IPSINGLESWITCHSTUSCUT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIpSingleSwitchStusCut()); @@ -7502,14 +7436,6 @@ public final class DeviceStatusProto { ipSingleSwitchStusReverse_ = false; ipSingleSwitchStusBlocked1_ = false; ipSingleSwitchStusJammed_ = false; - ipSingleSwitchStusExpectLock_ = false; - ipSingleSwitchStusExpectUnlock_ = false; - ipSingleSwitchStusExpectNormal_ = false; - ipSingleSwitchStusExpectReverse_ = false; - ipSingleSwitchStusExpectBlock_ = false; - ipSingleSwitchStusExpectUnblock_ = false; - ipSingleSwitchStusInRoute_ = false; - ipSingleSwitchStusManualMode_ = false; ipSingleSwitchStusCut_ = false; ipSingleSwitchStusAtcInvalid_ = false; ipSingleSwitchStusOverlap_ = false; @@ -7581,66 +7507,42 @@ public final class DeviceStatusProto { result.ipSingleSwitchStusJammed_ = ipSingleSwitchStusJammed_; } if (((from_bitField0_ & 0x00000100) != 0)) { - result.ipSingleSwitchStusExpectLock_ = ipSingleSwitchStusExpectLock_; - } - if (((from_bitField0_ & 0x00000200) != 0)) { - result.ipSingleSwitchStusExpectUnlock_ = ipSingleSwitchStusExpectUnlock_; - } - if (((from_bitField0_ & 0x00000400) != 0)) { - result.ipSingleSwitchStusExpectNormal_ = ipSingleSwitchStusExpectNormal_; - } - if (((from_bitField0_ & 0x00000800) != 0)) { - result.ipSingleSwitchStusExpectReverse_ = ipSingleSwitchStusExpectReverse_; - } - if (((from_bitField0_ & 0x00001000) != 0)) { - result.ipSingleSwitchStusExpectBlock_ = ipSingleSwitchStusExpectBlock_; - } - if (((from_bitField0_ & 0x00002000) != 0)) { - result.ipSingleSwitchStusExpectUnblock_ = ipSingleSwitchStusExpectUnblock_; - } - if (((from_bitField0_ & 0x00004000) != 0)) { - result.ipSingleSwitchStusInRoute_ = ipSingleSwitchStusInRoute_; - } - if (((from_bitField0_ & 0x00008000) != 0)) { - result.ipSingleSwitchStusManualMode_ = ipSingleSwitchStusManualMode_; - } - if (((from_bitField0_ & 0x00010000) != 0)) { result.ipSingleSwitchStusCut_ = ipSingleSwitchStusCut_; } - if (((from_bitField0_ & 0x00020000) != 0)) { + if (((from_bitField0_ & 0x00000200) != 0)) { result.ipSingleSwitchStusAtcInvalid_ = ipSingleSwitchStusAtcInvalid_; } - if (((from_bitField0_ & 0x00040000) != 0)) { + if (((from_bitField0_ & 0x00000400) != 0)) { result.ipSingleSwitchStusOverlap_ = ipSingleSwitchStusOverlap_; } - if (((from_bitField0_ & 0x00080000) != 0)) { + if (((from_bitField0_ & 0x00000800) != 0)) { result.ipSingleSwitchStusTsrCbtcMain_ = ipSingleSwitchStusTsrCbtcMain_; } - if (((from_bitField0_ & 0x00100000) != 0)) { + if (((from_bitField0_ & 0x00001000) != 0)) { result.ipSingleSwitchStusTsrCbtcNormal_ = ipSingleSwitchStusTsrCbtcNormal_; } - if (((from_bitField0_ & 0x00200000) != 0)) { + if (((from_bitField0_ & 0x00002000) != 0)) { result.ipSingleSwitchStusTsrCbtcReverse_ = ipSingleSwitchStusTsrCbtcReverse_; } - if (((from_bitField0_ & 0x00400000) != 0)) { + if (((from_bitField0_ & 0x00004000) != 0)) { result.ipSingleSwitchStusTsrBmMain_ = ipSingleSwitchStusTsrBmMain_; } - if (((from_bitField0_ & 0x00800000) != 0)) { + if (((from_bitField0_ & 0x00008000) != 0)) { result.ipSingleSwitchStusTsrBmNormal_ = ipSingleSwitchStusTsrBmNormal_; } - if (((from_bitField0_ & 0x01000000) != 0)) { + if (((from_bitField0_ & 0x00010000) != 0)) { result.ipSingleSwitchStusTsrBmReverse_ = ipSingleSwitchStusTsrBmReverse_; } - if (((from_bitField0_ & 0x02000000) != 0)) { + if (((from_bitField0_ & 0x00020000) != 0)) { result.ipSingleSwitchStusBlocked2_ = ipSingleSwitchStusBlocked2_; } - if (((from_bitField0_ & 0x04000000) != 0)) { + if (((from_bitField0_ & 0x00040000) != 0)) { result.ipSingleSwitchStusLostIndication_ = ipSingleSwitchStusLostIndication_; } - if (((from_bitField0_ & 0x08000000) != 0)) { + if (((from_bitField0_ & 0x00080000) != 0)) { result.id_ = id_; } - if (((from_bitField0_ & 0x10000000) != 0)) { + if (((from_bitField0_ & 0x00100000) != 0)) { result.speedLimit_ = speedLimit_; } } @@ -7681,30 +7583,6 @@ public final class DeviceStatusProto { if (other.getIpSingleSwitchStusJammed() != false) { setIpSingleSwitchStusJammed(other.getIpSingleSwitchStusJammed()); } - if (other.getIpSingleSwitchStusExpectLock() != false) { - setIpSingleSwitchStusExpectLock(other.getIpSingleSwitchStusExpectLock()); - } - if (other.getIpSingleSwitchStusExpectUnlock() != false) { - setIpSingleSwitchStusExpectUnlock(other.getIpSingleSwitchStusExpectUnlock()); - } - if (other.getIpSingleSwitchStusExpectNormal() != false) { - setIpSingleSwitchStusExpectNormal(other.getIpSingleSwitchStusExpectNormal()); - } - if (other.getIpSingleSwitchStusExpectReverse() != false) { - setIpSingleSwitchStusExpectReverse(other.getIpSingleSwitchStusExpectReverse()); - } - if (other.getIpSingleSwitchStusExpectBlock() != false) { - setIpSingleSwitchStusExpectBlock(other.getIpSingleSwitchStusExpectBlock()); - } - if (other.getIpSingleSwitchStusExpectUnblock() != false) { - setIpSingleSwitchStusExpectUnblock(other.getIpSingleSwitchStusExpectUnblock()); - } - if (other.getIpSingleSwitchStusInRoute() != false) { - setIpSingleSwitchStusInRoute(other.getIpSingleSwitchStusInRoute()); - } - if (other.getIpSingleSwitchStusManualMode() != false) { - setIpSingleSwitchStusManualMode(other.getIpSingleSwitchStusManualMode()); - } if (other.getIpSingleSwitchStusCut() != false) { setIpSingleSwitchStusCut(other.getIpSingleSwitchStusCut()); } @@ -7740,7 +7618,7 @@ public final class DeviceStatusProto { } if (!other.getId().isEmpty()) { id_ = other.id_; - bitField0_ |= 0x08000000; + bitField0_ |= 0x00080000; onChanged(); } if (other.getSpeedLimit() != 0) { @@ -7812,109 +7690,69 @@ public final class DeviceStatusProto { bitField0_ |= 0x00000080; break; } // case 64 - case 72: { - ipSingleSwitchStusExpectLock_ = input.readBool(); - bitField0_ |= 0x00000100; - break; - } // case 72 - case 80: { - ipSingleSwitchStusExpectUnlock_ = input.readBool(); - bitField0_ |= 0x00000200; - break; - } // case 80 - case 88: { - ipSingleSwitchStusExpectNormal_ = input.readBool(); - bitField0_ |= 0x00000400; - break; - } // case 88 - case 96: { - ipSingleSwitchStusExpectReverse_ = input.readBool(); - bitField0_ |= 0x00000800; - break; - } // case 96 - case 104: { - ipSingleSwitchStusExpectBlock_ = input.readBool(); - bitField0_ |= 0x00001000; - break; - } // case 104 - case 112: { - ipSingleSwitchStusExpectUnblock_ = input.readBool(); - bitField0_ |= 0x00002000; - break; - } // case 112 - case 120: { - ipSingleSwitchStusInRoute_ = input.readBool(); - bitField0_ |= 0x00004000; - break; - } // case 120 - case 128: { - ipSingleSwitchStusManualMode_ = input.readBool(); - bitField0_ |= 0x00008000; - break; - } // case 128 case 136: { ipSingleSwitchStusCut_ = input.readBool(); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00000100; break; } // case 136 case 144: { ipSingleSwitchStusAtcInvalid_ = input.readBool(); - bitField0_ |= 0x00020000; + bitField0_ |= 0x00000200; break; } // case 144 case 152: { ipSingleSwitchStusOverlap_ = input.readBool(); - bitField0_ |= 0x00040000; + bitField0_ |= 0x00000400; break; } // case 152 case 160: { ipSingleSwitchStusTsrCbtcMain_ = input.readBool(); - bitField0_ |= 0x00080000; + bitField0_ |= 0x00000800; break; } // case 160 case 168: { ipSingleSwitchStusTsrCbtcNormal_ = input.readBool(); - bitField0_ |= 0x00100000; + bitField0_ |= 0x00001000; break; } // case 168 case 176: { ipSingleSwitchStusTsrCbtcReverse_ = input.readBool(); - bitField0_ |= 0x00200000; + bitField0_ |= 0x00002000; break; } // case 176 case 184: { ipSingleSwitchStusTsrBmMain_ = input.readBool(); - bitField0_ |= 0x00400000; + bitField0_ |= 0x00004000; break; } // case 184 case 192: { ipSingleSwitchStusTsrBmNormal_ = input.readBool(); - bitField0_ |= 0x00800000; + bitField0_ |= 0x00008000; break; } // case 192 case 200: { ipSingleSwitchStusTsrBmReverse_ = input.readBool(); - bitField0_ |= 0x01000000; + bitField0_ |= 0x00010000; break; } // case 200 case 208: { ipSingleSwitchStusBlocked2_ = input.readBool(); - bitField0_ |= 0x02000000; + bitField0_ |= 0x00020000; break; } // case 208 case 216: { ipSingleSwitchStusLostIndication_ = input.readBool(); - bitField0_ |= 0x04000000; + bitField0_ |= 0x00040000; break; } // case 216 case 226: { id_ = input.readStringRequireUtf8(); - bitField0_ |= 0x08000000; + bitField0_ |= 0x00080000; break; } // case 226 case 232: { speedLimit_ = input.readInt32(); - bitField0_ |= 0x10000000; + bitField0_ |= 0x00100000; break; } // case 232 default: { @@ -7936,6 +7774,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusCiOccupied_ ; /** + * 
+       * 连锁报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCiOccupied = 1; * @return The ipSingleSwitchStusCiOccupied. */ @@ -7944,6 +7786,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusCiOccupied_; } /** + * 
+       * 连锁报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCiOccupied = 1; * @param value The ipSingleSwitchStusCiOccupied to set. * @return This builder for chaining. @@ -7956,6 +7802,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 连锁报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCiOccupied = 1; * @return This builder for chaining. */ @@ -7968,6 +7818,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusCbtcOccupied_ ; /** + * 
+       * CBTC报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCbtcOccupied = 2; * @return The ipSingleSwitchStusCbtcOccupied. */ @@ -7976,6 +7830,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusCbtcOccupied_; } /** + * 
+       * CBTC报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCbtcOccupied = 2; * @param value The ipSingleSwitchStusCbtcOccupied to set. * @return This builder for chaining. @@ -7988,6 +7846,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * CBTC报告道岔占用
+       *
+ * * bool ipSingleSwitchStusCbtcOccupied = 2; * @return This builder for chaining. */ @@ -8000,6 +7862,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusLocked_ ; /** + * 
+       * 道岔锁闭
+       *
+ * * bool ipSingleSwitchStusLocked = 3; * @return The ipSingleSwitchStusLocked. */ @@ -8008,6 +7874,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusLocked_; } /** + * 
+       * 道岔锁闭
+       *
+ * * bool ipSingleSwitchStusLocked = 3; * @param value The ipSingleSwitchStusLocked to set. * @return This builder for chaining. @@ -8020,6 +7890,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 道岔锁闭
+       *
+ * * bool ipSingleSwitchStusLocked = 3; * @return This builder for chaining. */ @@ -8032,6 +7906,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusFailLocked_ ; /** + * 
+       * 道岔故障锁闭
+       *
+ * * bool ipSingleSwitchStusFailLocked = 4; * @return The ipSingleSwitchStusFailLocked. */ @@ -8040,6 +7918,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusFailLocked_; } /** + * 
+       * 道岔故障锁闭
+       *
+ * * bool ipSingleSwitchStusFailLocked = 4; * @param value The ipSingleSwitchStusFailLocked to set. * @return This builder for chaining. @@ -8052,6 +7934,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 道岔故障锁闭
+       *
+ * * bool ipSingleSwitchStusFailLocked = 4; * @return This builder for chaining. */ @@ -8064,6 +7950,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusNormal_ ; /** + * 
+       * 定位
+       *
+ * * bool ipSingleSwitchStusNormal = 5; * @return The ipSingleSwitchStusNormal. */ @@ -8072,6 +7962,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusNormal_; } /** + * 
+       * 定位
+       *
+ * * bool ipSingleSwitchStusNormal = 5; * @param value The ipSingleSwitchStusNormal to set. * @return This builder for chaining. @@ -8084,6 +7978,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 定位
+       *
+ * * bool ipSingleSwitchStusNormal = 5; * @return This builder for chaining. */ @@ -8096,6 +7994,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusReverse_ ; /** + * 
+       * 反位
+       *
+ * * bool ipSingleSwitchStusReverse = 6; * @return The ipSingleSwitchStusReverse. */ @@ -8104,6 +8006,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusReverse_; } /** + * 
+       * 反位
+       *
+ * * bool ipSingleSwitchStusReverse = 6; * @param value The ipSingleSwitchStusReverse to set. * @return This builder for chaining. @@ -8116,6 +8022,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 反位
+       *
+ * * bool ipSingleSwitchStusReverse = 6; * @return This builder for chaining. */ @@ -8128,6 +8038,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusBlocked1_ ; /** + * 
+       * 单锁
+       *
+ * * bool ipSingleSwitchStusBlocked1 = 7; * @return The ipSingleSwitchStusBlocked1. */ @@ -8136,6 +8050,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusBlocked1_; } /** + * 
+       * 单锁
+       *
+ * * bool ipSingleSwitchStusBlocked1 = 7; * @param value The ipSingleSwitchStusBlocked1 to set. * @return This builder for chaining. @@ -8148,6 +8066,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 单锁
+       *
+ * * bool ipSingleSwitchStusBlocked1 = 7; * @return This builder for chaining. */ @@ -8160,6 +8082,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusJammed_ ; /** + * 
+       * 挤岔
+       *
+ * * bool ipSingleSwitchStusJammed = 8; * @return The ipSingleSwitchStusJammed. */ @@ -8168,6 +8094,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusJammed_; } /** + * 
+       * 挤岔
+       *
+ * * bool ipSingleSwitchStusJammed = 8; * @param value The ipSingleSwitchStusJammed to set. * @return This builder for chaining. @@ -8180,6 +8110,10 @@ public final class DeviceStatusProto { return this; } /** + * 
+       * 挤岔
+       *
+ * * bool ipSingleSwitchStusJammed = 8; * @return This builder for chaining. */ @@ -8190,264 +8124,19 @@ public final class DeviceStatusProto { return this; } - private boolean ipSingleSwitchStusExpectLock_ ; - /** - * bool ipSingleSwitchStusExpectLock = 9; - * @return The ipSingleSwitchStusExpectLock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectLock() { - return ipSingleSwitchStusExpectLock_; - } - /** - * bool ipSingleSwitchStusExpectLock = 9; - * @param value The ipSingleSwitchStusExpectLock to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectLock(boolean value) { - - ipSingleSwitchStusExpectLock_ = value; - bitField0_ |= 0x00000100; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectLock = 9; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectLock() { - bitField0_ = (bitField0_ & ~0x00000100); - ipSingleSwitchStusExpectLock_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusExpectUnlock_ ; - /** - * bool ipSingleSwitchStusExpectUnlock = 10; - * @return The ipSingleSwitchStusExpectUnlock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectUnlock() { - return ipSingleSwitchStusExpectUnlock_; - } - /** - * bool ipSingleSwitchStusExpectUnlock = 10; - * @param value The ipSingleSwitchStusExpectUnlock to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectUnlock(boolean value) { - - ipSingleSwitchStusExpectUnlock_ = value; - bitField0_ |= 0x00000200; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectUnlock = 10; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectUnlock() { - bitField0_ = (bitField0_ & ~0x00000200); - ipSingleSwitchStusExpectUnlock_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusExpectNormal_ ; - /** - * bool ipSingleSwitchStusExpectNormal = 11; - * @return The ipSingleSwitchStusExpectNormal. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectNormal() { - return ipSingleSwitchStusExpectNormal_; - } - /** - * bool ipSingleSwitchStusExpectNormal = 11; - * @param value The ipSingleSwitchStusExpectNormal to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectNormal(boolean value) { - - ipSingleSwitchStusExpectNormal_ = value; - bitField0_ |= 0x00000400; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectNormal = 11; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectNormal() { - bitField0_ = (bitField0_ & ~0x00000400); - ipSingleSwitchStusExpectNormal_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusExpectReverse_ ; - /** - * bool ipSingleSwitchStusExpectReverse = 12; - * @return The ipSingleSwitchStusExpectReverse. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectReverse() { - return ipSingleSwitchStusExpectReverse_; - } - /** - * bool ipSingleSwitchStusExpectReverse = 12; - * @param value The ipSingleSwitchStusExpectReverse to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectReverse(boolean value) { - - ipSingleSwitchStusExpectReverse_ = value; - bitField0_ |= 0x00000800; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectReverse = 12; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectReverse() { - bitField0_ = (bitField0_ & ~0x00000800); - ipSingleSwitchStusExpectReverse_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusExpectBlock_ ; - /** - * bool ipSingleSwitchStusExpectBlock = 13; - * @return The ipSingleSwitchStusExpectBlock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectBlock() { - return ipSingleSwitchStusExpectBlock_; - } - /** - * bool ipSingleSwitchStusExpectBlock = 13; - * @param value The ipSingleSwitchStusExpectBlock to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectBlock(boolean value) { - - ipSingleSwitchStusExpectBlock_ = value; - bitField0_ |= 0x00001000; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectBlock = 13; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectBlock() { - bitField0_ = (bitField0_ & ~0x00001000); - ipSingleSwitchStusExpectBlock_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusExpectUnblock_ ; - /** - * bool ipSingleSwitchStusExpectUnblock = 14; - * @return The ipSingleSwitchStusExpectUnblock. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusExpectUnblock() { - return ipSingleSwitchStusExpectUnblock_; - } - /** - * bool ipSingleSwitchStusExpectUnblock = 14; - * @param value The ipSingleSwitchStusExpectUnblock to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusExpectUnblock(boolean value) { - - ipSingleSwitchStusExpectUnblock_ = value; - bitField0_ |= 0x00002000; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusExpectUnblock = 14; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusExpectUnblock() { - bitField0_ = (bitField0_ & ~0x00002000); - ipSingleSwitchStusExpectUnblock_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusInRoute_ ; - /** - * bool ipSingleSwitchStusInRoute = 15; - * @return The ipSingleSwitchStusInRoute. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusInRoute() { - return ipSingleSwitchStusInRoute_; - } - /** - * bool ipSingleSwitchStusInRoute = 15; - * @param value The ipSingleSwitchStusInRoute to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusInRoute(boolean value) { - - ipSingleSwitchStusInRoute_ = value; - bitField0_ |= 0x00004000; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusInRoute = 15; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusInRoute() { - bitField0_ = (bitField0_ & ~0x00004000); - ipSingleSwitchStusInRoute_ = false; - onChanged(); - return this; - } - - private boolean ipSingleSwitchStusManualMode_ ; - /** - * bool ipSingleSwitchStusManualMode = 16; - * @return The ipSingleSwitchStusManualMode. - */ - @java.lang.Override - public boolean getIpSingleSwitchStusManualMode() { - return ipSingleSwitchStusManualMode_; - } - /** - * bool ipSingleSwitchStusManualMode = 16; - * @param value The ipSingleSwitchStusManualMode to set. - * @return This builder for chaining. - */ - public Builder setIpSingleSwitchStusManualMode(boolean value) { - - ipSingleSwitchStusManualMode_ = value; - bitField0_ |= 0x00008000; - onChanged(); - return this; - } - /** - * bool ipSingleSwitchStusManualMode = 16; - * @return This builder for chaining. - */ - public Builder clearIpSingleSwitchStusManualMode() { - bitField0_ = (bitField0_ & ~0x00008000); - ipSingleSwitchStusManualMode_ = false; - onChanged(); - return this; - } - private boolean ipSingleSwitchStusCut_ ; /** + * 
+       * bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+       * bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+       * bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+       * bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+       * bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+       * bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+       * bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+       * bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+       *
+ * * bool ipSingleSwitchStusCut = 17; * @return The ipSingleSwitchStusCut. */ @@ -8456,6 +8145,17 @@ public final class DeviceStatusProto { return ipSingleSwitchStusCut_; } /** + * 
+       * bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+       * bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+       * bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+       * bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+       * bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+       * bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+       * bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+       * bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+       *
+ * * bool ipSingleSwitchStusCut = 17; * @param value The ipSingleSwitchStusCut to set. * @return This builder for chaining. @@ -8463,16 +8163,27 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusCut(boolean value) { ipSingleSwitchStusCut_ = value; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00000100; onChanged(); return this; } /** + * 
+       * bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+       * bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+       * bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+       * bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+       * bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+       * bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+       * bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+       * bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+       *
+ * * bool ipSingleSwitchStusCut = 17; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusCut() { - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00000100); ipSingleSwitchStusCut_ = false; onChanged(); return this; @@ -8480,6 +8191,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusAtcInvalid_ ; /** + * 
+       * 道岔区段被ATC报告失效
+       *
+ * * bool ipSingleSwitchStusAtcInvalid = 18; * @return The ipSingleSwitchStusAtcInvalid. */ @@ -8488,6 +8203,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusAtcInvalid_; } /** + * 
+       * 道岔区段被ATC报告失效
+       *
+ * * bool ipSingleSwitchStusAtcInvalid = 18; * @param value The ipSingleSwitchStusAtcInvalid to set. * @return This builder for chaining. @@ -8495,16 +8214,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusAtcInvalid(boolean value) { ipSingleSwitchStusAtcInvalid_ = value; - bitField0_ |= 0x00020000; + bitField0_ |= 0x00000200; onChanged(); return this; } /** + * 
+       * 道岔区段被ATC报告失效
+       *
+ * * bool ipSingleSwitchStusAtcInvalid = 18; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusAtcInvalid() { - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00000200); ipSingleSwitchStusAtcInvalid_ = false; onChanged(); return this; @@ -8512,6 +8235,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusOverlap_ ; /** + * 
+       * OVERLAP
+       *
+ * * bool ipSingleSwitchStusOverlap = 19; * @return The ipSingleSwitchStusOverlap. */ @@ -8520,6 +8247,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusOverlap_; } /** + * 
+       * OVERLAP
+       *
+ * * bool ipSingleSwitchStusOverlap = 19; * @param value The ipSingleSwitchStusOverlap to set. * @return This builder for chaining. @@ -8527,16 +8258,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusOverlap(boolean value) { ipSingleSwitchStusOverlap_ = value; - bitField0_ |= 0x00040000; + bitField0_ |= 0x00000400; onChanged(); return this; } /** + * 
+       * OVERLAP
+       *
+ * * bool ipSingleSwitchStusOverlap = 19; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusOverlap() { - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00000400); ipSingleSwitchStusOverlap_ = false; onChanged(); return this; @@ -8544,6 +8279,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrCbtcMain_ ; /** + * 
+       * CBTC岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcMain = 20; * @return The ipSingleSwitchStusTsrCbtcMain. */ @@ -8552,6 +8291,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrCbtcMain_; } /** + * 
+       * CBTC岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcMain = 20; * @param value The ipSingleSwitchStusTsrCbtcMain to set. * @return This builder for chaining. @@ -8559,16 +8302,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrCbtcMain(boolean value) { ipSingleSwitchStusTsrCbtcMain_ = value; - bitField0_ |= 0x00080000; + bitField0_ |= 0x00000800; onChanged(); return this; } /** + * 
+       * CBTC岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcMain = 20; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrCbtcMain() { - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00000800); ipSingleSwitchStusTsrCbtcMain_ = false; onChanged(); return this; @@ -8576,6 +8323,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrCbtcNormal_ ; /** + * 
+       * CBTC定位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcNormal = 21; * @return The ipSingleSwitchStusTsrCbtcNormal. */ @@ -8584,6 +8335,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrCbtcNormal_; } /** + * 
+       * CBTC定位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcNormal = 21; * @param value The ipSingleSwitchStusTsrCbtcNormal to set. * @return This builder for chaining. @@ -8591,16 +8346,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrCbtcNormal(boolean value) { ipSingleSwitchStusTsrCbtcNormal_ = value; - bitField0_ |= 0x00100000; + bitField0_ |= 0x00001000; onChanged(); return this; } /** + * 
+       * CBTC定位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcNormal = 21; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrCbtcNormal() { - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00001000); ipSingleSwitchStusTsrCbtcNormal_ = false; onChanged(); return this; @@ -8608,6 +8367,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrCbtcReverse_ ; /** + * 
+       * CBTC反位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcReverse = 22; * @return The ipSingleSwitchStusTsrCbtcReverse. */ @@ -8616,6 +8379,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrCbtcReverse_; } /** + * 
+       * CBTC反位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcReverse = 22; * @param value The ipSingleSwitchStusTsrCbtcReverse to set. * @return This builder for chaining. @@ -8623,16 +8390,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrCbtcReverse(boolean value) { ipSingleSwitchStusTsrCbtcReverse_ = value; - bitField0_ |= 0x00200000; + bitField0_ |= 0x00002000; onChanged(); return this; } /** + * 
+       * CBTC反位限速
+       *
+ * * bool ipSingleSwitchStusTsrCbtcReverse = 22; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrCbtcReverse() { - bitField0_ = (bitField0_ & ~0x00200000); + bitField0_ = (bitField0_ & ~0x00002000); ipSingleSwitchStusTsrCbtcReverse_ = false; onChanged(); return this; @@ -8640,6 +8411,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrBmMain_ ; /** + * 
+       * BM岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrBmMain = 23; * @return The ipSingleSwitchStusTsrBmMain. */ @@ -8648,6 +8423,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrBmMain_; } /** + * 
+       * BM岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrBmMain = 23; * @param value The ipSingleSwitchStusTsrBmMain to set. * @return This builder for chaining. @@ -8655,16 +8434,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrBmMain(boolean value) { ipSingleSwitchStusTsrBmMain_ = value; - bitField0_ |= 0x00400000; + bitField0_ |= 0x00004000; onChanged(); return this; } /** + * 
+       * BM岔前限速
+       *
+ * * bool ipSingleSwitchStusTsrBmMain = 23; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrBmMain() { - bitField0_ = (bitField0_ & ~0x00400000); + bitField0_ = (bitField0_ & ~0x00004000); ipSingleSwitchStusTsrBmMain_ = false; onChanged(); return this; @@ -8672,6 +8455,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrBmNormal_ ; /** + * 
+       * BM定位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmNormal = 24; * @return The ipSingleSwitchStusTsrBmNormal. */ @@ -8680,6 +8467,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrBmNormal_; } /** + * 
+       * BM定位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmNormal = 24; * @param value The ipSingleSwitchStusTsrBmNormal to set. * @return This builder for chaining. @@ -8687,16 +8478,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrBmNormal(boolean value) { ipSingleSwitchStusTsrBmNormal_ = value; - bitField0_ |= 0x00800000; + bitField0_ |= 0x00008000; onChanged(); return this; } /** + * 
+       * BM定位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmNormal = 24; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrBmNormal() { - bitField0_ = (bitField0_ & ~0x00800000); + bitField0_ = (bitField0_ & ~0x00008000); ipSingleSwitchStusTsrBmNormal_ = false; onChanged(); return this; @@ -8704,6 +8499,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusTsrBmReverse_ ; /** + * 
+       * BM反位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmReverse = 25; * @return The ipSingleSwitchStusTsrBmReverse. */ @@ -8712,6 +8511,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusTsrBmReverse_; } /** + * 
+       * BM反位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmReverse = 25; * @param value The ipSingleSwitchStusTsrBmReverse to set. * @return This builder for chaining. @@ -8719,16 +8522,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusTsrBmReverse(boolean value) { ipSingleSwitchStusTsrBmReverse_ = value; - bitField0_ |= 0x01000000; + bitField0_ |= 0x00010000; onChanged(); return this; } /** + * 
+       * BM反位限速
+       *
+ * * bool ipSingleSwitchStusTsrBmReverse = 25; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusTsrBmReverse() { - bitField0_ = (bitField0_ & ~0x01000000); + bitField0_ = (bitField0_ & ~0x00010000); ipSingleSwitchStusTsrBmReverse_ = false; onChanged(); return this; @@ -8736,6 +8543,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusBlocked2_ ; /** + * 
+       * 道岔封锁
+       *
+ * * bool ipSingleSwitchStusBlocked2 = 26; * @return The ipSingleSwitchStusBlocked2. */ @@ -8744,6 +8555,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusBlocked2_; } /** + * 
+       * 道岔封锁
+       *
+ * * bool ipSingleSwitchStusBlocked2 = 26; * @param value The ipSingleSwitchStusBlocked2 to set. * @return This builder for chaining. @@ -8751,16 +8566,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusBlocked2(boolean value) { ipSingleSwitchStusBlocked2_ = value; - bitField0_ |= 0x02000000; + bitField0_ |= 0x00020000; onChanged(); return this; } /** + * 
+       * 道岔封锁
+       *
+ * * bool ipSingleSwitchStusBlocked2 = 26; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusBlocked2() { - bitField0_ = (bitField0_ & ~0x02000000); + bitField0_ = (bitField0_ & ~0x00020000); ipSingleSwitchStusBlocked2_ = false; onChanged(); return this; @@ -8768,6 +8587,10 @@ public final class DeviceStatusProto { private boolean ipSingleSwitchStusLostIndication_ ; /** + * 
+       * 道岔失表示
+       *
+ * * bool ipSingleSwitchStusLostIndication = 27; * @return The ipSingleSwitchStusLostIndication. */ @@ -8776,6 +8599,10 @@ public final class DeviceStatusProto { return ipSingleSwitchStusLostIndication_; } /** + * 
+       * 道岔失表示
+       *
+ * * bool ipSingleSwitchStusLostIndication = 27; * @param value The ipSingleSwitchStusLostIndication to set. * @return This builder for chaining. @@ -8783,16 +8610,20 @@ public final class DeviceStatusProto { public Builder setIpSingleSwitchStusLostIndication(boolean value) { ipSingleSwitchStusLostIndication_ = value; - bitField0_ |= 0x04000000; + bitField0_ |= 0x00040000; onChanged(); return this; } /** + * 
+       * 道岔失表示
+       *
+ * * bool ipSingleSwitchStusLostIndication = 27; * @return This builder for chaining. */ public Builder clearIpSingleSwitchStusLostIndication() { - bitField0_ = (bitField0_ & ~0x04000000); + bitField0_ = (bitField0_ & ~0x00040000); ipSingleSwitchStusLostIndication_ = false; onChanged(); return this; @@ -8853,7 +8684,7 @@ public final class DeviceStatusProto { java.lang.String value) { if (value == null) { throw new NullPointerException(); } id_ = value; - bitField0_ |= 0x08000000; + bitField0_ |= 0x00080000; onChanged(); return this; } @@ -8867,7 +8698,7 @@ public final class DeviceStatusProto { */ public Builder clearId() { id_ = getDefaultInstance().getId(); - bitField0_ = (bitField0_ & ~0x08000000); + bitField0_ = (bitField0_ & ~0x00080000); onChanged(); return this; } @@ -8885,7 +8716,7 @@ public final class DeviceStatusProto { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); id_ = value; - bitField0_ |= 0x08000000; + bitField0_ |= 0x00080000; onChanged(); return this; } @@ -8915,7 +8746,7 @@ public final class DeviceStatusProto { public Builder setSpeedLimit(int value) { speedLimit_ = value; - bitField0_ |= 0x10000000; + bitField0_ |= 0x00100000; onChanged(); return this; } @@ -8928,7 +8759,7 @@ public final class DeviceStatusProto { * @return This builder for chaining. */ public Builder clearSpeedLimit() { - bitField0_ = (bitField0_ & ~0x10000000); + bitField0_ = (bitField0_ & ~0x00100000); speedLimit_ = 0; onChanged(); return this; @@ -9155,7 +8986,7 @@ public final class DeviceStatusProto { /** * 
-     *track限速类型
+     * track限速类型
      *
* * Protobuf enum {@code state.Track.LimitType} @@ -18549,8 +18380,8 @@ public final class DeviceStatusProto { /** * 
-     *true 代表与当前线路号的信息源(server)连接正常
-     *false 代表断开
+     * true 代表与当前线路号的信息源(server)连接正常
+     * false 代表断开
      *
* * bool active = 2; @@ -18560,8 +18391,8 @@ public final class DeviceStatusProto { } /** * 
-   *2.7.2	信息源网络状态消息
-   *NCC FEP与OCC FEP 间的网络连接状态
+   * 2.7.2	信息源网络状态消息
+   * NCC FEP与OCC FEP 间的网络连接状态
    *
* * Protobuf type {@code state.OccNccFepNetwork} @@ -18650,8 +18481,8 @@ public final class DeviceStatusProto { private boolean active_ = false; /** * 
-     *true 代表与当前线路号的信息源(server)连接正常
-     *false 代表断开
+     * true 代表与当前线路号的信息源(server)连接正常
+     * false 代表断开
      *
* * bool active = 2; @@ -18832,8 +18663,8 @@ public final class DeviceStatusProto { } /** * 
-     *2.7.2	信息源网络状态消息
-     *NCC FEP与OCC FEP 间的网络连接状态
+     * 2.7.2	信息源网络状态消息
+     * NCC FEP与OCC FEP 间的网络连接状态
      *
* * Protobuf type {@code state.OccNccFepNetwork} @@ -19080,8 +18911,8 @@ public final class DeviceStatusProto { private boolean active_ ; /** * 
-       *true 代表与当前线路号的信息源(server)连接正常
-       *false 代表断开
+       * true 代表与当前线路号的信息源(server)连接正常
+       * false 代表断开
        *
* * bool active = 2; @@ -19093,8 +18924,8 @@ public final class DeviceStatusProto { } /** * 
-       *true 代表与当前线路号的信息源(server)连接正常
-       *false 代表断开
+       * true 代表与当前线路号的信息源(server)连接正常
+       * false 代表断开
        *
* * bool active = 2; @@ -19110,8 +18941,8 @@ public final class DeviceStatusProto { } /** * 
-       *true 代表与当前线路号的信息源(server)连接正常
-       *false 代表断开
+       * true 代表与当前线路号的信息源(server)连接正常
+       * false 代表断开
        *
* * bool active = 2; @@ -19297,7 +19128,7 @@ public final class DeviceStatusProto { "\001(\010\022\023\n\013yellowGreen\030\025 \001(\010\022\017\n\007blocked\030\026 \001(" + "\010\022\023\n\013lampFailure\030\027 \001(\010\022\n\n\002id\030\030 \001(\t\"I\n\005En" + "try\022\017\n\007dirLeft\030\001 \001(\010\022\020\n\010dirRight\030\002 \001(\010\022\021" + - "\n\tdirLocked\030\003 \001(\010\022\n\n\002id\030\004 \001(\t\"\245\010\n\006Switch" + + "\n\tdirLocked\030\003 \001(\010\022\n\n\002id\030\004 \001(\t\"\355\005\n\006Switch" + "\022$\n\034ipSingleSwitchStusCiOccupied\030\001 \001(\010\022&" + "\n\036ipSingleSwitchStusCbtcOccupied\030\002 \001(\010\022 " + "\n\030ipSingleSwitchStusLocked\030\003 \001(\010\022$\n\034ipSi" + @@ -19305,85 +19136,78 @@ public final class DeviceStatusProto { "leSwitchStusNormal\030\005 \001(\010\022!\n\031ipSingleSwit" + "chStusReverse\030\006 \001(\010\022\"\n\032ipSingleSwitchStu" + "sBlocked1\030\007 \001(\010\022 \n\030ipSingleSwitchStusJam" + - "med\030\010 \001(\010\022$\n\034ipSingleSwitchStusExpectLoc" + - "k\030\t \001(\010\022&\n\036ipSingleSwitchStusExpectUnloc" + - "k\030\n \001(\010\022&\n\036ipSingleSwitchStusExpectNorma" + - "l\030\013 \001(\010\022\'\n\037ipSingleSwitchStusExpectRever" + - "se\030\014 \001(\010\022%\n\035ipSingleSwitchStusExpectBloc" + - "k\030\r \001(\010\022\'\n\037ipSingleSwitchStusExpectUnblo" + - "ck\030\016 \001(\010\022!\n\031ipSingleSwitchStusInRoute\030\017 " + - "\001(\010\022$\n\034ipSingleSwitchStusManualMode\030\020 \001(" + - "\010\022\035\n\025ipSingleSwitchStusCut\030\021 \001(\010\022$\n\034ipSi" + - "ngleSwitchStusAtcInvalid\030\022 \001(\010\022!\n\031ipSing" + - "leSwitchStusOverlap\030\023 \001(\010\022%\n\035ipSingleSwi" + - "tchStusTsrCbtcMain\030\024 \001(\010\022\'\n\037ipSingleSwit" + - "chStusTsrCbtcNormal\030\025 \001(\010\022(\n ipSingleSwi" + - "tchStusTsrCbtcReverse\030\026 \001(\010\022#\n\033ipSingleS" + - "witchStusTsrBmMain\030\027 \001(\010\022%\n\035ipSingleSwit" + - "chStusTsrBmNormal\030\030 \001(\010\022&\n\036ipSingleSwitc" + - "hStusTsrBmReverse\030\031 \001(\010\022\"\n\032ipSingleSwitc" + - "hStusBlocked2\030\032 \001(\010\022(\n ipSingleSwitchStu" + - "sLostIndication\030\033 \001(\010\022\n\n\002id\030\034 \001(\t\022\022\n\nspe" + - "edLimit\030\035 \001(\005\"\344\002\n\005Track\022\022\n\nciOccupied\030\001 " + - "\001(\010\022\024\n\014cbtcOccupied\030\002 \001(\010\022\016\n\006locked\030\003 \001(" + - "\010\022\022\n\nfailLocked\030\004 \001(\010\022\022\n\nexpectLock\030\005 \001(" + - "\010\022\024\n\014expectUnlock\030\006 \001(\010\022\017\n\007inRoute\030\007 \001(\010" + - "\022\013\n\003cut\030\010 \001(\010\022\022\n\natcInvalid\030\t \001(\010\022\017\n\007ove" + - "rlap\030\n \001(\010\022\017\n\007blocked\030\013 \001(\010\022\n\n\002id\030\014 \001(\t\022" + - "\022\n\nspeedLimit\030\r \001(\005\022)\n\tlimitType\030\016 \001(\0162\026" + - ".state.Track.LimitType\"D\n\tLimitType\022\013\n\007U" + - "nknown\020\000\022\010\n\004Cbtc\020\001\022\r\n\tInterlock\020\002\022\021\n\rCbt" + - "cInterlock\020\004\"\340\002\n\010Platform\022\021\n\temergstop\030\001" + - " \001(\010\022\022\n\ntrainberth\030\002 \001(\010\022\r\n\005close\030\003 \001(\010\022" + - "\016\n\006upHold\030\004 \001(\010\022\020\n\010downHold\030\005 \001(\010\022\021\n\tupO" + - "ccHold\030\006 \001(\010\022\023\n\013downOccHold\030\007 \001(\010\022\017\n\007psd" + - "Open\030\010 \001(\010\022\016\n\006psdCut\030\t \001(\010\022\022\n\nupSkipstop" + - "\030\n \001(\010\022\024\n\014downSkipstop\030\013 \001(\010\022\027\n\017upTrainS" + - "kipstop\030\014 \001(\010\022\031\n\021downTrainSkipstop\030\r \001(\010" + - "\022\n\n\002id\030\016 \001(\t\022\032\n\022nextSectionRunTime\030\017 \001(\005" + - "\022\033\n\023nextSectionRunLevel\030\020 \001(\005\022\020\n\010stopTim" + - "e\030\021 \001(\005\"S\n\005Scada\022\017\n\007scadaOn\030\001 \001(\010\022\030\n\020sca" + - "daSinglePower\030\002 \001(\010\022\023\n\013scadaUnkown\030\003 \001(\010" + - "\022\n\n\002id\030\004 \001(\t\"\215\001\n\016WaterProofDoor\022\022\n\ndoorC" + - "losed\030\001 \001(\010\022\027\n\017doorExpectClose\030\002 \001(\010\022\027\n\017" + - "doorAgreeClosed\030\003 \001(\010\022\023\n\013doorClosing\030\004 \001" + - "(\010\022\024\n\014doorOpenLock\030\005 \001(\010\022\n\n\002id\030\006 \001(\t\"4\n\010" + - "WorkArea\022\034\n\024ipStusWorkAreaEnable\030\001 \001(\010\022\n" + - "\n\002id\030\002 \001(\t\"-\n\004Gama\022\031\n\021ipStusGamaDisable\030" + - "\001 \001(\010\022\n\n\002id\030\002 \001(\t\"\237\010\n\tTrainMode\022\035\n\025ipMod" + - "eTrainTypeManual\030\001 \001(\010\022\033\n\023ipModeTrainTyp" + - "eHead\030\002 \001(\010\022\036\n\026ipModeTrainTypeSpecial\030\003 " + - "\001(\010\022\037\n\027ipModeTrainTypeSchedule\030\004 \001(\010\022\034\n\024" + - "ipModeTrainTypeRoute\030\005 \001(\010\022\036\n\026ipModeTrai" + - "nTypeShuttle\030\006 \001(\010\022\035\n\025ipModeTrainTypeLin" + - "eup\030\007 \001(\010\022\034\n\024ipModeTrainSchdEarly\030\010 \001(\010\022" + - "\033\n\023ipModeTrainSchdLate\030\t \001(\010\022\033\n\023ipModeTr" + - "ainSkipstop\030\n \001(\010\022\033\n\023ipModeTrainCbtcMode" + - "\030\013 \001(\010\022\031\n\021ipModeTrainAtpCut\030\014 \001(\010\022\032\n\022ipM" + - "odeTrainBerthed\030\r \001(\010\022\031\n\021ipModeTrainStop" + - "ed\030\016 \001(\010\022\031\n\021ipModeTrainHolded\030\017 \001(\010\022\030\n\020i" + - "pModeTrainItama\030\020 \001(\010\022\030\n\020ipModeTrainDirU" + - "p\030\021 \001(\010\022\032\n\022ipModeTrainDirDown\030\022 \001(\010\022\034\n\024i" + - "pModeTrainDirHeadUp\030\023 \001(\010\022\036\n\026ipModeTrain" + - "DirHeadDown\030\024 \001(\010\022\033\n\023ipModeTrainDoorOpen" + - "\030\025 \001(\010\022\032\n\022ipModeTrainRsAlarm\030\026 \001(\010\022\034\n\024ip" + - "ModeTrainDoorAlarm\030\027 \001(\010\022\032\n\022ipModeTrainE" + - "bAlarm\030\030 \001(\010\022!\n\031ipModeTrainIntegrityAlar" + - "m\030\031 \001(\010\022\036\n\026ipModeTrainDriveModeAm\030\032 \001(\010\022" + - "\036\n\026ipModeTrainDriveModeCm\030\033 \001(\010\022\037\n\027ipMod" + - "eTrainDriveModeRmf\030\034 \001(\010\022\037\n\027ipModeTrainD" + - "riveModeDto\030\035 \001(\010\022\037\n\027ipModeTrainDriveMod" + - "eAtb\030\036 \001(\010\022\037\n\027ipModeTrainDriveBlockAm\030\037 " + - "\001(\010\022\037\n\027ipModeTrainDriveBlockCm\030 \001(\010\022\037\n\027" + - "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*\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\006SWITCH\020\004\022\t\n\005" + - "TRACK\020\005\022\t\n\005ENTRY\020\006\022\014\n\010PLATFORM\020\007\022\t\n\005SCAD" + - "A\020\t\022\023\n\017WATERPROOF_DOOR\020\013\022\r\n\tWORK_AREA\020\014\022" + - "\010\n\004GAMA\020\rB6\n!club.joylink.xiannccda.dto." + - "protosB\021DeviceStatusProtob\006proto3" + "med\030\010 \001(\010\022\035\n\025ipSingleSwitchStusCut\030\021 \001(\010" + + "\022$\n\034ipSingleSwitchStusAtcInvalid\030\022 \001(\010\022!" + + "\n\031ipSingleSwitchStusOverlap\030\023 \001(\010\022%\n\035ipS" + + "ingleSwitchStusTsrCbtcMain\030\024 \001(\010\022\'\n\037ipSi" + + "ngleSwitchStusTsrCbtcNormal\030\025 \001(\010\022(\n ipS" + + "ingleSwitchStusTsrCbtcReverse\030\026 \001(\010\022#\n\033i" + + "pSingleSwitchStusTsrBmMain\030\027 \001(\010\022%\n\035ipSi" + + "ngleSwitchStusTsrBmNormal\030\030 \001(\010\022&\n\036ipSin" + + "gleSwitchStusTsrBmReverse\030\031 \001(\010\022\"\n\032ipSin" + + "gleSwitchStusBlocked2\030\032 \001(\010\022(\n ipSingleS" + + "witchStusLostIndication\030\033 \001(\010\022\n\n\002id\030\034 \001(" + + "\t\022\022\n\nspeedLimit\030\035 \001(\005\"\344\002\n\005Track\022\022\n\nciOcc" + + "upied\030\001 \001(\010\022\024\n\014cbtcOccupied\030\002 \001(\010\022\016\n\006loc" + + "ked\030\003 \001(\010\022\022\n\nfailLocked\030\004 \001(\010\022\022\n\nexpectL" + + "ock\030\005 \001(\010\022\024\n\014expectUnlock\030\006 \001(\010\022\017\n\007inRou" + + "te\030\007 \001(\010\022\013\n\003cut\030\010 \001(\010\022\022\n\natcInvalid\030\t \001(" + + "\010\022\017\n\007overlap\030\n \001(\010\022\017\n\007blocked\030\013 \001(\010\022\n\n\002i" + + "d\030\014 \001(\t\022\022\n\nspeedLimit\030\r \001(\005\022)\n\tlimitType" + + "\030\016 \001(\0162\026.state.Track.LimitType\"D\n\tLimitT" + + "ype\022\013\n\007Unknown\020\000\022\010\n\004Cbtc\020\001\022\r\n\tInterlock\020" + + "\002\022\021\n\rCbtcInterlock\020\004\"\340\002\n\010Platform\022\021\n\teme" + + "rgstop\030\001 \001(\010\022\022\n\ntrainberth\030\002 \001(\010\022\r\n\005clos" + + "e\030\003 \001(\010\022\016\n\006upHold\030\004 \001(\010\022\020\n\010downHold\030\005 \001(" + + "\010\022\021\n\tupOccHold\030\006 \001(\010\022\023\n\013downOccHold\030\007 \001(" + + "\010\022\017\n\007psdOpen\030\010 \001(\010\022\016\n\006psdCut\030\t \001(\010\022\022\n\nup" + + "Skipstop\030\n \001(\010\022\024\n\014downSkipstop\030\013 \001(\010\022\027\n\017" + + "upTrainSkipstop\030\014 \001(\010\022\031\n\021downTrainSkipst" + + "op\030\r \001(\010\022\n\n\002id\030\016 \001(\t\022\032\n\022nextSectionRunTi" + + "me\030\017 \001(\005\022\033\n\023nextSectionRunLevel\030\020 \001(\005\022\020\n" + + "\010stopTime\030\021 \001(\005\"S\n\005Scada\022\017\n\007scadaOn\030\001 \001(" + + "\010\022\030\n\020scadaSinglePower\030\002 \001(\010\022\023\n\013scadaUnko" + + "wn\030\003 \001(\010\022\n\n\002id\030\004 \001(\t\"\215\001\n\016WaterProofDoor\022" + + "\022\n\ndoorClosed\030\001 \001(\010\022\027\n\017doorExpectClose\030\002" + + " \001(\010\022\027\n\017doorAgreeClosed\030\003 \001(\010\022\023\n\013doorClo" + + "sing\030\004 \001(\010\022\024\n\014doorOpenLock\030\005 \001(\010\022\n\n\002id\030\006" + + " \001(\t\"4\n\010WorkArea\022\034\n\024ipStusWorkAreaEnable" + + "\030\001 \001(\010\022\n\n\002id\030\002 \001(\t\"-\n\004Gama\022\031\n\021ipStusGama" + + "Disable\030\001 \001(\010\022\n\n\002id\030\002 \001(\t\"\237\010\n\tTrainMode\022" + + "\035\n\025ipModeTrainTypeManual\030\001 \001(\010\022\033\n\023ipMode" + + "TrainTypeHead\030\002 \001(\010\022\036\n\026ipModeTrainTypeSp" + + "ecial\030\003 \001(\010\022\037\n\027ipModeTrainTypeSchedule\030\004" + + " \001(\010\022\034\n\024ipModeTrainTypeRoute\030\005 \001(\010\022\036\n\026ip" + + "ModeTrainTypeShuttle\030\006 \001(\010\022\035\n\025ipModeTrai" + + "nTypeLineup\030\007 \001(\010\022\034\n\024ipModeTrainSchdEarl" + + "y\030\010 \001(\010\022\033\n\023ipModeTrainSchdLate\030\t \001(\010\022\033\n\023" + + "ipModeTrainSkipstop\030\n \001(\010\022\033\n\023ipModeTrain" + + "CbtcMode\030\013 \001(\010\022\031\n\021ipModeTrainAtpCut\030\014 \001(" + + "\010\022\032\n\022ipModeTrainBerthed\030\r \001(\010\022\031\n\021ipModeT" + + "rainStoped\030\016 \001(\010\022\031\n\021ipModeTrainHolded\030\017 " + + "\001(\010\022\030\n\020ipModeTrainItama\030\020 \001(\010\022\030\n\020ipModeT" + + "rainDirUp\030\021 \001(\010\022\032\n\022ipModeTrainDirDown\030\022 " + + "\001(\010\022\034\n\024ipModeTrainDirHeadUp\030\023 \001(\010\022\036\n\026ipM" + + "odeTrainDirHeadDown\030\024 \001(\010\022\033\n\023ipModeTrain" + + "DoorOpen\030\025 \001(\010\022\032\n\022ipModeTrainRsAlarm\030\026 \001" + + "(\010\022\034\n\024ipModeTrainDoorAlarm\030\027 \001(\010\022\032\n\022ipMo" + + "deTrainEbAlarm\030\030 \001(\010\022!\n\031ipModeTrainInteg" + + "rityAlarm\030\031 \001(\010\022\036\n\026ipModeTrainDriveModeA" + + "m\030\032 \001(\010\022\036\n\026ipModeTrainDriveModeCm\030\033 \001(\010\022" + + "\037\n\027ipModeTrainDriveModeRmf\030\034 \001(\010\022\037\n\027ipMo" + + "deTrainDriveModeDto\030\035 \001(\010\022\037\n\027ipModeTrain" + + "DriveModeAtb\030\036 \001(\010\022\037\n\027ipModeTrainDriveBl" + + "ockAm\030\037 \001(\010\022\037\n\027ipModeTrainDriveBlockCm\030 " + + " \001(\010\022\037\n\027ipModeTrainDriveModeRmr\030! \001(\010\022 \n" + + "\030ipModeTrainDriveModeWash\030\" \001(\010\022\n\n\002id\030# " + + "\001(\t\".\n\020OccNccFepNetwork\022\n\n\002id\030\001 \001(\t\022\016\n\006a" + + "ctive\030\002 \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\006SWIT" + + "CH\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\t\022\023\n\017WATERPROOF_DOOR\020\013\022\r\n\tWORK" + + "_AREA\020\014\022\010\n\004GAMA\020\rB6\n!club.joylink.xiannc" + + "cda.dto.protosB\021DeviceStatusProtob\006proto" + + "3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -19418,7 +19242,7 @@ public final class DeviceStatusProto { internal_static_state_Switch_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_state_Switch_descriptor, - new java.lang.String[] { "IpSingleSwitchStusCiOccupied", "IpSingleSwitchStusCbtcOccupied", "IpSingleSwitchStusLocked", "IpSingleSwitchStusFailLocked", "IpSingleSwitchStusNormal", "IpSingleSwitchStusReverse", "IpSingleSwitchStusBlocked1", "IpSingleSwitchStusJammed", "IpSingleSwitchStusExpectLock", "IpSingleSwitchStusExpectUnlock", "IpSingleSwitchStusExpectNormal", "IpSingleSwitchStusExpectReverse", "IpSingleSwitchStusExpectBlock", "IpSingleSwitchStusExpectUnblock", "IpSingleSwitchStusInRoute", "IpSingleSwitchStusManualMode", "IpSingleSwitchStusCut", "IpSingleSwitchStusAtcInvalid", "IpSingleSwitchStusOverlap", "IpSingleSwitchStusTsrCbtcMain", "IpSingleSwitchStusTsrCbtcNormal", "IpSingleSwitchStusTsrCbtcReverse", "IpSingleSwitchStusTsrBmMain", "IpSingleSwitchStusTsrBmNormal", "IpSingleSwitchStusTsrBmReverse", "IpSingleSwitchStusBlocked2", "IpSingleSwitchStusLostIndication", "Id", "SpeedLimit", }); + new java.lang.String[] { "IpSingleSwitchStusCiOccupied", "IpSingleSwitchStusCbtcOccupied", "IpSingleSwitchStusLocked", "IpSingleSwitchStusFailLocked", "IpSingleSwitchStusNormal", "IpSingleSwitchStusReverse", "IpSingleSwitchStusBlocked1", "IpSingleSwitchStusJammed", "IpSingleSwitchStusCut", "IpSingleSwitchStusAtcInvalid", "IpSingleSwitchStusOverlap", "IpSingleSwitchStusTsrCbtcMain", "IpSingleSwitchStusTsrCbtcNormal", "IpSingleSwitchStusTsrCbtcReverse", "IpSingleSwitchStusTsrBmMain", "IpSingleSwitchStusTsrBmNormal", "IpSingleSwitchStusTsrBmReverse", "IpSingleSwitchStusBlocked2", "IpSingleSwitchStusLostIndication", "Id", "SpeedLimit", }); internal_static_state_Track_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_state_Track_fieldAccessorTable = new 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 6767d75..19ded6c 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java @@ -31189,7 +31189,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31198,7 +31198,7 @@ public final class LayoutGraphicsProto { boolean hasPaRef(); /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31207,7 +31207,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPaRef(); /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31216,7 +31216,7 @@ public final class LayoutGraphicsProto { /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31225,7 +31225,7 @@ public final class LayoutGraphicsProto { boolean hasPbRef(); /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31234,7 +31234,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef getPbRef(); /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31262,44 +31262,44 @@ public final class LayoutGraphicsProto { /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; - * @return A list containing the children. + * repeated string axleCountings = 7; + * @return A list containing the axleCountings. */ java.util.List - getChildrenList(); + getAxleCountingsList(); /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; - * @return The count of children. + * repeated string axleCountings = 7; + * @return The count of axleCountings. */ - int getChildrenCount(); + int getAxleCountingsCount(); /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the element to return. - * @return The children at the given index. + * @return The axleCountings at the given index. */ - java.lang.String getChildren(int index); + java.lang.String getAxleCountings(int index); /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the value to return. - * @return The bytes of the children at the given index. + * @return The bytes of the axleCountings at the given index. */ com.google.protobuf.ByteString - getChildrenBytes(int index); + getAxleCountingsBytes(int index); } /** * Protobuf type {@code graphicData.Section} @@ -31317,7 +31317,7 @@ public final class LayoutGraphicsProto { code_ = ""; points_ = java.util.Collections.emptyList(); sectionType_ = 0; - children_ = + axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); } @@ -31568,7 +31568,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef paRef_; /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31580,7 +31580,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31592,7 +31592,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段A端关联的设备
+     * 区段A端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef paRef = 4; @@ -31606,7 +31606,7 @@ public final class LayoutGraphicsProto { private club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef pbRef_; /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31618,7 +31618,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31630,7 +31630,7 @@ public final class LayoutGraphicsProto { } /** * 
-     * 区段B端关联的设备
+     * 区段B端关联的设备(非岔区)
      *
* * .graphicData.RelatedRef pbRef = 5; @@ -31666,57 +31666,57 @@ public final class LayoutGraphicsProto { return result == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.UNRECOGNIZED : result; } - public static final int CHILDREN_FIELD_NUMBER = 7; + public static final int AXLECOUNTINGS_FIELD_NUMBER = 7; @SuppressWarnings("serial") - private com.google.protobuf.LazyStringArrayList children_ = + private com.google.protobuf.LazyStringArrayList axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; - * @return A list containing the children. + * repeated string axleCountings = 7; + * @return A list containing the axleCountings. */ public com.google.protobuf.ProtocolStringList - getChildrenList() { - return children_; + getAxleCountingsList() { + return axleCountings_; } /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; - * @return The count of children. + * repeated string axleCountings = 7; + * @return The count of axleCountings. */ - public int getChildrenCount() { - return children_.size(); + public int getAxleCountingsCount() { + return axleCountings_.size(); } /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the element to return. - * @return The children at the given index. + * @return The axleCountings at the given index. */ - public java.lang.String getChildren(int index) { - return children_.get(index); + public java.lang.String getAxleCountings(int index) { + return axleCountings_.get(index); } /** * 
-     * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+     * 关联的计轴
      *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the value to return. - * @return The bytes of the children at the given index. + * @return The bytes of the axleCountings at the given index. */ public com.google.protobuf.ByteString - getChildrenBytes(int index) { - return children_.getByteString(index); + getAxleCountingsBytes(int index) { + return axleCountings_.getByteString(index); } private byte memoizedIsInitialized = -1; @@ -31751,8 +31751,8 @@ public final class LayoutGraphicsProto { if (sectionType_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.Physical.getNumber()) { output.writeEnum(6, sectionType_); } - for (int i = 0; i < children_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, children_.getRaw(i)); + for (int i = 0; i < axleCountings_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 7, axleCountings_.getRaw(i)); } getUnknownFields().writeTo(output); } @@ -31788,11 +31788,11 @@ public final class LayoutGraphicsProto { } { int dataSize = 0; - for (int i = 0; i < children_.size(); i++) { - dataSize += computeStringSizeNoTag(children_.getRaw(i)); + for (int i = 0; i < axleCountings_.size(); i++) { + dataSize += computeStringSizeNoTag(axleCountings_.getRaw(i)); } size += dataSize; - size += 1 * getChildrenList().size(); + size += 1 * getAxleCountingsList().size(); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -31829,8 +31829,8 @@ public final class LayoutGraphicsProto { .equals(other.getPbRef())) return false; } if (sectionType_ != other.sectionType_) return false; - if (!getChildrenList() - .equals(other.getChildrenList())) return false; + if (!getAxleCountingsList() + .equals(other.getAxleCountingsList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -31862,9 +31862,9 @@ public final class LayoutGraphicsProto { } hash = (37 * hash) + SECTIONTYPE_FIELD_NUMBER; hash = (53 * hash) + sectionType_; - if (getChildrenCount() > 0) { - hash = (37 * hash) + CHILDREN_FIELD_NUMBER; - hash = (53 * hash) + getChildrenList().hashCode(); + if (getAxleCountingsCount() > 0) { + hash = (37 * hash) + AXLECOUNTINGS_FIELD_NUMBER; + hash = (53 * hash) + getAxleCountingsList().hashCode(); } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; @@ -32021,7 +32021,7 @@ public final class LayoutGraphicsProto { pbRefBuilder_ = null; } sectionType_ = 0; - children_ = + axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); return this; } @@ -32091,8 +32091,8 @@ public final class LayoutGraphicsProto { result.sectionType_ = sectionType_; } if (((from_bitField0_ & 0x00000040) != 0)) { - children_.makeImmutable(); - result.children_ = children_; + axleCountings_.makeImmutable(); + result.axleCountings_ = axleCountings_; } } @@ -32151,13 +32151,13 @@ public final class LayoutGraphicsProto { if (other.sectionType_ != 0) { setSectionTypeValue(other.getSectionTypeValue()); } - if (!other.children_.isEmpty()) { - if (children_.isEmpty()) { - children_ = other.children_; + if (!other.axleCountings_.isEmpty()) { + if (axleCountings_.isEmpty()) { + axleCountings_ = other.axleCountings_; bitField0_ |= 0x00000040; } else { - ensureChildrenIsMutable(); - children_.addAll(other.children_); + ensureAxleCountingsIsMutable(); + axleCountings_.addAll(other.axleCountings_); } onChanged(); } @@ -32233,8 +32233,8 @@ public final class LayoutGraphicsProto { } // case 48 case 58: { java.lang.String s = input.readStringRequireUtf8(); - ensureChildrenIsMutable(); - children_.add(s); + ensureAxleCountingsIsMutable(); + axleCountings_.add(s); break; } // case 58 default: { @@ -32690,7 +32690,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRefOrBuilder> paRefBuilder_; /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32701,7 +32701,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32716,7 +32716,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32736,7 +32736,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32754,7 +32754,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32777,7 +32777,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32794,7 +32794,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32806,7 +32806,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32821,7 +32821,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段A端关联的设备
+       * 区段A端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef paRef = 4; @@ -32845,7 +32845,7 @@ public final class LayoutGraphicsProto { club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRef.Builder, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.RelatedRefOrBuilder> pbRefBuilder_; /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32856,7 +32856,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32871,7 +32871,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32891,7 +32891,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32909,7 +32909,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32932,7 +32932,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32949,7 +32949,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32961,7 +32961,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -32976,7 +32976,7 @@ public final class LayoutGraphicsProto { } /** * 
-       * 区段B端关联的设备
+       * 区段B端关联的设备(非岔区)
        *
* * .graphicData.RelatedRef pbRef = 5; @@ -33068,128 +33068,128 @@ public final class LayoutGraphicsProto { return this; } - private com.google.protobuf.LazyStringArrayList children_ = + private com.google.protobuf.LazyStringArrayList axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); - private void ensureChildrenIsMutable() { - if (!children_.isModifiable()) { - children_ = new com.google.protobuf.LazyStringArrayList(children_); + private void ensureAxleCountingsIsMutable() { + if (!axleCountings_.isModifiable()) { + axleCountings_ = new com.google.protobuf.LazyStringArrayList(axleCountings_); } bitField0_ |= 0x00000040; } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; - * @return A list containing the children. + * repeated string axleCountings = 7; + * @return A list containing the axleCountings. */ public com.google.protobuf.ProtocolStringList - getChildrenList() { - children_.makeImmutable(); - return children_; + getAxleCountingsList() { + axleCountings_.makeImmutable(); + return axleCountings_; } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; - * @return The count of children. + * repeated string axleCountings = 7; + * @return The count of axleCountings. */ - public int getChildrenCount() { - return children_.size(); + public int getAxleCountingsCount() { + return axleCountings_.size(); } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the element to return. - * @return The children at the given index. + * @return The axleCountings at the given index. */ - public java.lang.String getChildren(int index) { - return children_.get(index); + public java.lang.String getAxleCountings(int index) { + return axleCountings_.get(index); } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index of the value to return. - * @return The bytes of the children at the given index. + * @return The bytes of the axleCountings at the given index. */ public com.google.protobuf.ByteString - getChildrenBytes(int index) { - return children_.getByteString(index); + getAxleCountingsBytes(int index) { + return axleCountings_.getByteString(index); } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @param index The index to set the value at. - * @param value The children to set. + * @param value The axleCountings to set. * @return This builder for chaining. */ - public Builder setChildren( + public Builder setAxleCountings( int index, java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureChildrenIsMutable(); - children_.set(index, value); + ensureAxleCountingsIsMutable(); + axleCountings_.set(index, value); bitField0_ |= 0x00000040; onChanged(); return this; } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; - * @param value The children to add. + * repeated string axleCountings = 7; + * @param value The axleCountings to add. * @return This builder for chaining. */ - public Builder addChildren( + public Builder addAxleCountings( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureChildrenIsMutable(); - children_.add(value); + ensureAxleCountingsIsMutable(); + axleCountings_.add(value); bitField0_ |= 0x00000040; onChanged(); return this; } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; - * @param values The children to add. + * repeated string axleCountings = 7; + * @param values The axleCountings to add. * @return This builder for chaining. */ - public Builder addAllChildren( + public Builder addAllAxleCountings( java.lang.Iterable values) { - ensureChildrenIsMutable(); + ensureAxleCountingsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, children_); + values, axleCountings_); bitField0_ |= 0x00000040; onChanged(); return this; } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; + * repeated string axleCountings = 7; * @return This builder for chaining. */ - public Builder clearChildren() { - children_ = + public Builder clearAxleCountings() { + axleCountings_ = com.google.protobuf.LazyStringArrayList.emptyList(); bitField0_ = (bitField0_ & ~0x00000040);; onChanged(); @@ -33197,19 +33197,19 @@ public final class LayoutGraphicsProto { } /** * 
-       * 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+       * 关联的计轴
        *
* - * repeated string children = 7; - * @param value The bytes of the children to add. + * repeated string axleCountings = 7; + * @param value The bytes of the axleCountings to add. * @return This builder for chaining. */ - public Builder addChildrenBytes( + public Builder addAxleCountingsBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - ensureChildrenIsMutable(); - children_.add(value); + ensureAxleCountingsIsMutable(); + axleCountings_.add(value); bitField0_ |= 0x00000040; onChanged(); return this; @@ -34151,6 +34151,12 @@ public final class LayoutGraphicsProto { */ club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerPointOrBuilder getKilometerPointsOrBuilder( int index); + + /** + * bool aToB = 6; + * @return The aToB. + */ + boolean getAToB(); } /** * Protobuf type {@code graphicData.PathLine} @@ -34348,6 +34354,17 @@ public final class LayoutGraphicsProto { return kilometerPoints_.get(index); } + public static final int ATOB_FIELD_NUMBER = 6; + private boolean aToB_ = false; + /** + * bool aToB = 6; + * @return The aToB. + */ + @java.lang.Override + public boolean getAToB() { + return aToB_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -34377,6 +34394,9 @@ public final class LayoutGraphicsProto { for (int i = 0; i < kilometerPoints_.size(); i++) { output.writeMessage(5, kilometerPoints_.get(i)); } + if (aToB_ != false) { + output.writeBool(6, aToB_); + } getUnknownFields().writeTo(output); } @@ -34405,6 +34425,10 @@ public final class LayoutGraphicsProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, kilometerPoints_.get(i)); } + if (aToB_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(6, aToB_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -34433,6 +34457,8 @@ public final class LayoutGraphicsProto { != other.getIsUp()) return false; if (!getKilometerPointsList() .equals(other.getKilometerPointsList())) return false; + if (getAToB() + != other.getAToB()) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -34461,6 +34487,9 @@ public final class LayoutGraphicsProto { hash = (37 * hash) + KILOMETERPOINTS_FIELD_NUMBER; hash = (53 * hash) + getKilometerPointsList().hashCode(); } + hash = (37 * hash) + ATOB_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getAToB()); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -34613,6 +34642,7 @@ public final class LayoutGraphicsProto { kilometerPointsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); + aToB_ = false; return this; } @@ -34679,6 +34709,9 @@ public final class LayoutGraphicsProto { if (((from_bitField0_ & 0x00000008) != 0)) { result.isUp_ = isUp_; } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.aToB_ = aToB_; + } } @java.lang.Override @@ -34756,6 +34789,9 @@ public final class LayoutGraphicsProto { } } } + if (other.getAToB() != false) { + setAToB(other.getAToB()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -34825,6 +34861,11 @@ public final class LayoutGraphicsProto { } break; } // case 42 + case 48: { + aToB_ = input.readBool(); + bitField0_ |= 0x00000020; + break; + } // case 48 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -35544,6 +35585,38 @@ public final class LayoutGraphicsProto { } return kilometerPointsBuilder_; } + + private boolean aToB_ ; + /** + * bool aToB = 6; + * @return The aToB. + */ + @java.lang.Override + public boolean getAToB() { + return aToB_; + } + /** + * bool aToB = 6; + * @param value The aToB to set. + * @return This builder for chaining. + */ + public Builder setAToB(boolean value) { + + aToB_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * bool aToB = 6; + * @return This builder for chaining. + */ + public Builder clearAToB() { + bitField0_ = (bitField0_ & ~0x00000020); + aToB_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -37793,31 +37866,32 @@ public final class LayoutGraphicsProto { "oints\030\003 \003(\0132\022.graphicData.Point\022\021\n\tnameC" + "olor\030\004 \001(\t\022\023\n\013nameBgColor\030\005 \001(\t\022\022\n\nconta" + "inSta\030\010 \003(\t\022\025\n\rlinkPathLines\030\t \003(\t\022\016\n\006li" + - "neId\030\n \001(\t\"\272\002\n\007Section\022\'\n\006common\030\001 \001(\0132\027" + + "neId\030\n \001(\t\"\277\002\n\007Section\022\'\n\006common\030\001 \001(\0132\027" + ".graphicData.CommonInfo\022\014\n\004code\030\002 \001(\t\022\"\n" + "\006points\030\003 \003(\0132\022.graphicData.Point\022&\n\005paR" + "ef\030\004 \001(\0132\027.graphicData.RelatedRef\022&\n\005pbR" + "ef\030\005 \001(\0132\027.graphicData.RelatedRef\0225\n\013sec" + "tionType\030\006 \001(\0162 .graphicData.Section.Sec" + - "tionType\022\020\n\010children\030\007 \003(\t\";\n\013SectionTyp" + - "e\022\014\n\010Physical\020\000\022\t\n\005Logic\020\001\022\023\n\017TurnoutPhy" + - "sical\020\002\"V\n\016KilometerPoint\022!\n\005point\030\001 \001(\013" + - "2\022.graphicData.Point\022\021\n\tkilometer\030\002 \001(\003\022" + - "\016\n\006stName\030\003 \001(\t\"\251\001\n\010PathLine\022\'\n\006common\030\001" + + "tionType\022\025\n\raxleCountings\030\007 \003(\t\";\n\013Secti" + + "onType\022\014\n\010Physical\020\000\022\t\n\005Logic\020\001\022\023\n\017Turno" + + "utPhysical\020\002\"V\n\016KilometerPoint\022!\n\005point\030" + + "\001 \001(\0132\022.graphicData.Point\022\021\n\tkilometer\030\002" + + " \001(\003\022\016\n\006stName\030\003 \001(\t\"\267\001\n\010PathLine\022\'\n\006com" + + "mon\030\001 \001(\0132\027.graphicData.CommonInfo\022\014\n\004co" + + "de\030\002 \001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.P" + + "oint\022\014\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoints\030\005 " + + "\003(\0132\033.graphicData.KilometerPoint\022\014\n\004aToB" + + "\030\006 \001(\010\"\366\001\n\nRelatedRef\0226\n\ndeviceType\030\001 \001(" + + "\0162\".graphicData.RelatedRef.DeviceType\022\n\n" + + "\002id\030\002 \001(\t\0226\n\ndevicePort\030\003 \001(\0162\".graphicD" + + "ata.RelatedRef.DevicePort\"I\n\nDeviceType\022" + + "\013\n\007Section\020\000\022\013\n\007Turnout\020\001\022\017\n\013TrainWindow" + + "\020\002\022\020\n\014AxleCounting\020\003\"!\n\nDevicePort\022\005\n\001A\020" + + "\000\022\005\n\001B\020\001\022\005\n\001C\020\002\"Y\n\tSeparator\022\'\n\006common\030\001" + " \001(\0132\027.graphicData.CommonInfo\022\014\n\004code\030\002 " + - "\001(\t\022\"\n\006points\030\003 \003(\0132\022.graphicData.Point\022" + - "\014\n\004isUp\030\004 \001(\010\0224\n\017kilometerPoints\030\005 \003(\0132\033" + - ".graphicData.KilometerPoint\"\366\001\n\nRelatedR" + - "ef\0226\n\ndeviceType\030\001 \001(\0162\".graphicData.Rel" + - "atedRef.DeviceType\022\n\n\002id\030\002 \001(\t\0226\n\ndevice" + - "Port\030\003 \001(\0162\".graphicData.RelatedRef.Devi" + - "cePort\"I\n\nDeviceType\022\013\n\007Section\020\000\022\013\n\007Tur" + - "nout\020\001\022\017\n\013TrainWindow\020\002\022\020\n\014AxleCounting\020" + - "\003\"!\n\nDevicePort\022\005\n\001A\020\000\022\005\n\001B\020\001\022\005\n\001C\020\002\"Y\n\t" + - "Separator\022\'\n\006common\030\001 \001(\0132\027.graphicData." + - "CommonInfo\022\014\n\004code\030\002 \001(\t\022\025\n\rseparatorTyp" + - "e\030\003 \001(\tB8\n!club.joylink.xiannccda.dto.pr" + - "otosB\023LayoutGraphicsProtob\006proto3" + "\001(\t\022\025\n\rseparatorType\030\003 \001(\tB8\n!club.joyli" + + "nk.xiannccda.dto.protosB\023LayoutGraphicsP" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -37954,7 +38028,7 @@ public final class LayoutGraphicsProto { internal_static_graphicData_Section_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_Section_descriptor, - new java.lang.String[] { "Common", "Code", "Points", "PaRef", "PbRef", "SectionType", "Children", }); + new java.lang.String[] { "Common", "Code", "Points", "PaRef", "PbRef", "SectionType", "AxleCountings", }); internal_static_graphicData_KilometerPoint_descriptor = getDescriptor().getMessageTypes().get(22); internal_static_graphicData_KilometerPoint_fieldAccessorTable = new @@ -37966,7 +38040,7 @@ public final class LayoutGraphicsProto { internal_static_graphicData_PathLine_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_graphicData_PathLine_descriptor, - new java.lang.String[] { "Common", "Code", "Points", "IsUp", "KilometerPoints", }); + new java.lang.String[] { "Common", "Code", "Points", "IsUp", "KilometerPoints", "AToB", }); internal_static_graphicData_RelatedRef_descriptor = getDescriptor().getMessageTypes().get(24); internal_static_graphicData_RelatedRef_fieldAccessorTable = new