diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/AmrMessage.java similarity index 96% rename from servo/src/main/java/com/galaxis/rcs/ptr/AmrMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/AmrMessage.java index 1f1eafa..3abcb0e 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/AmrMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java b/servo/src/main/java/com/galaxis/rcs/amr/AmrMessageHandler.java similarity index 99% rename from servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java rename to servo/src/main/java/com/galaxis/rcs/amr/AmrMessageHandler.java index 49e482b..5daec1f 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/AmrMessageHandler.java @@ -1,12 +1,12 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.galaxis.rcs.plan.path.PathUtils; -import com.galaxis.rcs.ptr.receiveEntity.*; -import com.galaxis.rcs.ptr.receiveEntity.base.*; -import com.galaxis.rcs.ptr.sendEntity.*; +import com.galaxis.rcs.amr.receiveEntity.*; +import com.galaxis.rcs.amr.receiveEntity.base.*; +import com.galaxis.rcs.amr.sendEntity.*; import com.google.common.base.Splitter; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/AmrTaskMode.java b/servo/src/main/java/com/galaxis/rcs/amr/AmrTaskMode.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/AmrTaskMode.java rename to servo/src/main/java/com/galaxis/rcs/amr/AmrTaskMode.java index a740f5c..da2c2e0 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/AmrTaskMode.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/AmrTaskMode.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.google.common.collect.Maps; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/ArmMessageType.java b/servo/src/main/java/com/galaxis/rcs/amr/ArmMessageType.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/ArmMessageType.java rename to servo/src/main/java/com/galaxis/rcs/amr/ArmMessageType.java index 63c8913..829d425 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/ArmMessageType.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/ArmMessageType.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.google.common.collect.Maps; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/ControlMode.java b/servo/src/main/java/com/galaxis/rcs/amr/ControlMode.java similarity index 71% rename from servo/src/main/java/com/galaxis/rcs/ptr/ControlMode.java rename to servo/src/main/java/com/galaxis/rcs/amr/ControlMode.java index d98fb17..ae003af 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/ControlMode.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/ControlMode.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; public enum ControlMode { FULL_AUTO, diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/JacksonUtils.java b/servo/src/main/java/com/galaxis/rcs/amr/JacksonUtils.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/JacksonUtils.java rename to servo/src/main/java/com/galaxis/rcs/amr/JacksonUtils.java index 2850981..9be0dc3 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/JacksonUtils.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/JacksonUtils.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PosDirection.java b/servo/src/main/java/com/galaxis/rcs/amr/PosDirection.java similarity index 86% rename from servo/src/main/java/com/galaxis/rcs/ptr/PosDirection.java rename to servo/src/main/java/com/galaxis/rcs/amr/PosDirection.java index 705d9b2..13e24ab 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PosDirection.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PosDirection.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.galaxis.rcs.common.enums.LCCDirection; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnector.java b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnector.java similarity index 60% rename from servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnector.java rename to servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnector.java index 859cca1..104e90b 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnector.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnector.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; public abstract class PtrAgvConnector { diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnectorThread.java b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnectorThread.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnectorThread.java rename to servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnectorThread.java index e6621b4..df4a0d9 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnectorThread.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnectorThread.java @@ -1,8 +1,8 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.fasterxml.jackson.core.JsonProcessingException; import com.galaxis.rcs.connector.cl2.Cl2DeviceConnector; -import com.galaxis.rcs.ptr.sendEntity.RcsTaskMessage; +import com.galaxis.rcs.amr.sendEntity.RcsTaskMessage; import com.yvan.logisticsModel.LogisticsRuntime; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.mqttv5.common.MqttException; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvDeviceTask.java b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvDeviceTask.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvDeviceTask.java rename to servo/src/main/java/com/galaxis/rcs/amr/PtrAgvDeviceTask.java index 3c83067..d38b946 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvDeviceTask.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvDeviceTask.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.yvan.logisticsModel.StaticItem; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvItem.java similarity index 99% rename from servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java rename to servo/src/main/java/com/galaxis/rcs/amr/PtrAgvItem.java index fd5518f..9592317 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PtrAgvItem.java @@ -1,15 +1,15 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.galaxis.rcs.common.entity.RcsTaskPlan; import com.galaxis.rcs.common.enums.*; import com.galaxis.rcs.connector.cl2.Cl2DeviceConnector; import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.path.PathUtils; -import com.galaxis.rcs.ptr.receiveEntity.AmrHeartbeatMessage; -import com.galaxis.rcs.ptr.receiveEntity.base.CurBatteryData; -import com.galaxis.rcs.ptr.sendEntity.RcsConfigMessage; -import com.galaxis.rcs.ptr.sendEntity.RcsSRMessage; -import com.galaxis.rcs.ptr.sendEntity.RcsSetLocationMessage; +import com.galaxis.rcs.amr.receiveEntity.AmrHeartbeatMessage; +import com.galaxis.rcs.amr.receiveEntity.base.CurBatteryData; +import com.galaxis.rcs.amr.sendEntity.RcsConfigMessage; +import com.galaxis.rcs.amr.sendEntity.RcsSRMessage; +import com.galaxis.rcs.amr.sendEntity.RcsSetLocationMessage; import com.google.common.collect.Queues; import com.yvan.entity.AgvStatusVo; import com.yvan.entity.BasLocationVo; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java b/servo/src/main/java/com/galaxis/rcs/amr/PtrMqttClient.java similarity index 99% rename from servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java rename to servo/src/main/java/com/galaxis/rcs/amr/PtrMqttClient.java index 7c6e379..482e42e 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/PtrMqttClient.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.yvan.logisticsEnv.EnvConfig; import lombok.SneakyThrows; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/RcsMessageType.java b/servo/src/main/java/com/galaxis/rcs/amr/RcsMessageType.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/RcsMessageType.java rename to servo/src/main/java/com/galaxis/rcs/amr/RcsMessageType.java index 712b87b..8ddd5de 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/RcsMessageType.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/RcsMessageType.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr; +package com.galaxis.rcs.amr; import com.google.common.collect.Maps; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAckMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAckMessage.java similarity index 64% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAckMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAckMessage.java index 89b4861..6e092eb 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAckMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAckMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 消息应答 20050 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAppStartMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAppStartMessage.java similarity index 83% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAppStartMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAppStartMessage.java index 930b068..e281471 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAppStartMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAppStartMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 小车主程序启动 20149 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrBootMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrBootMessage.java similarity index 87% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrBootMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrBootMessage.java index 0108203..83adddc 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrBootMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrBootMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 开机上报 20147 在开机后上报一次,此后AMR程序重启不会重新上报(与ID#20149的差异),除非人为清除内部记录已上报的标志。 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrExceptionMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrExceptionMessage.java similarity index 91% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrExceptionMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrExceptionMessage.java index af81fcd..5c4e08e 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrExceptionMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrExceptionMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; import java.util.Map; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrHeartbeatMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrHeartbeatMessage.java similarity index 84% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrHeartbeatMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrHeartbeatMessage.java index 393acd3..d63e481 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrHeartbeatMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrHeartbeatMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; //心跳 20100 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrLandmarkMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrLandmarkMessage.java similarity index 89% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrLandmarkMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrLandmarkMessage.java index 4691a82..f38f9a2 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrLandmarkMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrLandmarkMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 地标报告 20020 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrModuleTaskStatusMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrModuleTaskStatusMessage.java similarity index 88% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrModuleTaskStatusMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrModuleTaskStatusMessage.java index a06f963..d2c1f59 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrModuleTaskStatusMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrModuleTaskStatusMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 小车子模块任务状态 20012 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOfflineMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOfflineMessage.java similarity index 68% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOfflineMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOfflineMessage.java index 24b42fd..12b6cd5 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOfflineMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOfflineMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 小车离线 20200 注意:目前未实现此报文 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOnlineMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOnlineMessage.java similarity index 74% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOnlineMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOnlineMessage.java index 53061ae..9d0809e 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOnlineMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOnlineMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 小车上线 20150 代表车已经完成初始化,可以接收任务了。 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrShutdownMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrShutdownMessage.java similarity index 77% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrShutdownMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrShutdownMessage.java index 2a497bd..738f8ee 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrShutdownMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrShutdownMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; // 关机上报 20148 在收到关机信号后上报此消息。 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrStatusMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrStatusMessage.java similarity index 88% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrStatusMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrStatusMessage.java index f374087..aa176f8 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrStatusMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrStatusMessage.java @@ -1,9 +1,9 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; -import com.galaxis.rcs.ptr.receiveEntity.base.CurBatteryData; -import com.galaxis.rcs.ptr.receiveEntity.base.LocationData; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.CurBatteryData; +import com.galaxis.rcs.amr.receiveEntity.base.LocationData; // 状态上报 20060 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskCompletedMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskCompletedMessage.java similarity index 85% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskCompletedMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskCompletedMessage.java index a606a0f..0388532 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskCompletedMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskCompletedMessage.java @@ -1,9 +1,9 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; -import com.galaxis.rcs.ptr.receiveEntity.base.LocationData; -import com.galaxis.rcs.ptr.receiveEntity.base.SummaryData; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.LocationData; +import com.galaxis.rcs.amr.receiveEntity.base.SummaryData; // 小车作业完成 20010 //@Data diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskStatusMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskStatusMessage.java similarity index 86% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskStatusMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskStatusMessage.java index 3c43c6d..efd9853 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskStatusMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskStatusMessage.java @@ -1,7 +1,7 @@ -package com.galaxis.rcs.ptr.receiveEntity; +package com.galaxis.rcs.amr.receiveEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; +import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage; //@Data @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/AmrCommonMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/AmrCommonMessage.java similarity index 91% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/AmrCommonMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/AmrCommonMessage.java index c514bb1..3bdb92a 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/AmrCommonMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/AmrCommonMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/CurBatteryData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/CurBatteryData.java similarity index 89% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/CurBatteryData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/CurBatteryData.java index fa8bace..44e2a1f 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/CurBatteryData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/CurBatteryData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/GoodsData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/GoodsData.java similarity index 97% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/GoodsData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/GoodsData.java index 40e74d9..12adcb2 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/GoodsData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/GoodsData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/LocationData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/LocationData.java similarity index 96% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/LocationData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/LocationData.java index 1153f1b..59ee7a5 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/LocationData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/LocationData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/OffsetPosition.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/OffsetPosition.java similarity index 90% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/OffsetPosition.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/OffsetPosition.java index bbb019d..a5c168a 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/OffsetPosition.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/OffsetPosition.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/SummaryData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/SummaryData.java similarity index 93% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/SummaryData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/SummaryData.java index 4b92b8c..0a52fd5 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/SummaryData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/SummaryData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskCompletedData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskCompletedData.java similarity index 97% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskCompletedData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskCompletedData.java index 943a0a2..6af8af9 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskCompletedData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskCompletedData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskModeChangeData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskModeChangeData.java similarity index 93% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskModeChangeData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskModeChangeData.java index e311252..7d3c927 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskModeChangeData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskModeChangeData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskStatusChangeData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskStatusChangeData.java similarity index 90% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskStatusChangeData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskStatusChangeData.java index 60a0352..2318cf8 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskStatusChangeData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskStatusChangeData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskTypeChangeData.java b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskTypeChangeData.java similarity index 93% rename from servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskTypeChangeData.java rename to servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskTypeChangeData.java index 7defb56..e512fc2 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskTypeChangeData.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskTypeChangeData.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.receiveEntity.base; +package com.galaxis.rcs.amr.receiveEntity.base; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/BaseMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/BaseMessage.java similarity index 65% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/BaseMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/BaseMessage.java index 137fd28..0c039f4 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/BaseMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/BaseMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; public class BaseMessage { public int id; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsAckMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsAckMessage.java similarity index 77% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsAckMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsAckMessage.java index be30515..ec76338 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsAckMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsAckMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; // 电文应答 10050 public class RcsAckMessage { diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsCancelTaskMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsCancelTaskMessage.java similarity index 83% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsCancelTaskMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsCancelTaskMessage.java index c659578..45c8c60 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsCancelTaskMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsCancelTaskMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; // 取消已下发小车任务 10120 public class RcsCancelTaskMessage { diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsConfigMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsConfigMessage.java similarity index 92% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsConfigMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsConfigMessage.java index cf6fb0f..94262c8 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsConfigMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsConfigMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; //配置信息 10060 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsControlDoorMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsControlDoorMessage.java similarity index 87% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsControlDoorMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsControlDoorMessage.java index 5ada315..ad42d58 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsControlDoorMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsControlDoorMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; // 控制卷帘门 10082 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsHeartBeatMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsHeartBeatMessage.java similarity index 57% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsHeartBeatMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsHeartBeatMessage.java index 91c6bc7..95816a2 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsHeartBeatMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsHeartBeatMessage.java @@ -1,4 +1,4 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; // 心跳 10100 public class RcsHeartBeatMessage { diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsQueryStatusMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsQueryStatusMessage.java similarity index 76% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsQueryStatusMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsQueryStatusMessage.java index e3d7036..e3b3328 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsQueryStatusMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsQueryStatusMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; //状态查询 10110 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateBodyMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateBodyMessage.java similarity index 86% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateBodyMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateBodyMessage.java index 9179f90..bb08d85 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateBodyMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateBodyMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; //旋转车身 10081 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateRackMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateRackMessage.java similarity index 86% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateRackMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateRackMessage.java index 01ff2a6..84d1313 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateRackMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateRackMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; //旋转货架 10080 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSRMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSRMessage.java similarity index 89% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSRMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSRMessage.java index 2850292..beddbf4 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSRMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSRMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; // 停止/解除 10040 diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSetLocationMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSetLocationMessage.java similarity index 87% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSetLocationMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSetLocationMessage.java index 7a4b1e9..c4705d3 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSetLocationMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSetLocationMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; // 设置小车坐标 10200 public class RcsSetLocationMessage { diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsTaskMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsTaskMessage.java similarity index 98% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsTaskMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsTaskMessage.java index 3236f86..a0b125c 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsTaskMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsTaskMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; import lombok.AllArgsConstructor; diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsWaitMessage.java b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsWaitMessage.java similarity index 87% rename from servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsWaitMessage.java rename to servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsWaitMessage.java index 8c14b6e..acbf086 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsWaitMessage.java +++ b/servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsWaitMessage.java @@ -1,6 +1,6 @@ -package com.galaxis.rcs.ptr.sendEntity; +package com.galaxis.rcs.amr.sendEntity; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; public class RcsWaitMessage { diff --git a/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java b/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java index f6fb011..1e5b49d 100644 --- a/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java +++ b/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java @@ -1,8 +1,8 @@ package com.galaxis.rcs.connector.cl2; import com.fasterxml.jackson.core.JsonProcessingException; -import com.galaxis.rcs.ptr.sendEntity.RcsTaskMessage; -import com.galaxis.rcs.ptr.AmrMessageHandler; +import com.galaxis.rcs.amr.sendEntity.RcsTaskMessage; +import com.galaxis.rcs.amr.AmrMessageHandler; import com.yvan.logisticsModel.LogisticsRuntime; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.mqttv5.common.MqttException; diff --git a/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java b/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java index 3d2d893..5589844 100644 --- a/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java +++ b/servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java @@ -1,8 +1,8 @@ package com.galaxis.rcs.connector.cl2; -import com.galaxis.rcs.ptr.sendEntity.RcsConfigMessage; +import com.galaxis.rcs.amr.sendEntity.RcsConfigMessage; import com.yvan.logisticsModel.LogisticsRuntime; -import com.galaxis.rcs.ptr.PtrAgvItem; +import com.galaxis.rcs.amr.PtrAgvItem; import java.util.Map; diff --git a/servo/src/main/java/com/yvan/entity/AgvStatusVo.java b/servo/src/main/java/com/yvan/entity/AgvStatusVo.java index 22078e2..f294a01 100644 --- a/servo/src/main/java/com/yvan/entity/AgvStatusVo.java +++ b/servo/src/main/java/com/yvan/entity/AgvStatusVo.java @@ -3,7 +3,7 @@ package com.yvan.entity; import com.galaxis.rcs.common.enums.BizTaskStatus; import com.galaxis.rcs.common.enums.BizTaskType; import com.galaxis.rcs.common.enums.LCCDirection; -import com.galaxis.rcs.ptr.AmrTaskMode; +import com.galaxis.rcs.amr.AmrTaskMode; import lombok.Data; @Data diff --git a/servo/src/main/java/com/yvan/event/AgvEventManager.java b/servo/src/main/java/com/yvan/event/AgvEventManager.java index 9e78eff..8f7bc66 100644 --- a/servo/src/main/java/com/yvan/event/AgvEventManager.java +++ b/servo/src/main/java/com/yvan/event/AgvEventManager.java @@ -3,9 +3,9 @@ package com.yvan.event; import com.galaxis.rcs.common.entity.RcsTaskPlan; import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.plan.PlanTaskSequence; -import com.galaxis.rcs.ptr.AmrTaskMode; -import com.galaxis.rcs.ptr.PosDirection; -import com.galaxis.rcs.ptr.PtrAgvDeviceTask; +import com.galaxis.rcs.amr.AmrTaskMode; +import com.galaxis.rcs.amr.PosDirection; +import com.galaxis.rcs.amr.PtrAgvDeviceTask; import com.yvan.logisticsModel.ExecutorItem; import java.util.Set; diff --git a/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java b/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java index c2651c7..89a1024 100644 --- a/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java +++ b/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java @@ -7,8 +7,8 @@ import com.galaxis.rcs.inv.InvManager; import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.path.NavigationGraph; import com.galaxis.rcs.plan.path.PtrPathPlanner; -import com.galaxis.rcs.ptr.AmrMessageHandler; -import com.galaxis.rcs.ptr.PtrAgvItem; +import com.galaxis.rcs.amr.AmrMessageHandler; +import com.galaxis.rcs.amr.PtrAgvItem; import com.galaxis.rcs.task.TaskDispatchFactory; import com.galaxis.rcs.task.TaskService; import com.google.common.base.Joiner; diff --git a/servo/src/main/java/com/yvan/workbench/controller/LccController.java b/servo/src/main/java/com/yvan/workbench/controller/LccController.java index d7a14db..dab8be8 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/LccController.java +++ b/servo/src/main/java/com/yvan/workbench/controller/LccController.java @@ -1,7 +1,7 @@ package com.yvan.workbench.controller; import com.galaxis.rcs.common.enums.LCCDirection; -import com.galaxis.rcs.ptr.PtrAgvItem; +import com.galaxis.rcs.amr.PtrAgvItem; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.yvan.entity.AgvStatusVo; diff --git a/servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java b/servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java index 84235f3..2d27a43 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java +++ b/servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java @@ -2,7 +2,7 @@ package com.yvan.workbench.controller; import com.galaxis.rcs.common.entity.LccBasLocation; import com.galaxis.rcs.common.entity.StoreLocation; -import com.galaxis.rcs.ptr.JacksonUtils; +import com.galaxis.rcs.amr.JacksonUtils; import com.yvan.workbench.SpringContext; import com.yvan.entity.LccProject; import com.yvan.workbench.service.LccMapService; diff --git a/servo/src/main/java/com/yvan/workbench/controller/RcsController.java b/servo/src/main/java/com/yvan/workbench/controller/RcsController.java index 66c3aa7..390d769 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/RcsController.java +++ b/servo/src/main/java/com/yvan/workbench/controller/RcsController.java @@ -8,7 +8,7 @@ import com.galaxis.rcs.common.enums.BizTaskType; import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.task.*; -import com.galaxis.rcs.ptr.PtrAgvItem; +import com.galaxis.rcs.amr.PtrAgvItem; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.yvan.entity.BasLocationVo; diff --git a/servo/src/main/resources/logback-spring.xml b/servo/src/main/resources/logback-spring.xml index d2a0a9e..d33756c 100644 --- a/servo/src/main/resources/logback-spring.xml +++ b/servo/src/main/resources/logback-spring.xml @@ -93,7 +93,7 @@ - +