From c7f699711682ff7a99d4304f35d12d49e25235cc Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期一, 14 七月 2025 16:50:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/ShuttleThread.java |   73 +++---------------------------------
 1 files changed, 6 insertions(+), 67 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..6574b52 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -1,78 +1,17 @@
 package com.zy.core.thread;
 
-
-import com.zy.common.ExecuteSupport;
-import com.zy.common.model.NavigateNode;
 import com.zy.core.ThreadHandler;
-import com.zy.core.enums.ShuttleProtocolStatusType;
-import com.zy.core.enums.ShuttleTaskNoType;
-import com.zy.core.model.CommandResponse;
-import com.zy.core.model.command.ShuttleCommand;
-import com.zy.core.model.param.ShuttleMoveLocParam;
-import com.zy.core.model.protocol.ShuttleProtocol;
+import com.zy.core.model.DeviceCommandMsgModel;
+import com.zy.core.properties.DeviceConfig;
 
-import java.util.List;
+import java.net.Socket;
 
 public interface ShuttleThread extends ThreadHandler {
 
-    ShuttleProtocol getStatus(boolean clone);//鑾峰彇鍥涘悜绌挎杞︾姸鎬�
+    DeviceConfig getDeviceConfig();
 
-    ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�-榛樿clone
+    void stopThread();
 
-    CommandResponse movePath(List<NavigateNode> nodes, Integer taskNo);//璺緞涓嬪彂
-
-    CommandResponse move(ShuttleCommand command);//绉诲姩
-
-    CommandResponse lift(ShuttleCommand command);//椤跺崌
-
-    CommandResponse charge(ShuttleCommand command);//鍏呯數寮�鍏�
-
-    CommandResponse reset(ShuttleCommand command);//澶嶄綅寮�鍏�
-
-    CommandResponse updateLocation(ShuttleCommand command);//鏇存柊鍧愭爣
-
-    boolean isIdle();
-
-    boolean isIdle(ExecuteSupport support);//鏄惁绌洪棽
-
-    boolean isDeviceIdle();//璁惧鏄惁绌洪棽
-
-    boolean isDeviceIdle(ExecuteSupport support);//璁惧鏄惁绌洪棽
-
-    boolean isRequireCharge();//鏄惁婊¤冻鍏呯數鐘舵��
-
-    boolean isCharging();//鏄惁鍏呯數涓�
-
-    boolean isChargingCompleted();//鏄惁鍏呯數瀹屾垚
-
-    List<NavigateNode> getMoveAdvancePath();//鑾峰彇绌挎杞︿换鍔¤矾寰�
-
-    int generateDeviceTaskNo(int taskNo, ShuttleTaskNoType type);//鐢熸垚纭欢璁惧宸ヤ綔鍙�
-
-    boolean setProtocolStatus(ShuttleProtocolStatusType status);//璁剧疆宸ヤ綔鐘舵��
-
-    boolean setTaskNo(Integer taskNo);//璁剧疆宸ヤ綔鍙�
-
-    boolean setSyncTaskNo(Integer taskNo);//璁剧疆宸ヤ綔鍙�
-
-    boolean setPakMk(boolean pakMk);//璁剧疆鏍囪
-
-    boolean enableMoveLoc(ShuttleMoveLocParam param, boolean enable);
-
-    boolean requestWaiting();
-
-    boolean enableDemo(boolean enable);//婕旂ず妯″紡
-
-    boolean offerSystemMsg(String format, Object... arguments);
-
-    //***************鑾峰彇鍛戒护*****************
-
-    ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes);//鑾峰彇绉诲姩鍛戒护
-
-    ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift);//椤跺崌鍛戒护 true=>椤跺崌 false=>涓嬮檷
-
-    ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge);//鍏呯數寮�鍏冲懡浠� true=>寮� false=>鍏�
-
-    ShuttleCommand getUpdateLocationCommand(Integer taskNo, String locNo);//鑾峰彇鏇存柊鍧愭爣鍛戒护
+    Socket getSocket();
 
 }

--
Gitblit v1.9.1