yuliang
/
yvan-lcc-bench
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

结构调整

jx-test
yuliang 5 months ago
parent
88da2b2feb
commit
7f8f7e7001
107 changed files with 3002 additions and 3002 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      servo/src/main/java/com/galaxis/rcs/amr/AmrMessage.java
  2. 8
      servo/src/main/java/com/galaxis/rcs/amr/AmrMessageHandler.java
  3. 2
      servo/src/main/java/com/galaxis/rcs/amr/AmrTaskMode.java
  4. 2
      servo/src/main/java/com/galaxis/rcs/amr/ArmMessageType.java
  5. 2
      servo/src/main/java/com/galaxis/rcs/amr/ControlMode.java
  6. 2
      servo/src/main/java/com/galaxis/rcs/amr/JacksonUtils.java
  7. 2
      servo/src/main/java/com/galaxis/rcs/amr/PosDirection.java
  8. 2
      servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnector.java
  9. 4
      servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnectorThread.java
  10. 2
      servo/src/main/java/com/galaxis/rcs/amr/PtrAgvDeviceTask.java
  11. 12
      servo/src/main/java/com/galaxis/rcs/amr/PtrAgvItem.java
  12. 2
      servo/src/main/java/com/galaxis/rcs/amr/PtrMqttClient.java
  13. 2
      servo/src/main/java/com/galaxis/rcs/amr/RcsMessageType.java
  14. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAckMessage.java
  15. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAppStartMessage.java
  16. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrBootMessage.java
  17. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrExceptionMessage.java
  18. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrHeartbeatMessage.java
  19. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrLandmarkMessage.java
  20. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrModuleTaskStatusMessage.java
  21. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOfflineMessage.java
  22. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOnlineMessage.java
  23. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrShutdownMessage.java
  24. 8
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrStatusMessage.java
  25. 8
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskCompletedMessage.java
  26. 4
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskStatusMessage.java
  27. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/AmrCommonMessage.java
  28. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/CurBatteryData.java
  29. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/GoodsData.java
  30. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/LocationData.java
  31. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/OffsetPosition.java
  32. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/SummaryData.java
  33. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskCompletedData.java
  34. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskModeChangeData.java
  35. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskStatusChangeData.java
  36. 2
      servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskTypeChangeData.java
  37. 2
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/BaseMessage.java
  38. 2
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsAckMessage.java
  39. 2
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsCancelTaskMessage.java
  40. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsConfigMessage.java
  41. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsControlDoorMessage.java
  42. 2
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsHeartBeatMessage.java
  43. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsQueryStatusMessage.java
  44. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateBodyMessage.java
  45. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateRackMessage.java
  46. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSRMessage.java
  47. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSetLocationMessage.java
  48. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsTaskMessage.java
  49. 4
      servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsWaitMessage.java
  50. 4
      servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java
  51. 4
      servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java
  52. 2
      servo/src/main/java/com/yvan/entity/AgvStatusVo.java
  53. 6
      servo/src/main/java/com/yvan/event/AgvEventManager.java
  54. 4
      servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java
  55. 2
      servo/src/main/java/com/yvan/workbench/controller/LccController.java
  56. 2
      servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java
  57. 2
      servo/src/main/java/com/yvan/workbench/controller/RcsController.java
  58. 2
      servo/src/main/resources/logback-spring.xml

2
servo/src/main/java/com/galaxis/rcs/ptr/AmrMessage.java → servo/src/main/java/com/galaxis/rcs/amr/AmrMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import lombok.Data; import lombok.Data;

8
servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java → servo/src/main/java/com/galaxis/rcs/amr/AmrMessageHandler.java
View File

@ -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.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.galaxis.rcs.plan.path.PathUtils; import com.galaxis.rcs.plan.path.PathUtils;
import com.galaxis.rcs.ptr.receiveEntity.*; import com.galaxis.rcs.amr.receiveEntity.*;
import com.galaxis.rcs.ptr.receiveEntity.base.*; import com.galaxis.rcs.amr.receiveEntity.base.*;
import com.galaxis.rcs.ptr.sendEntity.*; import com.galaxis.rcs.amr.sendEntity.*;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

2
servo/src/main/java/com/galaxis/rcs/ptr/AmrTaskMode.java → servo/src/main/java/com/galaxis/rcs/amr/AmrTaskMode.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

2
servo/src/main/java/com/galaxis/rcs/ptr/ArmMessageType.java → servo/src/main/java/com/galaxis/rcs/amr/ArmMessageType.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

2
servo/src/main/java/com/galaxis/rcs/ptr/ControlMode.java → servo/src/main/java/com/galaxis/rcs/amr/ControlMode.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
public enum ControlMode { public enum ControlMode {
FULL_AUTO, FULL_AUTO,

2
servo/src/main/java/com/galaxis/rcs/ptr/JacksonUtils.java → servo/src/main/java/com/galaxis/rcs/amr/JacksonUtils.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;

2
servo/src/main/java/com/galaxis/rcs/ptr/PosDirection.java → servo/src/main/java/com/galaxis/rcs/amr/PosDirection.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.common.enums.LCCDirection;

2
servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnector.java → servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnector.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
public abstract class PtrAgvConnector { public abstract class PtrAgvConnector {

4
servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvConnectorThread.java → servo/src/main/java/com/galaxis/rcs/amr/PtrAgvConnectorThread.java
View File

@ -1,8 +1,8 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.galaxis.rcs.connector.cl2.Cl2DeviceConnector; 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 com.yvan.logisticsModel.LogisticsRuntime;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.mqttv5.common.MqttException; import org.eclipse.paho.mqttv5.common.MqttException;

2
servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvDeviceTask.java → servo/src/main/java/com/galaxis/rcs/amr/PtrAgvDeviceTask.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.yvan.logisticsModel.StaticItem; import com.yvan.logisticsModel.StaticItem;

12
servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java → servo/src/main/java/com/galaxis/rcs/amr/PtrAgvItem.java
View File

@ -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.entity.RcsTaskPlan;
import com.galaxis.rcs.common.enums.*; import com.galaxis.rcs.common.enums.*;
import com.galaxis.rcs.connector.cl2.Cl2DeviceConnector; import com.galaxis.rcs.connector.cl2.Cl2DeviceConnector;
import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.PlanTaskSequence;
import com.galaxis.rcs.plan.path.PathUtils; import com.galaxis.rcs.plan.path.PathUtils;
import com.galaxis.rcs.ptr.receiveEntity.AmrHeartbeatMessage; import com.galaxis.rcs.amr.receiveEntity.AmrHeartbeatMessage;
import com.galaxis.rcs.ptr.receiveEntity.base.CurBatteryData; import com.galaxis.rcs.amr.receiveEntity.base.CurBatteryData;
import com.galaxis.rcs.ptr.sendEntity.RcsConfigMessage; import com.galaxis.rcs.amr.sendEntity.RcsConfigMessage;
import com.galaxis.rcs.ptr.sendEntity.RcsSRMessage; import com.galaxis.rcs.amr.sendEntity.RcsSRMessage;
import com.galaxis.rcs.ptr.sendEntity.RcsSetLocationMessage; import com.galaxis.rcs.amr.sendEntity.RcsSetLocationMessage;
import com.google.common.collect.Queues; import com.google.common.collect.Queues;
import com.yvan.entity.AgvStatusVo; import com.yvan.entity.AgvStatusVo;
import com.yvan.entity.BasLocationVo; import com.yvan.entity.BasLocationVo;

2
servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java → servo/src/main/java/com/galaxis/rcs/amr/PtrMqttClient.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.yvan.logisticsEnv.EnvConfig; import com.yvan.logisticsEnv.EnvConfig;
import lombok.SneakyThrows; import lombok.SneakyThrows;

2
servo/src/main/java/com/galaxis/rcs/ptr/RcsMessageType.java → servo/src/main/java/com/galaxis/rcs/amr/RcsMessageType.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr; package com.galaxis.rcs.amr;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAckMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAckMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 消息应答 20050 // 消息应答 20050
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrAppStartMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrAppStartMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 小车主程序启动 20149 // 小车主程序启动 20149
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrBootMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrBootMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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的差异），除非人为清除内部记录已上报的标志。 // 开机上报 20147 在开机后上报一次，此后AMR程序重启不会重新上报（与ID#20149的差异），除非人为清除内部记录已上报的标志。
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrExceptionMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrExceptionMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; import java.util.Map;

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrHeartbeatMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrHeartbeatMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
//心跳 20100 //心跳 20100
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrLandmarkMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrLandmarkMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 地标报告 20020 // 地标报告 20020
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrModuleTaskStatusMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrModuleTaskStatusMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 小车子模块任务状态 20012 // 小车子模块任务状态 20012
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOfflineMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOfflineMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 小车离线 20200 注意：目前未实现此报文 // 小车离线 20200 注意：目前未实现此报文
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrOnlineMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrOnlineMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 小车上线 20150 代表车已经完成初始化，可以接收任务了。 // 小车上线 20150 代表车已经完成初始化，可以接收任务了。
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrShutdownMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrShutdownMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
// 关机上报 20148 在收到关机信号后上报此消息。 // 关机上报 20148 在收到关机信号后上报此消息。
//@Data //@Data

8
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrStatusMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrStatusMessage.java
View File

@ -1,9 +1,9 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
import com.galaxis.rcs.ptr.receiveEntity.base.CurBatteryData; import com.galaxis.rcs.amr.receiveEntity.base.CurBatteryData;
import com.galaxis.rcs.ptr.receiveEntity.base.LocationData; import com.galaxis.rcs.amr.receiveEntity.base.LocationData;
// 状态上报 20060 // 状态上报 20060
//@Data //@Data

8
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskCompletedMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskCompletedMessage.java
View File

@ -1,9 +1,9 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
import com.galaxis.rcs.ptr.receiveEntity.base.LocationData; import com.galaxis.rcs.amr.receiveEntity.base.LocationData;
import com.galaxis.rcs.ptr.receiveEntity.base.SummaryData; import com.galaxis.rcs.amr.receiveEntity.base.SummaryData;
// 小车作业完成 20010 // 小车作业完成 20010
//@Data //@Data

4
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/AmrTaskStatusMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/AmrTaskStatusMessage.java
View File

@ -1,7 +1,7 @@
package com.galaxis.rcs.ptr.receiveEntity; package com.galaxis.rcs.amr.receiveEntity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.galaxis.rcs.ptr.receiveEntity.base.AmrCommonMessage; import com.galaxis.rcs.amr.receiveEntity.base.AmrCommonMessage;
//@Data //@Data
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/AmrCommonMessage.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/AmrCommonMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.receiveEntity.base; package com.galaxis.rcs.amr.receiveEntity.base;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/CurBatteryData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/CurBatteryData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/GoodsData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/GoodsData.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.receiveEntity.base; package com.galaxis.rcs.amr.receiveEntity.base;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/LocationData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/LocationData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/OffsetPosition.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/OffsetPosition.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/SummaryData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/SummaryData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskCompletedData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskCompletedData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskModeChangeData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskModeChangeData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskStatusChangeData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskStatusChangeData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/receiveEntity/base/TaskTypeChangeData.java → servo/src/main/java/com/galaxis/rcs/amr/receiveEntity/base/TaskTypeChangeData.java
View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

2
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/BaseMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/BaseMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.sendEntity; package com.galaxis.rcs.amr.sendEntity;
public class BaseMessage { public class BaseMessage {
public int id; public int id;

2
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsAckMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsAckMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.sendEntity; package com.galaxis.rcs.amr.sendEntity;
// 电文应答 10050 // 电文应答 10050
public class RcsAckMessage { public class RcsAckMessage {

2
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsCancelTaskMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsCancelTaskMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.sendEntity; package com.galaxis.rcs.amr.sendEntity;
// 取消已下发小车任务 10120 // 取消已下发小车任务 10120
public class RcsCancelTaskMessage { public class RcsCancelTaskMessage {

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsConfigMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsConfigMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
//配置信息 10060 //配置信息 10060

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsControlDoorMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsControlDoorMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
// 控制卷帘门 10082 // 控制卷帘门 10082

2
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsHeartBeatMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsHeartBeatMessage.java
View File

@ -1,4 +1,4 @@
package com.galaxis.rcs.ptr.sendEntity; package com.galaxis.rcs.amr.sendEntity;
// 心跳 10100 // 心跳 10100
public class RcsHeartBeatMessage { public class RcsHeartBeatMessage {

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsQueryStatusMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsQueryStatusMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
//状态查询 10110 //状态查询 10110

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateBodyMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateBodyMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
//旋转车身 10081 //旋转车身 10081

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsRotateRackMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsRotateRackMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
//旋转货架 10080 //旋转货架 10080

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSRMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSRMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
// 停止/解除 10040 // 停止/解除 10040

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsSetLocationMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsSetLocationMessage.java
View File

@ -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 // 设置小车坐标 10200
public class RcsSetLocationMessage { public class RcsSetLocationMessage {

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsTaskMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsTaskMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

4
servo/src/main/java/com/galaxis/rcs/ptr/sendEntity/RcsWaitMessage.java → servo/src/main/java/com/galaxis/rcs/amr/sendEntity/RcsWaitMessage.java
View File

@ -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 com.yvan.logisticsModel.LogisticsRuntime;
public class RcsWaitMessage { public class RcsWaitMessage {

4
servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java
View File

@ -1,8 +1,8 @@
package com.galaxis.rcs.connector.cl2; package com.galaxis.rcs.connector.cl2;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.galaxis.rcs.ptr.sendEntity.RcsTaskMessage; import com.galaxis.rcs.amr.sendEntity.RcsTaskMessage;
import com.galaxis.rcs.ptr.AmrMessageHandler; import com.galaxis.rcs.amr.AmrMessageHandler;
import com.yvan.logisticsModel.LogisticsRuntime; import com.yvan.logisticsModel.LogisticsRuntime;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.mqttv5.common.MqttException; import org.eclipse.paho.mqttv5.common.MqttException;

4
servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java
View File

@ -1,8 +1,8 @@
package com.galaxis.rcs.connector.cl2; 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.yvan.logisticsModel.LogisticsRuntime;
import com.galaxis.rcs.ptr.PtrAgvItem; import com.galaxis.rcs.amr.PtrAgvItem;
import java.util.Map; import java.util.Map;

2
servo/src/main/java/com/yvan/entity/AgvStatusVo.java
View File

@ -3,7 +3,7 @@ package com.yvan.entity;
import com.galaxis.rcs.common.enums.BizTaskStatus; import com.galaxis.rcs.common.enums.BizTaskStatus;
import com.galaxis.rcs.common.enums.BizTaskType; import com.galaxis.rcs.common.enums.BizTaskType;
import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.common.enums.LCCDirection;
import com.galaxis.rcs.ptr.AmrTaskMode; import com.galaxis.rcs.amr.AmrTaskMode;
import lombok.Data; import lombok.Data;
@Data @Data

6
servo/src/main/java/com/yvan/event/AgvEventManager.java
View File

@ -3,9 +3,9 @@ package com.yvan.event;
import com.galaxis.rcs.common.entity.RcsTaskPlan; import com.galaxis.rcs.common.entity.RcsTaskPlan;
import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.common.enums.LCCDirection;
import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.PlanTaskSequence;
import com.galaxis.rcs.ptr.AmrTaskMode; import com.galaxis.rcs.amr.AmrTaskMode;
import com.galaxis.rcs.ptr.PosDirection; import com.galaxis.rcs.amr.PosDirection;
import com.galaxis.rcs.ptr.PtrAgvDeviceTask; import com.galaxis.rcs.amr.PtrAgvDeviceTask;
import com.yvan.logisticsModel.ExecutorItem; import com.yvan.logisticsModel.ExecutorItem;
import java.util.Set; import java.util.Set;

4
servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java
View File

@ -7,8 +7,8 @@ import com.galaxis.rcs.inv.InvManager;
import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.PlanTaskSequence;
import com.galaxis.rcs.plan.path.NavigationGraph; import com.galaxis.rcs.plan.path.NavigationGraph;
import com.galaxis.rcs.plan.path.PtrPathPlanner; import com.galaxis.rcs.plan.path.PtrPathPlanner;
import com.galaxis.rcs.ptr.AmrMessageHandler; import com.galaxis.rcs.amr.AmrMessageHandler;
import com.galaxis.rcs.ptr.PtrAgvItem; import com.galaxis.rcs.amr.PtrAgvItem;
import com.galaxis.rcs.task.TaskDispatchFactory; import com.galaxis.rcs.task.TaskDispatchFactory;
import com.galaxis.rcs.task.TaskService; import com.galaxis.rcs.task.TaskService;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;

2
servo/src/main/java/com/yvan/workbench/controller/LccController.java
View File

@ -1,7 +1,7 @@
package com.yvan.workbench.controller; package com.yvan.workbench.controller;
import com.galaxis.rcs.common.enums.LCCDirection; 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.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.yvan.entity.AgvStatusVo; import com.yvan.entity.AgvStatusVo;

2
servo/src/main/java/com/yvan/workbench/controller/LccModelManager.java
View File

@ -2,7 +2,7 @@ package com.yvan.workbench.controller;
import com.galaxis.rcs.common.entity.LccBasLocation; import com.galaxis.rcs.common.entity.LccBasLocation;
import com.galaxis.rcs.common.entity.StoreLocation; 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.workbench.SpringContext;
import com.yvan.entity.LccProject; import com.yvan.entity.LccProject;
import com.yvan.workbench.service.LccMapService; import com.yvan.workbench.service.LccMapService;

2
servo/src/main/java/com/yvan/workbench/controller/RcsController.java
View File

@ -8,7 +8,7 @@ import com.galaxis.rcs.common.enums.BizTaskType;
import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.common.enums.LCCDirection;
import com.galaxis.rcs.plan.PlanTaskSequence; import com.galaxis.rcs.plan.PlanTaskSequence;
import com.galaxis.rcs.plan.task.*; 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.base.Strings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.yvan.entity.BasLocationVo; import com.yvan.entity.BasLocationVo;

2
servo/src/main/resources/logback-spring.xml
View File

@ -93,7 +93,7 @@
</logger> </logger>
<!-- AMR 报文日志 --> <!-- AMR 报文日志 -->
<logger name="com.galaxis.rcs.ptr.AmrMessageHandler" level="DEBUG" additivity="false"> <logger name="com.galaxis.rcs.amr.AmrMessageHandler" level="DEBUG" additivity="false">
<appender-ref ref="AMR_FILE"/> <appender-ref ref="AMR_FILE"/>
<appender-ref ref="STDOUT1"/> <appender-ref ref="STDOUT1"/>
</logger> </logger>

Write Preview
Loading…
Cancel
Save