diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java b/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java index 8106a7e..1f541f4 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java +++ b/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java @@ -94,6 +94,9 @@ public class AmrMessageHandler { public void handleAgvRobotStatusMessage(MqttMessage message) throws MqttException, JsonProcessingException { byte[] messageData = message.getPayload(); String json = new String(messageData, StandardCharsets.UTF_8); + + log.debug("收到消息: {}", json); + JsonWrapper jw = new JsonWrapper(json); int id = jw.asInt("id"); String agvId = jw.asInt("content", "VehicleId") + ""; @@ -206,7 +209,7 @@ public class AmrMessageHandler { list.toArray(ar); BannerUtils.printConfig(log, "MQTT 发送报文 [" + id + "] RcsMessageType." + RcsMessageType.fromValue(id) + " - " + RcsMessageType.fromValue(id).description, ar); } - + log.debug("发送消息: {}", payload); ptrMqttClient.publish(topic, payload); } @@ -450,7 +453,7 @@ public class AmrMessageHandler { agvItem.updateRedisStatus(); } - private void handleTaskStatusMessage(PtrAgvItem agvItem, JsonWrapper jw, String json) { + private void handleTaskStatusMessage(PtrAgvItem agvItem, JsonWrapper jw, String json) throws MqttException, JsonProcessingException { // int eventId = jw.asInt("content", "EventId"); // int seqNo = jw.asInt("content", "SeqNo"); // @@ -484,6 +487,9 @@ public class AmrMessageHandler { AmrTaskStatusMessage modeMessage = taskModeChange.content; agvItem.updateDeviceTaskStatus((int) modeMessage.SeqNo, 0, 0, modeMessage.EventId); agvItem.updateTaskMode(modeMessage.Info.TaskMode); + if (modeMessage.Info.TaskMode == 1) { + this.sendCmdConfig(agvItem.id, agvItem.getConfig()); + } break; case 4: AmrMessage> taskCompleted = JacksonUtils.parse(json, typeRef20011_4Message); diff --git a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java b/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java index bd5d7e7..3192dad 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java +++ b/servo/src/main/java/com/galaxis/rcs/ptr/PtrAgvItem.java @@ -708,7 +708,7 @@ public abstract class PtrAgvItem extends ExecutorItem { deviceTask.operationType = COperationType.charge; deviceTask.planTaskIdSet.add(plan.getPlanTaskId()); // 处理充电距离(车的充电口到充电器被压下后的距离、一般被压下20mm) - deviceTask.chargeDirection = 0; + deviceTask.chargeDirection = 2; deviceTask.chargeLocation = 200; // 标记任务分组结束 deviceTask.isGroupEnd = true; diff --git a/servo/src/main/resources/logback-spring.xml b/servo/src/main/resources/logback-spring.xml index ad54032..d2a0a9e 100644 --- a/servo/src/main/resources/logback-spring.xml +++ b/servo/src/main/resources/logback-spring.xml @@ -30,6 +30,19 @@ + + + + ${ENCODER_PATTERN_CONSOLE} + + + + INFO + ACCEPT + DENY + + + ${LOG_PATH}/${FILE_NAME}.log @@ -67,7 +80,7 @@ ${ENCODER_PATTERN} - + DEBUG ACCEPT DENY @@ -82,6 +95,7 @@ +