From bf5e64a6c25342ba57a898142fd7aa11198b45c6 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Fri, 22 Dec 2023 10:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E8=81=94=E9=94=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=8F=AA=E5=A4=84=E7=90=86=E8=AE=A1=E8=BD=B4?= =?UTF-8?q?=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiannccda/ats/warn/SwitchAndLedInterlockTask.java | 5 +++-- xian-ncc-da-message | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchAndLedInterlockTask.java b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchAndLedInterlockTask.java index 00e2d20..15a05cc 100644 --- a/src/main/java/club/joylink/xiannccda/ats/warn/SwitchAndLedInterlockTask.java +++ b/src/main/java/club/joylink/xiannccda/ats/warn/SwitchAndLedInterlockTask.java @@ -51,10 +51,11 @@ public class SwitchAndLedInterlockTask implements AlertMonitoringTask { for (String interlockLevel : interlockOneList) { Map detailMap = interLockData.getDetailByInterlockKey(interlockLevel); 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()); 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 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); diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 2b147a0..30dfea6 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 2b147a06d065df7743012cf63cfcbfee0ef3dcd4 +Subproject commit 30dfea6f7f1dc81f91d2eca4bdbe13623cba0d1c