From a18ed78675d0f7745ed1ebe519bfe0aa64c97dfe Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 15:02:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LiftThread.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 0c92bb3..8f3f046 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -378,7 +378,6 @@
                     null,
                     null,
                     JSON.toJSONString(command),
-                    JSON.toJSONString(commandArr),
                     JSON.toJSONString(liftProtocol)
             );
             liftOptService.insert(opt);
@@ -402,6 +401,18 @@
             News.info("鎻愬崌鏈轰换鍔℃墽琛屼笅鍙戝畬鎴愮瓑寰呮墽琛岀粨鏉燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
         }
 
+        if (redisCommand.getAssignCommand().getTaskMode() == NyLiftTaskModelType.RESET.id.shortValue()) {
+            //澶嶄綅鍛戒护
+            //宸ヤ綔鍙锋竻闆�
+            liftProtocol.setTaskNo((short) 0);
+            //浠ょ墝娓呴浂
+            liftProtocol.setToken(0);
+            //璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
+            liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+            //浠诲姟鎸囦护娓呴浂
+            liftProtocol.setAssignCommand(null);
+        }
+
         return true;
     }
 

--
Gitblit v1.9.1