Logs 推送问题

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

@@ -22,13 +22,11 @@ import com.yvan.event.AgvEventManager;
 import com.yvan.event.AgvEventType;
 import com.yvan.pusher.FrontendMessagePushService;
 import com.yvan.redis.LccRedisService;
-import com.yvan.workbench.SpringContext;
-import com.yvan.workbench.autoconfigure.LccConfigProperties;
-import com.yvan.workbench.service.LccMapService;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.clever.core.BannerUtils;
 import org.clever.core.Conv;
+import org.clever.core.DateUtils;
 import org.clever.data.jdbc.DaoFactory;
 import org.clever.data.jdbc.QueryDSL;
 import org.clever.data.redis.Redis;
@@ -215,6 +213,16 @@ public class LogisticsRuntime {
         });
     }
 
+    public void writeLog(String type, String content, Object... args) {
+        StringBuilder sb = new StringBuilder();
+        // 获取 时分秒.毫秒  HH:mm:ss.SSS
+        String time = DateFormatUtils.format(new Date(), "HH:mm:ss.SSS");
+        sb.append(time).append(" [").append(type).append("] - ").append(
+            String.format(content, args)
+        );
+        FrontendMessagePushService.INSTANCE.pushLogs(this, type, sb.toString());
+    }
+
     /**
      * 库存转移 AGV->货架
      */

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

@@ -230,11 +230,11 @@ public class FrontendMessagePushService implements MqttCallback {
      *
      * @param runtime 运行时环境
      * @param logType 日志类型
-     * @param logData 日志数据
+     * @param log     日志数据
      */
-    public void pushLogs(LogisticsRuntime runtime, String logType, Object logData) {
+    public void pushLogs(LogisticsRuntime runtime, String logType, String log) {
         String topic = buildTopic(runtime, "log/" + logType);
-        publishJson(topic, logData);
+        publish(topic, log);
     }
 
     /**

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

@@ -75,6 +75,8 @@ public class RcsController {
         ps.agv.logicY = ps.fromItem.logicY;
         ps.agv.dispatchTask(ps.planSequence);
 
+        ps.runtime.writeLog("biz", "agvToCharger任务:%s", ps.planSequence.toPrettyMap());
+
         return R.success(ps.planSequence.toPrettyMap());
     }
 
@@ -117,6 +119,8 @@ public class RcsController {
         ps.agv.logicY = ps.fromItem.logicY;
         ps.agv.dispatchTask(ps.planSequence);
 
+        ps.runtime.writeLog("biz", "agvMove任务:%s", ps.planSequence.toPrettyMap());
+
         return R.success(ps.planSequence.toPrettyMap());
     }
 
@@ -235,6 +239,8 @@ public class RcsController {
         ps.agv.logicY = ps.fromItem.logicY;
         ps.agv.dispatchTask(ps.planSequence);
 
+        ps.runtime.writeLog("biz", "agvCarry任务:%s", ps.planSequence.toPrettyMap());
+
         return R.success(ps.planSequence.toPrettyMap());
     }
 
@@ -301,6 +307,8 @@ public class RcsController {
         ps.agv.logicY = ps.fromItem.logicY;
         ps.agv.dispatchTask(ps.planSequence);
 
+        ps.runtime.writeLog("biz", "agvUnload任务:%s", ps.planSequence.toPrettyMap());
+
         return R.success(ps.planSequence.toPrettyMap());
     }
 
@@ -366,6 +374,8 @@ public class RcsController {
         ps.agv.logicY = ps.fromItem.logicY;
         ps.agv.dispatchTask(ps.planSequence);
 
+        ps.runtime.writeLog("biz", "agvLoad任务:%s", ps.planSequence.toPrettyMap());
+
         return R.success(ps.planSequence.toPrettyMap());
     }
 
@@ -378,6 +388,9 @@ public class RcsController {
         RcsCommonParam ps = (RcsCommonParam) ret;
 
         ps.agv.cancelTask();
+
+        ps.runtime.writeLog("biz", "cancelTasks");
+
         return R.success("AGV tasks cancelled successfully");
     }