From 2fdd53192ff992ef913b102dbff60542326a4cdd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 11 五月 2023 09:57:05 +0800
Subject: [PATCH] 提升机命令封装
---
src/main/java/com/zy/core/thread/LiftThread.java | 33 +++++++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 110 ++++++++----------------------------
2 files changed, 53 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 247c1eb..cc23c9a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1207,44 +1207,22 @@
//鎻愬崌鏈哄綋鍓嶆ゼ灞�
int liftLev = liftProtocol.getLev().intValue();
if (liftLev != 1) {
- //鎻愬崌鏈轰笉鍦�1灞�
- LiftCommand command1 = new LiftCommand();
- command1.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command1.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command1.setRun((short) 1);//鍗囬檷
- command1.setDistPosition((short) 1);//鐩爣妤煎眰1灞�
- command1.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //鎻愬崌鏈轰笉鍦�1灞傦紝鑾峰彇鍒�1灞傜殑鎻愬崌鏈哄懡浠�
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) 1);
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
}
- //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵
- LiftCommand command2 = new LiftCommand();
- command2.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command2.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command2.setRun((short) 6);//杈撻�佺嚎杩愪綔
- command2.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(姝ｈ浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition((short) wrkMastLocNoLey);//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) wrkMastLocNoLey);
commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
+ //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(鍙嶈浆)
//杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
- LiftCommand command4 = new LiftCommand();
- command4.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command4.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command4.setRun((short) 3);//杈撻�佺嚎杩愪綔
- command4.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
}else {
liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
@@ -1273,45 +1251,24 @@
int liftLev = liftProtocol.getLev().intValue();
if (liftLev != currentLocNoLey) {
//涓嶅悓妤煎眰
- LiftCommand command1 = new LiftCommand();
- command1.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command1.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command1.setRun((short) 1);//鍗囬檷
- command1.setDistPosition((short) currentLocNoLey);//鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)
- command1.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //鑾峰彇鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)鍛戒护
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) currentLocNoLey);
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
}
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵
- LiftCommand command2 = new LiftCommand();
- command2.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command2.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command2.setRun((short) 6);//杈撻�佺嚎杩愪綔
- command2.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵(姝ｈ浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
if (liftLev != currentLocNoLey) {
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition((short) wrkMastLocNoLey);//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), (short) wrkMastLocNoLey);
commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
}
//鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓
- LiftCommand command4 = new LiftCommand();
- command4.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command4.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command4.setRun((short) 3);//杈撻�佺嚎杩愪綔
- command4.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓(鍙嶈浆)
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
}
@@ -2273,42 +2230,23 @@
int liftLev = liftProtocol.getLev().intValue();
if (liftLev != currentLev) {
//绌挎杞﹀拰鎻愬崌鏈哄浜庝笉鍚屾ゼ灞�
- LiftCommand command1 = new LiftCommand();
- command1.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command1.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command1.setRun((short) 1);//鍗囬檷
- command1.setDistPosition(currentLev.shortValue());//鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)
- command1.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ //鑾峰彇鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)鍛戒护
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), currentLev.shortValue());
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
}
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵
- LiftCommand command2 = new LiftCommand();
- command2.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command2.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command2.setRun((short) 6);//杈撻�佺嚎杩愪綔
- command2.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵(姝ｈ浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
//鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition(chargeLocNoLev.shortValue());//鍏呯數搴撲綅鐩爣妤煎眰
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //鑾峰彇鍏呯數搴撲綅鐩爣妤煎眰鍛戒护
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), chargeLocNoLev.shortValue());
commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
//鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓
- LiftCommand command4 = new LiftCommand();
- command4.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command4.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command4.setRun((short) 3);//杈撻�佺嚎杩愪綔
- command4.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
+ //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓(鍙嶈浆)
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
wrkCharge.setWrkSts(54L);//鎻愬崌鏈烘惉杩愪腑
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 1da2b39..0b39f99 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -417,7 +417,7 @@
/**
* 鑾峰彇鎻愬崌鏈鸿В閿佸懡浠�
*/
- private LiftCommand getUnlockCommand(Short liftNo) {
+ public LiftCommand getUnlockCommand(Short liftNo) {
LiftCommand command = new LiftCommand();
command.setRun((short) 0);
command.setLiftNo(liftNo);
@@ -428,7 +428,7 @@
/**
* 鑾峰彇澶嶄綅鍛戒护
*/
- private LiftCommand getResetCommand() {
+ public LiftCommand getResetCommand() {
LiftCommand command = new LiftCommand();
command.setRun((short) 0);
command.setLiftLock(false);
@@ -438,7 +438,7 @@
/**
* 鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
*/
- private LiftCommand getLiftUpDownCommand(Short lev) {
+ public LiftCommand getLiftUpDownCommand(Short lev) {
LiftCommand command = new LiftCommand();
command.setRun((short) 1);//鍗囬檷
command.setDistPosition(lev);
@@ -446,15 +446,40 @@
}
/**
+ * 鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
+ */
+ public LiftCommand getLiftUpDownCommand(Short liftNo, Short taskNo, Short lev) {
+ LiftCommand command = new LiftCommand();
+ command.setRun((short) 1);//鍗囬檷
+ command.setLiftNo(liftNo);//鎻愬崌鏈哄彿
+ command.setTaskNo(taskNo);//浠诲姟鍙�
+ command.setDistPosition(lev);//鐩爣妤煎眰1灞�
+ command.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ return command;
+ }
+
+ /**
* 鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠わ紝direction锛�1=銆嬫湁璐ф杞紝2=銆嬫湁璐у弽杞�
*/
- private LiftCommand getLiftTurnCommand(Integer direction) {
+ public LiftCommand getLiftTurnCommand(Integer direction) {
LiftCommand command = new LiftCommand();
command.setRun(direction == 1 ? (short) 6 : (short) 3);
return command;
}
/**
+ * 鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠わ紝direction锛�1=銆嬫湁璐ф杞紝2=銆嬫湁璐у弽杞�
+ */
+ public LiftCommand getLiftTurnCommand(Short liftNo, Short taskNo, Integer direction) {
+ LiftCommand command = new LiftCommand();
+ command.setRun(direction == 1 ? (short) 6 : (short) 3);
+ command.setLiftNo(liftNo);//鎻愬崌鏈哄彿
+ command.setTaskNo(taskNo);//浠诲姟鍙�
+ command.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ return command;
+ }
+
+ /**
* 鍒濆鍖栨彁鍗囨満
*/
private void initLift() {
--
Gitblit v1.9.1