From 1d019fad174b9d0264f9aa184596530f2b0f49b1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 13:56:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NyLiftUtils.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyLiftUtils.java b/src/main/java/com/zy/common/utils/NyLiftUtils.java
index 93cc8da..b5baaaa 100644
--- a/src/main/java/com/zy/common/utils/NyLiftUtils.java
+++ b/src/main/java/com/zy/common/utils/NyLiftUtils.java
@@ -1,6 +1,8 @@
package com.zy.common.utils;
import com.core.common.SpringUtils;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.NavigateNode;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
@@ -10,6 +12,8 @@
import com.zy.core.thread.LiftThread;
import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* 鐗涚溂鎻愬崌鏈哄伐鍏风被
@@ -29,6 +33,19 @@
return command;
}
+ /**
+ * 鑾峰彇鎻愬崌鏈哄浣嶅懡浠�
+ */
+ public static NyLiftCommand getLiftResetCommand(Integer liftNo) {
+ NyLiftCommand command = new NyLiftCommand();
+ command.setLiftNo(liftNo.shortValue());
+ command.setTaskNo((short) 0);
+ command.setTaskModel((short) 0);
+ command.setSourceSta((short) 0);
+ command.setTargetSta((short) 0);
+ return command;
+ }
+
//鑾峰彇鎻愬崌鏈虹珯鐐�
public static LiftStaProtocol getLiftStaByStaNo(Integer staNo) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
@@ -39,7 +56,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getStaNo() == staNo) {
+ if (liftStaProtocol.getStaNo().equals(staNo)) {
return liftStaProtocol;
}
}
@@ -56,7 +73,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getStaNo() == staNo) {
+ if (liftStaProtocol.getStaNo().equals(staNo)) {
return liftStaProtocol;
}
}
@@ -72,7 +89,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getLev() == lev) {
+ if (liftStaProtocol.getLev().equals(lev)) {
return liftStaProtocol;
}
}
@@ -80,4 +97,21 @@
return null;
}
+ //鑾峰彇鎻愬崌鏈鸿緭閫佺珯鍙婂叾鍓嶄竴绔欒妭鐐�
+ public static List<NavigateNode> getLiftStaNodes(Integer staNo) {
+ List<NavigateNode> targetNodes = new ArrayList<>();
+ //鑾峰彇鐩爣绔�
+ LiftStaProtocol targetLiftSta = NyLiftUtils.getLiftStaByStaNo(staNo);
+ if (targetLiftSta == null) {
+ return null;//鎵句笉鍒扮珯鐐�
+ }
+ NavigateNode targetNode = NavigatePositionConvert.locNoToNode(targetLiftSta.getLocNo());//鐩爣鑺傜偣
+ String targetLastLocNo = Utils.getLocNo(Utils.getRow(targetLiftSta.getLocNo()) - 1, Utils.getBay(targetLiftSta.getLocNo()), Utils.getLev(targetLiftSta.getLocNo()));//鐩爣鑺傜偣鍓嶄竴绔�
+ NavigateNode targetLastNode = NavigatePositionConvert.locNoToNode(targetLastLocNo);//鐩爣鑺傜偣鍓嶄竴绔�
+ targetNodes.add(targetNode);
+ targetNodes.add(targetLastNode);
+
+ return targetNodes;
+ }
+
}
--
Gitblit v1.9.1