Browse Source

设备状态监控

master
修宁 6 months ago
parent
commit
e5a23b034b
  1. 2
      servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java
  2. 2
      servo/src/main/java/com/yvan/logisticsModel/ExecutorItem.java
  3. 2
      servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java
  4. 8
      servo/src/main/java/com/yvan/pusher/FrontendMessagePushService.java
  5. 11
      servo/src/main/java/com/yvan/workbench/controller/RcsController.java

2
servo/src/main/java/com/galaxis/rcs/ptr/PtrMqttClient.java

@ -69,7 +69,7 @@ public class PtrMqttClient implements MqttCallback {
} else { } else {
throw new RuntimeException("MQTT client is not connected, cannot publish message."); throw new RuntimeException("MQTT client is not connected, cannot publish message.");
} }
log.info("Message published to topic {}: finish", topic); log.info("Message published to topic {}", topic);
} }
@SneakyThrows @SneakyThrows

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

@ -17,7 +17,7 @@ public abstract class ExecutorItem extends BaseItem {
*/ */
@Getter @Getter
@Setter @Setter
public Boolean isOnline = true; public Boolean isOnline = false;
/** /**
* 是否阻挡 * 是否阻挡

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

@ -356,7 +356,7 @@ public class LogisticsRuntime {
// 启动 MQTT 监听 // 启动 MQTT 监听
this.amrMessageHandler.start(this.env.getEnvConfig().getMqtt(), this.serverId); this.amrMessageHandler.start(this.env.getEnvConfig().getMqtt(), this.serverId);
this.frontendMessagePushService.start(this.env.getEnvConfig().getMqtt(), this.serverId + "_lcc_send"); this.frontendMessagePushService.start(this.env.getEnvConfig().getFrontendMqtt(), this.serverId + "_lcc_send");
this.lccRedisService.start(this.env.getEnvConfig().getRedis(), this.serverId); this.lccRedisService.start(this.env.getEnvConfig().getRedis(), this.serverId);
// 开启所有机器人的任务处理 // 开启所有机器人的任务处理

8
servo/src/main/java/com/yvan/pusher/FrontendMessagePushService.java

@ -264,17 +264,11 @@ public class FrontendMessagePushService implements MqttCallback {
*/ */
private void publishJson(String topic, Object data) { private void publishJson(String topic, Object data) {
String json = JacksonMapper.getInstance().toJson(data); String json = JacksonMapper.getInstance().toJson(data);
log.info("Publishing to topic: {}, data: {}", topic, json);
publish(topic, json); publish(topic, json);
} }
/** /**
* 发布字符串数据
*/
private void publishString(String topic, String message) {
publish(topic, message);
}
/**
* 通用发布方法 * 通用发布方法
*/ */
private void publish(String topic, String payload) { private void publish(String topic, String payload) {

11
servo/src/main/java/com/yvan/workbench/controller/RcsController.java

@ -58,6 +58,10 @@ public class RcsController {
return R.fail("target wayPoint not found!"); return R.fail("target wayPoint not found!");
} }
// ==================== 布置任务 ====================
ps.bizTask.setLpn("N/A");
ps.bizTask.setBizType(BizTaskType.CHARGE.toString());
ps.bizTask.setTaskFrom(ps.fromItem.getId());
ps.bizTask.setTaskTo(chargerId); ps.bizTask.setTaskTo(chargerId);
ChargerTask chargerTask = new ChargerTask( ChargerTask chargerTask = new ChargerTask(
@ -96,6 +100,10 @@ public class RcsController {
return R.fail("target wayPoint not found!"); return R.fail("target wayPoint not found!");
} }
// ==================== 布置任务 ====================
ps.bizTask.setLpn("N/A");
ps.bizTask.setBizType(BizTaskType.MOVE.toString());
ps.bizTask.setTaskFrom(ps.fromItem.getId());
ps.bizTask.setTaskTo(targetWayPointId); ps.bizTask.setTaskTo(targetWayPointId);
MoveTask moveTask = new MoveTask( MoveTask moveTask = new MoveTask(
@ -205,6 +213,7 @@ public class RcsController {
// ==================== 布置任务 ==================== // ==================== 布置任务 ====================
ps.bizTask.setLpn(lpn); ps.bizTask.setLpn(lpn);
ps.bizTask.setBizType(BizTaskType.CARRY.toString());
ps.bizTask.setTaskFrom(loadBasLocation.getCatalogCode()); ps.bizTask.setTaskFrom(loadBasLocation.getCatalogCode());
ps.bizTask.setTaskTo(unloadBasLocation.getLocCode()); ps.bizTask.setTaskTo(unloadBasLocation.getLocCode());
@ -272,6 +281,7 @@ public class RcsController {
// ==================== 布置任务 ==================== // ==================== 布置任务 ====================
ps.bizTask.setLpn(lpn); ps.bizTask.setLpn(lpn);
ps.bizTask.setTaskFrom(ps.fromItem.getId()); ps.bizTask.setTaskFrom(ps.fromItem.getId());
ps.bizTask.setBizType(BizTaskType.UNLOAD.toString());
ps.bizTask.setTaskTo(unloadBasLocation.getLocCode()); ps.bizTask.setTaskTo(unloadBasLocation.getLocCode());
UnloadTask unloadTask = new UnloadTask( UnloadTask unloadTask = new UnloadTask(
@ -336,6 +346,7 @@ public class RcsController {
// ==================== 布置任务 ==================== // ==================== 布置任务 ====================
ps.bizTask.setLpn(lpn); ps.bizTask.setLpn(lpn);
ps.bizTask.setTaskFrom(ps.fromItem.getId()); ps.bizTask.setTaskFrom(ps.fromItem.getId());
ps.bizTask.setBizType(BizTaskType.LOAD.toString());
ps.bizTask.setTaskTo(loadBasLocation.getLocCode()); ps.bizTask.setTaskTo(loadBasLocation.getLocCode());
LoadTask loadTask = new LoadTask( LoadTask loadTask = new LoadTask(

Loading…
Cancel
Save