diff --git a/src/main/java/club/joylink/xiannccda/ats/message/MessageId.java b/src/main/java/club/joylink/xiannccda/ats/message/MessageId.java index d40d4b8..a5e6edf 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/MessageId.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/MessageId.java @@ -1,18 +1,35 @@ package club.joylink.xiannccda.ats.message; import club.joylink.xiannccda.ats.message.line3.*; -import club.joylink.xiannccda.ats.message.rep.ActionReportResponse; -import club.joylink.xiannccda.ats.message.rep.AlarmReportResponse; -import club.joylink.xiannccda.ats.message.rep.DepotPlanResponse; -import club.joylink.xiannccda.ats.message.rep.DeviceStatusBitmapResponse; -import club.joylink.xiannccda.ats.message.rep.DeviceStatusChangeResponse; -import club.joylink.xiannccda.ats.message.rep.HistoryScheduleResponse; -import club.joylink.xiannccda.ats.message.rep.InusedScheduleResponse; -import club.joylink.xiannccda.ats.message.rep.NetworkAliveStatusResponse; -import club.joylink.xiannccda.ats.message.rep.SignalRouteStatusResponse; -import club.joylink.xiannccda.ats.message.req.AlarmAckRequest; -import club.joylink.xiannccda.ats.message.req.LoadDeviceStatusRequest; -import club.joylink.xiannccda.ats.message.req.LoadHistoryTGDataRequest; +import club.joylink.xiannccda.ats.message.line3.rep.ActionReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.AlarmReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DepotPlanResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DeviceStatusBitmapResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DeviceStatusChangeResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DispatcherReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DriverDistanceReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.GroupBakReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.GroupRunningReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.GroupStatusReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.HistoryScheduleResponse; +import club.joylink.xiannccda.ats.message.line3.rep.InUsedScheduleParameterResponse; +import club.joylink.xiannccda.ats.message.line3.rep.InusedScheduleResponse; +import club.joylink.xiannccda.ats.message.line3.rep.MessageAlarmResponse; +import club.joylink.xiannccda.ats.message.line3.rep.NetworkAliveStatusResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ReportBeginResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ReportEndResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ResumeBeginAckResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ResumeDataResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ResumeEndAckResponse; +import club.joylink.xiannccda.ats.message.line3.rep.SignalRouteStatusResponse; +import club.joylink.xiannccda.ats.message.line3.rep.TrainBlockInfoResponse; +import club.joylink.xiannccda.ats.message.line3.rep.TrainIndicationInitResponse; +import club.joylink.xiannccda.ats.message.line3.rep.TrainIndicationRemoveResponse; +import club.joylink.xiannccda.ats.message.line3.rep.TrainIndicationUpdateResponse; +import club.joylink.xiannccda.ats.message.line3.rep.TrainRecordResponse; +import club.joylink.xiannccda.ats.message.line3.req.AlarmAckRequest; +import club.joylink.xiannccda.ats.message.line3.req.LoadDeviceStatusRequest; +import club.joylink.xiannccda.ats.message.line3.req.LoadHistoryTGDataRequest; public enum MessageId { UNKNOWN(0x0000, null), diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceStatus.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java similarity index 99% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceStatus.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java index 0d098dd..42d7d36 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceStatus.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.rep.device; +package club.joylink.xiannccda.ats.message.line3.device; import com.google.common.collect.Lists; import java.util.Arrays; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceType.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceType.java similarity index 94% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceType.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceType.java index 843499b..bed783a 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceType.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceType.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.rep.device; +package club.joylink.xiannccda.ats.message.line3.device; import java.util.Arrays; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/ActionReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ActionReportResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/ActionReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ActionReportResponse.java index 6fb5b54..cef6bf4 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/ActionReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ActionReportResponse.java @@ -1,9 +1,9 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/AlarmReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/AlarmReportResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/AlarmReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/AlarmReportResponse.java index 08bfc6a..861a51d 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/AlarmReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/AlarmReportResponse.java @@ -1,9 +1,9 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/DepotPlanResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DepotPlanResponse.java similarity index 97% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/DepotPlanResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DepotPlanResponse.java index 0c092cc..29d57e9 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/DepotPlanResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DepotPlanResponse.java @@ -1,10 +1,10 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusBitmapResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusBitmapResponse.java similarity index 92% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusBitmapResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusBitmapResponse.java index 4d853ef..0915499 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusBitmapResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusBitmapResponse.java @@ -1,11 +1,10 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus.RTU; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusChangeResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusChangeResponse.java similarity index 88% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusChangeResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusChangeResponse.java index 9ed0f79..372a790 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusChangeResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusChangeResponse.java @@ -1,10 +1,9 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; -import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/DispatcherReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DispatcherReportResponse.java similarity index 92% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/DispatcherReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DispatcherReportResponse.java index 9c7cda1..c47f21a 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/DispatcherReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DispatcherReportResponse.java @@ -1,6 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/DriverDistanceReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DriverDistanceReportResponse.java similarity index 86% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/DriverDistanceReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DriverDistanceReportResponse.java index d72ecdd..a7f6ba2 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/DriverDistanceReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DriverDistanceReportResponse.java @@ -1,6 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; @@ -76,8 +78,8 @@ public class DriverDistanceReportResponse extends MessageResponse { buf.readBytes(driverId); this.distance = buf.readInt(); // - this.date=DateTimeUtil.convert(date); - this.driverId=new String(driverId,MessageCons.STRING_CHARSET).trim(); + this.date= DateTimeUtil.convert(date); + this.driverId=new String(driverId, MessageCons.STRING_CHARSET).trim(); // return this; } diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/EntityParseUtil.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/EntityParseUtil.java similarity index 80% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/EntityParseUtil.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/EntityParseUtil.java index 120496f..12aa08e 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/EntityParseUtil.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/EntityParseUtil.java @@ -1,15 +1,8 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.line3.MessageCons; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus.RTU; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus.SIGNAL; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; -import com.google.common.base.Strings; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; -import java.util.Arrays; -import java.util.Collections; import java.util.List; public class EntityParseUtil { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupBakReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupBakReportResponse.java similarity index 97% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/GroupBakReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupBakReportResponse.java index e0ef892..e796a00 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupBakReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupBakReportResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupRunningReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupRunningReportResponse.java similarity index 95% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/GroupRunningReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupRunningReportResponse.java index 28b92cb..f8151f4 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupRunningReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupRunningReportResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupStatusReportResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupStatusReportResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/GroupStatusReportResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupStatusReportResponse.java index 7c9c8a0..27d10d2 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/GroupStatusReportResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupStatusReportResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/HistoryScheduleResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/HistoryScheduleResponse.java similarity index 94% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/HistoryScheduleResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/HistoryScheduleResponse.java index ec6313b..412d072 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/HistoryScheduleResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/HistoryScheduleResponse.java @@ -1,10 +1,9 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/InUsedScheduleParameterResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InUsedScheduleParameterResponse.java similarity index 89% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/InUsedScheduleParameterResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InUsedScheduleParameterResponse.java index 97a541e..3c2e3de 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/InUsedScheduleParameterResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InUsedScheduleParameterResponse.java @@ -1,6 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/InusedScheduleResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InusedScheduleResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/InusedScheduleResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InusedScheduleResponse.java index 890c319..923b9f0 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/InusedScheduleResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InusedScheduleResponse.java @@ -1,9 +1,9 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/MessageAlarmResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/MessageAlarmResponse.java similarity index 90% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/MessageAlarmResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/MessageAlarmResponse.java index 70b5443..97cf726 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/MessageAlarmResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/MessageAlarmResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/NetworkAliveStatusResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/NetworkAliveStatusResponse.java similarity index 94% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/NetworkAliveStatusResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/NetworkAliveStatusResponse.java index f03cdd3..316f236 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/NetworkAliveStatusResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/NetworkAliveStatusResponse.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageId; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportBeginResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportBeginResponse.java similarity index 97% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ReportBeginResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportBeginResponse.java index c23702f..c81e603 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportBeginResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportBeginResponse.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportEndResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportEndResponse.java similarity index 89% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ReportEndResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportEndResponse.java index bf35fe4..4db88a9 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportEndResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportEndResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.rep.ReportBeginResponse; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/ReportNackResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportNackResponse.java similarity index 97% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/ReportNackResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportNackResponse.java index 3e014b1..2245cab 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/ReportNackResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportNackResponse.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeBeginAckResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeBeginAckResponse.java similarity index 88% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeBeginAckResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeBeginAckResponse.java index 9df6d93..e443182 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeBeginAckResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeBeginAckResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeDataResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeDataResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeDataResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeDataResponse.java index 03d4e5b..4375529 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeDataResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeDataResponse.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeEndAckResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeEndAckResponse.java similarity index 88% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeEndAckResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeEndAckResponse.java index 21e0d7a..d5a85bd 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeEndAckResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeEndAckResponse.java @@ -1,6 +1,7 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/ScheduleSubIdType.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ScheduleSubIdType.java similarity index 72% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/ScheduleSubIdType.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ScheduleSubIdType.java index d0ad5c2..b7c9ce4 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/ScheduleSubIdType.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ScheduleSubIdType.java @@ -1,6 +1,5 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; -import club.joylink.xiannccda.ats.message.MessageData.ActionTypeControlEnum; import java.util.Arrays; public enum ScheduleSubIdType { diff --git a/src/main/java/club/joylink/xiannccda/ats/message/rep/SignalRouteStatusResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/SignalRouteStatusResponse.java similarity index 95% rename from src/main/java/club/joylink/xiannccda/ats/message/rep/SignalRouteStatusResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/SignalRouteStatusResponse.java index 094ad5e..b9e8970 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/rep/SignalRouteStatusResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/SignalRouteStatusResponse.java @@ -1,8 +1,8 @@ -package club.joylink.xiannccda.ats.message.rep; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.EntityParseUtil.ReadData; +import club.joylink.xiannccda.ats.message.line3.rep.EntityParseUtil.ReadData; import io.netty.buffer.ByteBuf; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainBlockInfoResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainBlockInfoResponse.java similarity index 95% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/TrainBlockInfoResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainBlockInfoResponse.java index cc6e095..a66ae31 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainBlockInfoResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainBlockInfoResponse.java @@ -1,7 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.MessageCons; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationInitResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java similarity index 95% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationInitResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java index d9f1382..3b770cb 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationInitResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java @@ -1,7 +1,9 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationRemoveResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java similarity index 91% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationRemoveResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java index 365f16e..7143be2 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationRemoveResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java @@ -1,7 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.MessageCons; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationUpdateResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java similarity index 93% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationUpdateResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java index 46a6f26..b0d8c45 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationUpdateResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java @@ -1,8 +1,10 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus; -import club.joylink.xiannccda.ats.message.rep.device.DeviceType; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; +import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; +import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainRecordResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/TrainRecordResponse.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java index b9eeb90..8546bf3 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/TrainRecordResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java @@ -1,6 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; +import club.joylink.xiannccda.ats.message.line3.MessageCons; import io.netty.buffer.ByteBuf; import lombok.Getter; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/req/AlarmAckRequest.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/AlarmAckRequest.java similarity index 91% rename from src/main/java/club/joylink/xiannccda/ats/message/req/AlarmAckRequest.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/req/AlarmAckRequest.java index 26ac882..dcf2cbe 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/req/AlarmAckRequest.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/AlarmAckRequest.java @@ -1,10 +1,8 @@ -package club.joylink.xiannccda.ats.message.req; +package club.joylink.xiannccda.ats.message.line3.req; -import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageRequest; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.rep.ScheduleSubIdType; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; import java.util.Arrays; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/req/LoadDeviceStatusRequest.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadDeviceStatusRequest.java similarity index 97% rename from src/main/java/club/joylink/xiannccda/ats/message/req/LoadDeviceStatusRequest.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadDeviceStatusRequest.java index 339e7ef..3cb3c50 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/req/LoadDeviceStatusRequest.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadDeviceStatusRequest.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.req; +package club.joylink.xiannccda.ats.message.line3.req; import club.joylink.xiannccda.ats.message.MessageData; import club.joylink.xiannccda.ats.message.MessageId; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/req/LoadHistoryTGDataRequest.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadHistoryTGDataRequest.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/req/LoadHistoryTGDataRequest.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadHistoryTGDataRequest.java index 8736d0d..34169a4 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/req/LoadHistoryTGDataRequest.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadHistoryTGDataRequest.java @@ -1,4 +1,4 @@ -package club.joylink.xiannccda.ats.message.req; +package club.joylink.xiannccda.ats.message.line3.req; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageRequest; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportAskRequest.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/ReportAskRequest.java similarity index 96% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ReportAskRequest.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/req/ReportAskRequest.java index 62f90b0..473bc4b 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ReportAskRequest.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/ReportAskRequest.java @@ -1,7 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.req; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageRequest; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeAskRequest.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/ResumeAskRequest.java similarity index 91% rename from src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeAskRequest.java rename to src/main/java/club/joylink/xiannccda/ats/message/line3/req/ResumeAskRequest.java index e2eab40..61f1cc6 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeAskRequest.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/req/ResumeAskRequest.java @@ -1,7 +1,8 @@ -package club.joylink.xiannccda.ats.message.line3; +package club.joylink.xiannccda.ats.message.line3.req; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageRequest; +import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import io.netty.buffer.ByteBuf; import java.time.LocalDateTime; diff --git a/src/test/java/club/joylink/xiannccda/protocal/x/TestCreateProto.java b/src/test/java/club/joylink/xiannccda/protocal/x/TestCreateProto.java index 11deb4b..28c3afc 100644 --- a/src/test/java/club/joylink/xiannccda/protocal/x/TestCreateProto.java +++ b/src/test/java/club/joylink/xiannccda/protocal/x/TestCreateProto.java @@ -1,6 +1,6 @@ package club.joylink.xiannccda.protocal.x; -import club.joylink.xiannccda.ats.message.rep.device.DeviceStatus; +import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; import java.util.Arrays; diff --git a/src/test/java/club/joylink/xiannccda/protocal/x/TestDispatcherReportResponse.java b/src/test/java/club/joylink/xiannccda/protocal/x/TestDispatcherReportResponse.java index 18a1677..d8a25f8 100644 --- a/src/test/java/club/joylink/xiannccda/protocal/x/TestDispatcherReportResponse.java +++ b/src/test/java/club/joylink/xiannccda/protocal/x/TestDispatcherReportResponse.java @@ -3,7 +3,6 @@ package club.joylink.xiannccda.protocal.x; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.line3.DispatcherReportResponse; import club.joylink.xiannccda.ats.message.line3.MessageCons; import com.alibaba.fastjson2.JSON; import io.netty.buffer.*; diff --git a/src/test/java/club/joylink/xiannccda/protocal/x/TestDriverDistanceReportResponse.java b/src/test/java/club/joylink/xiannccda/protocal/x/TestDriverDistanceReportResponse.java index b996160..9cee94a 100644 --- a/src/test/java/club/joylink/xiannccda/protocal/x/TestDriverDistanceReportResponse.java +++ b/src/test/java/club/joylink/xiannccda/protocal/x/TestDriverDistanceReportResponse.java @@ -2,7 +2,7 @@ package club.joylink.xiannccda.protocal.x; import club.joylink.xiannccda.ats.message.MessageId; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; -import club.joylink.xiannccda.ats.message.line3.DriverDistanceReportResponse; +import club.joylink.xiannccda.ats.message.line3.rep.DriverDistanceReportResponse; import com.alibaba.fastjson2.JSON; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator;