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

一级联锁调整，只处理计轴区段

Browse Source
This commit is contained in:
tiger_zhou 2023-12-22 10:10:58 +08:00
parent 172d3b977b
commit bf5e64a6c2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/club/joylink/xiannccda/ats/warn/SwitchAndLedInterlockTask.java
View File

@ -51,10 +51,11 @@ public class SwitchAndLedInterlockTask implements AlertMonitoringTask {
for (String interlockLevel : interlockOneList) { for (String interlockLevel : interlockOneList) {
Map<String, InterLockDetail> detailMap = interLockData.getDetailByInterlockKey(interlockLevel); Map<String, InterLockDetail> detailMap = interLockData.getDetailByInterlockKey(interlockLevel);
for (InterLockDetail detail : detailMap.values()) { for (InterLockDetail detail : detailMap.values()) {
if (StringUtils.endsWith(interlockLevel, AlertDeviceType.DEVICE_TYPE_SWITCH.name())) { /*if (StringUtils.endsWith(interlockLevel, AlertDeviceType.DEVICE_TYPE_SWITCH.name())) {
int total = this.handle2(AlertType.SWITCH_LOST, lineIdInt, detail.getRtuId()); int total = this.handle2(AlertType.SWITCH_LOST, lineIdInt, detail.getRtuId());
this.validateAlert(detail, total, AlertType.SWITCH_LOST_INTERLOCK_AREA, AlertDeviceType.DEVICE_TYPE_SWITCH, lineIdInt); this.validateAlert(detail, total, AlertType.SWITCH_LOST_INTERLOCK_AREA, AlertDeviceType.DEVICE_TYPE_SWITCH, lineIdInt);
} else if (StringUtils.endsWith(interlockLevel, AlertDeviceType.DEVICE_TYPE_TRACK.name())) { } else*/
if (StringUtils.endsWith(interlockLevel, AlertDeviceType.DEVICE_TYPE_TRACK.name())) {
int redTotal = this.handle2(AlertType.AXLE_LED_RED, lineIdInt, detail.getRtuId()); int redTotal = this.handle2(AlertType.AXLE_LED_RED, lineIdInt, detail.getRtuId());
int orangeTotal = this.handle2(AlertType.AXLE_LED_ORANGE, lineIdInt, detail.getRtuId()); int orangeTotal = this.handle2(AlertType.AXLE_LED_ORANGE, lineIdInt, detail.getRtuId());
this.validateAlert(detail, redTotal, AlertType.AXLE_LED_RED_INTERLOCK_AREA, AlertDeviceType.DEVICE_TYPE_TRACK, lineIdInt); this.validateAlert(detail, redTotal, AlertType.AXLE_LED_RED_INTERLOCK_AREA, AlertDeviceType.DEVICE_TYPE_TRACK, lineIdInt);

2
xian-ncc-da-message

@ -1 +1 @@
Subproject commit 2b147a06d065df7743012cf63cfcbfee0ef3dcd4 Subproject commit 30dfea6f7f1dc81f91d2eca4bdbe13623cba0d1c