Browse Source

cl2 基于设备状态和任务状态分步生成设备任务消息

master
yuliang 6 months ago
parent
commit
bb23fa5abc
  1. 6
      servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java
  2. 4
      servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java
  3. 2
      servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java

6
servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2Item.java

@ -16,9 +16,9 @@ public class Cl2Item extends PtrAgvItem {
public RcsConfigMessage getConfig() { public RcsConfigMessage getConfig() {
var content = new RcsConfigMessage(this.runtime); var content = new RcsConfigMessage(this.runtime);
content.SeqNo = this.amrMessageHandler.getNewSeqNo(); content.SeqNo = this.amrMessageHandler.getNewSeqNo();
content.XLength = 100; content.XLength = 1000;
content.YLength = 100; content.YLength = 1000;
content.Gap = 100; content.Gap = 1000;
content.HeartBeat = 60; content.HeartBeat = 60;
content.MqRetryTime = 3; content.MqRetryTime = 3;
return content; return content;

4
servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java

@ -175,7 +175,8 @@ public class AmrMessageHandler {
amrMessage = JacksonUtils.parse(json, typeRef20149Message); amrMessage = JacksonUtils.parse(json, typeRef20149Message);
break; break;
case AMR_ONLINE: case AMR_ONLINE:
amrMessage = JacksonUtils.parse(json, typeRef20150Message); // amrMessage = JacksonUtils.parse(json, typeRef20150Message);
this.sendCmdConfig(agvId, agvItem.getConfig());
break; break;
case AMR_OFFLINE: case AMR_OFFLINE:
amrMessage = JacksonUtils.parse(json, typeRef20200Message); amrMessage = JacksonUtils.parse(json, typeRef20200Message);
@ -355,6 +356,7 @@ public class AmrMessageHandler {
baseMessage.content = rcsQueryStatusMessage; baseMessage.content = rcsQueryStatusMessage;
String json = JacksonUtils.toJson(baseMessage); String json = JacksonUtils.toJson(baseMessage);
publish("/wcs_server/" + vehicleId, json, baseMessage.id); publish("/wcs_server/" + vehicleId, json, baseMessage.id);
log.info("发送查询设备状态消息: {}", json);
} }
/** /**

2
servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java

@ -107,7 +107,7 @@ public abstract class PtrAgvItem extends ExecutorItem {
@SneakyThrows @SneakyThrows
public synchronized void initialize() { public synchronized void initialize() {
this.amrMessageHandler.registeHeartBeatSet(this); this.amrMessageHandler.registeHeartBeatSet(this);
amrMessageHandler.sendCmdConfig(this.getId(), this.getConfig());
// 查询当前状态 // 查询当前状态
requestCurrentStatus(); requestCurrentStatus();

Loading…
Cancel
Save