From 8a8594d1807746b162512d791baf5eb98f80e0e3 Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期四, 21 八月 2025 16:19:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java b/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
index afdae1d..5356f70 100644
--- a/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
@@ -172,6 +172,10 @@
                     }
                     List<DeviceConfig> deviceConfigs = fakeDeviceUtils.getFakeDeviceConfig();
                     for (DeviceConfig device : deviceConfigs) {
+                        if (!device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+                            continue;
+                        }
+
                         excuteFakeCommand(String.valueOf(SlaveType.Shuttle) + device.getDeviceNo(), device);
                     }
                 }catch (Exception e){
@@ -363,9 +367,10 @@
                     }
 
                     String finalKey = baseCommandKey + System.currentTimeMillis();
-                    redisUtil.set(finalKey, true, 60 * 60);
+                    redisUtil.set(finalKey, true, 60 * 2);
 
                     JSONObject body = command.getJSONObject("commandBody");
+                    String requestType = body.getString("requestType");
                     String pathList = body.getString("path");
                     List<JSONObject> executePathList = JSON.parseArray(pathList, JSONObject.class);
 
@@ -492,7 +497,7 @@
         } else if (requestType.equals("updateFloor")) {
             fakeCommandMap.put(String.valueOf(SlaveType.Shuttle) + device.getDeviceNo(), fakeCommand);
             response = genereateFakeCommandResponse(requestId, taskId, requestType);
-        } else if (requestType.equals("move")) {
+        } else if (requestType.equals("move") || requestType.equals("intoLift") || requestType.equals("outLift")) {
             fakeCommandMap.put(String.valueOf(SlaveType.Shuttle) + device.getDeviceNo(), fakeCommand);
             response = genereateFakeCommandResponse(requestId, taskId, requestType);
         } else if (requestType.equals("readState")) {

--
Gitblit v1.9.1