From 5bd42df0ef1bcdbc3911381274b4f3f267d0203b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 13 八月 2025 09:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 3ddda33..228afb4 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -1,6 +1,7 @@
package com.zy.core.thread;
+import com.alibaba.fastjson.JSONObject;
import com.zy.common.ExecuteSupport;
import com.zy.common.model.NavigateNode;
import com.zy.core.ThreadHandler;
@@ -18,6 +19,8 @@
ShuttleProtocol getStatus(boolean clone);//鑾峰彇鍥涘悜绌挎杞︾姸鎬�
ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�-榛樿clone
+
+ Object getOriginDeviceData();
CommandResponse movePath(List<NavigateNode> nodes, Integer taskNo);//璺緞涓嬪彂
@@ -45,6 +48,8 @@
boolean isChargingCompleted();//鏄惁鍏呯數瀹屾垚
+ boolean isFault();//鏄惁鏁呴殰
+
List<NavigateNode> getMoveAdvancePath();//鑾峰彇绌挎杞︿换鍔¤矾寰�
int generateDeviceTaskNo(int taskNo, ShuttleTaskNoType type);//鐢熸垚纭欢璁惧宸ヤ綔鍙�
@@ -65,10 +70,20 @@
boolean offerSystemMsg(String format, Object... arguments);
+ boolean setTrafficControl(boolean enable, List<NavigateNode> nodeList);
+
+ void updateDeviceDataLogTime(long time);
+
+ JSONObject parseStatusToMsg(ShuttleProtocol shuttleProtocol);
+
+ boolean restartCalcPath();//閲嶆柊瑙勫垝璺緞
+
//***************鑾峰彇鍛戒护*****************
ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes);//鑾峰彇绉诲姩鍛戒护
+ ShuttleCommand getMoveLiftCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes, Boolean moveIn);//鑾峰彇绉诲姩鍛戒护
+
ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift);//椤跺崌鍛戒护 true=>椤跺崌 false=>涓嬮檷
ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge);//鍏呯數寮�鍏冲懡浠� true=>寮� false=>鍏�
--
Gitblit v1.9.1