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-27 10:19:22 +08:00
parent 9af4040595
commit 9f2a751231
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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; 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(); int ledThreshold = mostType == AlertType.AXLE_LED_RED_MOST ? guardConfig.getRedLedMostNums() : guardConfig.getOrangeLedMostNums();
//移除非占用的区段记录
this.removeAlert(lineIdInt, lockSource.getDeviceCodes(), mostType); this.removeAlert(lineIdInt, lockSource.getDeviceCodes(), mostType);
//查找大面下的所有区段设备（包含不在任何大面积的计轴区段，key为null） //查找大面下的所有区段设备（包含不在任何大面积的计轴区段，key为null）
Map<AreaConfigVO, List<TrackOccupiedStatus>> areaDataListMap = this.findOccupiedData(lineIdInt, mostType, lockSource.deviceCodes); 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(); List<TrackOccupiedStatus> deviceStatusList = occupiedEntry.getValue();
for (TrackOccupiedStatus device : occupiedEntry.getValue()) { for (TrackOccupiedStatus device : occupiedEntry.getValue()) {
device.saveAlertDataSouce = alertDataSource.putAlterDevice(lineIdInt, customName, device.deviceCode); 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 ? "红光带" : "橙光带"; String ledName = lockSource.alertType == AlertType.AXLE_LED_RED ? "红光带" : "橙光带";
List<String> warnDeviceList = alertDataSource.findAllWarnDeviceForList(lineIdInt, customName); List<String> warnDeviceList = alertDataSource.findAllWarnDeviceForList(lineIdInt, customName);

2
src/main/java/club/joylink/xiannccda/service/AlertMockService.java
View File

@ -114,7 +114,7 @@ public class AlertMockService {
sb.append(String.format("%s有重复的车组", groupDatas.keySet())); 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); mockDTO.setAlertType(alertType);