From 09fcc4ec56a1ce6c0fcb308348d8dd5e2c08d336 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:33:06 +0800
Subject: [PATCH] server commit files
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index 77a5e0d..3b91b2b 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -17,11 +17,9 @@
import com.zy.common.ExecuteSupport;
import com.zy.common.model.NavigateNode;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.LiftUtils;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
-import com.zy.core.action.ForkLiftAction;
import com.zy.core.action.LiftAction;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.ForkLiftTaskModeType;
@@ -36,6 +34,7 @@
import com.zy.core.thread.LiftThread;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
import java.text.MessageFormat;
import java.util.*;
@@ -59,6 +58,8 @@
put(7, 107);
put(8, 108);
put(9, 109);
+ put(10, 1023);
+ put(11, 1032);
}};
public static final HashMap<Integer, List<String>> liftNodeMap = new HashMap<Integer, List<String>>() {{
@@ -247,7 +248,7 @@
}
}
- if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 5) {
+ if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 3) {
//閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
//淇濆瓨鏁版嵁璁板綍
DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
@@ -441,8 +442,11 @@
}
@Override
- public String getLiftStandByLocNo(int lev) {
- return Utils.getLocNo(slave.getStandByRow(), slave.getStandByBay(), lev);
+ public String getLiftStandByLocNo(int lev, boolean in) {
+ if (in) {
+ return Utils.getLocNo(slave.getStandByInRow(), slave.getStandByInBay(), lev);
+ }
+ return Utils.getLocNo(slave.getStandByOutRow(), slave.getStandByOutBay(), lev);
}
@Override
@@ -457,6 +461,11 @@
}
@Override
+ public Integer getLevToStaNo(int lev) {
+ return liftLevMap.get(lev);
+ }
+
+ @Override
public List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
/**
* 浠诲姟绫诲瀷
--
Gitblit v1.9.1