Browse Source

日志优化

master
修宁 6 months ago
parent
commit
265b10136d
  1. 9
      servo/src/main/java/com/galaxis/rcs/connector/cl2/Cl2DeviceConnector.java
  2. 5
      servo/src/main/java/com/galaxis/rcs/ptr/AmrMessageHandler.java
  3. 3
      servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java

9
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 { public void sendTask(String vehicleId, RcsTaskMessage rcsTaskMessage) throws MqttException, JsonProcessingException {
var list = Splitter.on("\n").splitToList(JsonWrapper.toJsonPretty(rcsTaskMessage)); // var list = Splitter.on("\n").splitToList(JsonWrapper.toJsonPretty(rcsTaskMessage));
String[] ar = new String[list.size()]; // String[] ar = new String[list.size()];
list.toArray(ar); // list.toArray(ar);
BannerUtils.printConfig(log, "CL2 发送报文", ar); // BannerUtils.printConfig(log, "CL2 发送报文", ar);
amrMessageHandler.sendCmdTask(vehicleId, rcsTaskMessage); amrMessageHandler.sendCmdTask(vehicleId, rcsTaskMessage);
} }

5
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 com.yvan.logisticsModel.PtrAgvItem;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.clever.core.AppContextHolder;
import org.clever.core.BannerUtils; import org.clever.core.BannerUtils;
import org.clever.core.json.JsonWrapper; import org.clever.core.json.JsonWrapper;
import org.clever.core.mapper.BeanCopyUtils; import org.clever.core.mapper.BeanCopyUtils;
import org.clever.data.redis.Redis; import org.clever.data.redis.Redis;
import org.clever.data.redis.RedisAdmin; 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.MqttException;
import org.eclipse.paho.mqttv5.common.MqttMessage; import org.eclipse.paho.mqttv5.common.MqttMessage;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -230,7 +227,7 @@ public class AmrMessageHandler {
baseMessage.content = rcsTaskMessage; baseMessage.content = rcsTaskMessage;
String json = JacksonUtils.toJson(baseMessage); String json = JacksonUtils.toJson(baseMessage);
log.info("sendCmd10010: {}", json); // log.info("sendCmd10010: {}", json);
// log.debug("Sending task to {}: {}", vehicleId, json); // log.debug("Sending task to {}: {}", vehicleId, json);
publish("/wcs_server/" + vehicleId, json, baseMessage.id); publish("/wcs_server/" + vehicleId, json, baseMessage.id);

3
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() { public void updateRedisStatus() {
String statusKey = getRedisKey("status"); String statusKey = getRedisKey("status");

Loading…
Cancel
Save