From 9f2a75123177aa954e020c557ab691b4552e8e06 Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Wed, 27 Dec 2023 10:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiannccda/ats/warn/axle/AxleLedMostMonitorListener.java  | 5 +----
 .../club/joylink/xiannccda/service/AlertMockService.java     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/club/joylink/xiannccda/ats/warn/axle/AxleLedMostMonitorListener.java b/src/main/java/club/joylink/xiannccda/ats/warn/axle/AxleLedMostMonitorListener.java
index de55f63..eed85cc 100644
--- a/src/main/java/club/joylink/xiannccda/ats/warn/axle/AxleLedMostMonitorListener.java
+++ b/src/main/java/club/joylink/xiannccda/ats/warn/axle/AxleLedMostMonitorListener.java
@@ -55,7 +55,7 @@ public class AxleLedMostMonitorListener implements AlertSourceEventListener<LedM
 
     AlertType mostType = lockSource.getAlertType() == AlertType.AXLE_LED_RED ? AlertType.AXLE_LED_RED_MOST : AlertType.AXLE_LED_ORANGE_MOST;
     int ledThreshold = mostType == AlertType.AXLE_LED_RED_MOST ? guardConfig.getRedLedMostNums() : guardConfig.getOrangeLedMostNums();
-
+    //移除非占用的区段记录
     this.removeAlert(lineIdInt, lockSource.getDeviceCodes(), mostType);
     //查找大面下的所有区段设备（包含不在任何大面积的计轴区段，key为null）
     Map<AreaConfigVO, List<TrackOccupiedStatus>> areaDataListMap = this.findOccupiedData(lineIdInt, mostType, lockSource.deviceCodes);
@@ -65,9 +65,6 @@ public class AxleLedMostMonitorListener implements AlertSourceEventListener<LedM
       List<TrackOccupiedStatus> deviceStatusList = occupiedEntry.getValue();
       for (TrackOccupiedStatus device : occupiedEntry.getValue()) {
         device.saveAlertDataSouce = alertDataSource.putAlterDevice(lineIdInt, customName, device.deviceCode);
-//        if (Objects.equals(device.saveAlertDataSouce, false)) {
-//          alertDataSource.removeAlterDevice(lineIdInt, customName, device.deviceCode);
-//        }
       }
       String ledName = lockSource.alertType == AlertType.AXLE_LED_RED ? "红光带" : "橙光带";
       List<String> warnDeviceList = alertDataSource.findAllWarnDeviceForList(lineIdInt, customName);
diff --git a/src/main/java/club/joylink/xiannccda/service/AlertMockService.java b/src/main/java/club/joylink/xiannccda/service/AlertMockService.java
index 7edf554..139d6aa 100644
--- a/src/main/java/club/joylink/xiannccda/service/AlertMockService.java
+++ b/src/main/java/club/joylink/xiannccda/service/AlertMockService.java
@@ -114,7 +114,7 @@ public class AlertMockService {
             sb.append(String.format("%s有重复的车组", groupDatas.keySet()));
           }
         }
-        BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(!sb.isEmpty(), sb.toString());
+        BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(!sb.isEmpty(), sb.toString());
       }
 
       mockDTO.setAlertType(alertType);