From 265b10136d8986955828f67cb194b6c04ca01167 Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 27 Jun 2025 16:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java | 9 ++++----- servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java | 5 +---- servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java | 3 +++ 3 files changed, 8 insertions(+), 9 deletions(-) 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 789b6ff..6a29965 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 @@ -27,11 +27,10 @@ public class Cl2DeviceConnector { } public void sendTask(String vehicleId, RcsTaskMessage rcsTaskMessage) throws MqttException, JsonProcessingException { - var list = Splitter.on("\n").splitToList(JsonWrapper.toJsonPretty(rcsTaskMessage)); - String[] ar = new String[list.size()]; - list.toArray(ar); - BannerUtils.printConfig(log, "CL2 发送报文", ar); - + // var list = Splitter.on("\n").splitToList(JsonWrapper.toJsonPretty(rcsTaskMessage)); + // String[] ar = new String[list.size()]; + // list.toArray(ar); + // BannerUtils.printConfig(log, "CL2 发送报文", ar); amrMessageHandler.sendCmdTask(vehicleId, rcsTaskMessage); } 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 19ba758..ac9f9e2 100644 --- a/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java +++ b/servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java @@ -14,18 +14,15 @@ import com.yvan.logisticsModel.LogisticsRuntime; import com.yvan.logisticsModel.PtrAgvItem; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.clever.core.AppContextHolder; import org.clever.core.BannerUtils; import org.clever.core.json.JsonWrapper; import org.clever.core.mapper.BeanCopyUtils; import org.clever.data.redis.Redis; import org.clever.data.redis.RedisAdmin; -import org.eclipse.paho.mqttv5.client.MqttClient; import org.eclipse.paho.mqttv5.common.MqttException; import org.eclipse.paho.mqttv5.common.MqttMessage; import java.nio.charset.StandardCharsets; -import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.Executors; @@ -230,7 +227,7 @@ public class AmrMessageHandler { baseMessage.content = rcsTaskMessage; String json = JacksonUtils.toJson(baseMessage); - log.info("sendCmd10010: {}", json); + // log.info("sendCmd10010: {}", json); // log.debug("Sending task to {}: {}", vehicleId, json); publish("/wcs_server/" + vehicleId, json, baseMessage.id); diff --git a/servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java b/servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java index 883e3af..4bfed89 100644 --- a/servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java +++ b/servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java @@ -321,6 +321,9 @@ public abstract class PtrAgvItem extends ExecutorItem { // 任务完成逻辑,在地标检查里 } + public void updateTaskMode(int taskMode) { + + } public void updateRedisStatus() { String statusKey = getRedisKey("status");