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

Merge remote-tracking branch 'origin/master_new_bule_loop_task'

Browse Source
This commit is contained in:
tiger_zhou 2023-12-26 10:30:11 +08:00
commit 6afb8fbde8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/DeviceChangeStatusConvertor.java
View File

@ -3,9 +3,6 @@ package club.joylink.xiannccda.ats.message.collect.convertor;
import club.joylink.xiannccda.alert.core.AlertManager; import club.joylink.xiannccda.alert.core.AlertManager;
import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageId;
import club.joylink.xiannccda.ats.message.collect.DeviceDataRepository.DataTypeEnum; import club.joylink.xiannccda.ats.message.collect.DeviceDataRepository.DataTypeEnum;
import club.joylink.xiannccda.ats.warn.axle.AxleLedAlertListener.AxleLedAlertEvent;
import club.joylink.xiannccda.ats.warn.SwitchLostAlertListener.SwitchLostAlertEvent; import club.joylink.xiannccda.ats.warn.SwitchLostAlertListener.SwitchLostAlertEvent;
import club.joylink.xiannccda.dto.protos.DeviceStatusProto.Switch; import club.joylink.xiannccda.dto.protos.DeviceStatusProto.Switch;
import com.google.protobuf.GeneratedMessageV3.Builder; import com.google.protobuf.GeneratedMessageV3.Builder;
@ -40,7 +37,7 @@ public class DeviceChangeStatusConvertor extends DefaultConvertor {
if (builder instanceof Switch.Builder switchBuild) { if (builder instanceof Switch.Builder switchBuild) {
alertManager.emit(new SwitchLostAlertEvent(switchBuild)); alertManager.emit(new SwitchLostAlertEvent(switchBuild));
// alertManager.emit(new SwitchAndTrackLedAlertEvent(switchBuild)); // alertManager.emit(new SwitchAndTrackLedAlertEvent(switchBuild));
alertManager.emit(new AxleLedAlertEvent(switchBuild)); // alertManager.emit(new AxleLedAlertEvent(switchBuild));
} /*else if (builder instanceof Platform.Builder platformBuild) { } /*else if (builder instanceof Platform.Builder platformBuild) {
alertManager.emit(new PlatformAlertEvent(platformBuild)); alertManager.emit(new PlatformAlertEvent(platformBuild));
}*/ }*/

5
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/DeviceInitConvertor.java
View File

@ -3,9 +3,6 @@ package club.joylink.xiannccda.ats.message.collect.convertor;
import club.joylink.xiannccda.alert.core.AlertManager; import club.joylink.xiannccda.alert.core.AlertManager;
import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageId;
import club.joylink.xiannccda.ats.message.collect.DeviceDataRepository.DataTypeEnum; import club.joylink.xiannccda.ats.message.collect.DeviceDataRepository.DataTypeEnum;
import club.joylink.xiannccda.ats.warn.axle.AxleLedAlertListener.AxleLedAlertEvent;
import club.joylink.xiannccda.ats.warn.SwitchLostAlertListener.SwitchLostAlertEvent; import club.joylink.xiannccda.ats.warn.SwitchLostAlertListener.SwitchLostAlertEvent;
import club.joylink.xiannccda.dto.protos.DeviceStatusProto.Switch; import club.joylink.xiannccda.dto.protos.DeviceStatusProto.Switch;
import com.google.protobuf.GeneratedMessageV3.Builder; import com.google.protobuf.GeneratedMessageV3.Builder;
@ -38,7 +35,7 @@ public class DeviceInitConvertor extends DefaultConvertor {
// } else // } else
if (builder instanceof Switch.Builder switchBuild) { if (builder instanceof Switch.Builder switchBuild) {
// alertManager.emit(new SwitchAndTrackLedAlertEvent(switchBuild)); // alertManager.emit(new SwitchAndTrackLedAlertEvent(switchBuild));
alertManager.emit(new AxleLedAlertEvent(switchBuild)); // alertManager.emit(new AxleLedAlertEvent(switchBuild));
alertManager.emit(new SwitchLostAlertEvent(switchBuild)); alertManager.emit(new SwitchLostAlertEvent(switchBuild));
} }
} }