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-06-13 09:51:19 +08:00
parent 5a94989472
commit f475a82217
40 changed files with 108 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/club/joylink/xiannccda/ats/message/MessageId.java
View File

@ -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),

2
src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceStatus.java → src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceStatus.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/rep/device/DeviceType.java → src/main/java/club/joylink/xiannccda/ats/message/line3/device/DeviceType.java
View File

@ -1,4 +1,4 @@
package club.joylink.xiannccda.ats.message.rep.device;
package club.joylink.xiannccda.ats.message.line3.device;
import java.util.Arrays;

4
src/main/java/club/joylink/xiannccda/ats/message/rep/ActionReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ActionReportResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/rep/AlarmReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/AlarmReportResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/rep/DepotPlanResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DepotPlanResponse.java
View File

@ -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;

9
src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusBitmapResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusBitmapResponse.java
View File

@ -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;

7
src/main/java/club/joylink/xiannccda/ats/message/rep/DeviceStatusChangeResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DeviceStatusChangeResponse.java
View File

@ -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;
/**

4
src/main/java/club/joylink/xiannccda/ats/message/line3/DispatcherReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DispatcherReportResponse.java
View File

@ -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;

8
src/main/java/club/joylink/xiannccda/ats/message/line3/DriverDistanceReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/DriverDistanceReportResponse.java
View File

@ -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;
}

9
src/main/java/club/joylink/xiannccda/ats/message/rep/EntityParseUtil.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/EntityParseUtil.java
View File

@ -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 {

3
src/main/java/club/joylink/xiannccda/ats/message/line3/GroupBakReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupBakReportResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/GroupRunningReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupRunningReportResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/GroupStatusReportResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/GroupStatusReportResponse.java
View File

@ -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;

5
src/main/java/club/joylink/xiannccda/ats/message/rep/HistoryScheduleResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/HistoryScheduleResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/line3/InUsedScheduleParameterResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InUsedScheduleParameterResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/rep/InusedScheduleResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/InusedScheduleResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/MessageAlarmResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/MessageAlarmResponse.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/rep/NetworkAliveStatusResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/NetworkAliveStatusResponse.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/line3/ReportBeginResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportBeginResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/ReportEndResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportEndResponse.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/rep/ReportNackResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ReportNackResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeBeginAckResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeBeginAckResponse.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeDataResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeDataResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeEndAckResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ResumeEndAckResponse.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/rep/ScheduleSubIdType.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/ScheduleSubIdType.java
View File

@ -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 {

4
src/main/java/club/joylink/xiannccda/ats/message/rep/SignalRouteStatusResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/SignalRouteStatusResponse.java
View File

@ -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;

5
src/main/java/club/joylink/xiannccda/ats/message/line3/TrainBlockInfoResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainBlockInfoResponse.java
View File

@ -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;

6
src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationInitResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java
View File

@ -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;

5
src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationRemoveResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java
View File

@ -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;

8
src/main/java/club/joylink/xiannccda/ats/message/line3/TrainIndicationUpdateResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/line3/TrainRecordResponse.java → src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java
View File

@ -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;

4
src/main/java/club/joylink/xiannccda/ats/message/req/AlarmAckRequest.java → src/main/java/club/joylink/xiannccda/ats/message/line3/req/AlarmAckRequest.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/req/LoadDeviceStatusRequest.java → src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadDeviceStatusRequest.java
View File

@ -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;

2
src/main/java/club/joylink/xiannccda/ats/message/req/LoadHistoryTGDataRequest.java → src/main/java/club/joylink/xiannccda/ats/message/line3/req/LoadHistoryTGDataRequest.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/ReportAskRequest.java → src/main/java/club/joylink/xiannccda/ats/message/line3/req/ReportAskRequest.java
View File

@ -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;

3
src/main/java/club/joylink/xiannccda/ats/message/line3/ResumeAskRequest.java → src/main/java/club/joylink/xiannccda/ats/message/line3/req/ResumeAskRequest.java
View File

@ -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;

2
src/test/java/club/joylink/xiannccda/protocal/x/TestCreateProto.java
View File

@ -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;

1
src/test/java/club/joylink/xiannccda/protocal/x/TestDispatcherReportResponse.java
View File

@ -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.*;

2
src/test/java/club/joylink/xiannccda/protocal/x/TestDriverDistanceReportResponse.java
View File

@ -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;