From 8b6c0c9dc150492ed0bcb1a5aa24417f81a78ed2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 六月 2024 10:36:51 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 9 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 1
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java | 20 +++---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 77 +++++++++++--------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java | 14 ++--
5 files changed, 56 insertions(+), 65 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index c8c57b0..810f4a3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -114,7 +114,6 @@
//瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
liftThread.setProtocolStatus(LiftProtocolStatusType.WAITING);
- liftThread.commandFinished(taskNo);//璋冪敤瀹屾垚鍚庣画鎸囦护(閮ㄥ垎鎻愬崌鏈烘湁鍚庣画鎸囦护锛屽疄闄呮儏鍐电湅鏄惁鏈夌湡姝ｅ疄鐜版柟娉�)
redisUtil.del(DeviceRedisConstant.LIFT_WORK_FLAG + taskNo);
return false;//绂佹鍐嶄笅鍙戝懡浠�
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
index 0f6e51c..3471fbb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
/**
@@ -67,7 +68,7 @@
assignCommand.setTaskNo(motion.getTaskNo());
assignCommand.setCommands(list);
- LiftCommand command = new LiftCommand();
+ List<LiftCommand> command = new ArrayList<>();
switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl()))){
case LIFT_MOVE:
// 濡傛灉宸茬粡鍦ㄧ洰鏍囧眰锛岄偅杈瑰眰杩囨护
@@ -77,7 +78,7 @@
}
command = liftThread.getMoveCommand(motion.getTaskNo(), 0, Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE);
- list.add(command);
+ list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS:
// if (liftProtocol.getHasTray()) {
@@ -85,7 +86,7 @@
// }
command = liftThread.getPalletInOutCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
- list.add(command);
+ list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_SHUTTLE:
if (!liftProtocol.getHasCar()) {
@@ -93,7 +94,7 @@
}
command = liftThread.getMoveWithShuttleCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE_CAR);
- list.add(command);
+ list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS_AND_SHUTTLE:
return false;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
index 775572c..58ea574 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
@@ -8,6 +8,8 @@
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import java.util.List;
+
public interface LiftThread extends ThreadHandler{
LiftProtocol getStatus();//鑾峰彇鎻愬崌鏈虹姸鎬�
@@ -38,17 +40,15 @@
boolean isLock(ExecuteSupport support);
- boolean commandFinished(Integer taskNo);
-
//***************鑾峰彇鍛戒护*****************
- LiftCommand getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//鎻愬崌鏈虹Щ鍔�
+ List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//鎻愬崌鏈虹Щ鍔�
- LiftCommand getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//杞借溅绉诲姩
+ List<LiftCommand> getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//杞借溅绉诲姩
- LiftCommand getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode);//鎵樼洏鍑哄叆
+ List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode);//鎵樼洏鍑哄叆
- LiftCommand getLockCommand(Integer taskNo, Boolean lock);//閿佸畾/瑙ｉ攣鎻愬崌鏈�
+ List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock);//閿佸畾/瑙ｉ攣鎻愬崌鏈�
- LiftCommand getShuttleSignalCommand(Integer taskNo, Boolean signal);//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
+ List<LiftCommand> getShuttleSignalCommand(Integer taskNo, Boolean signal);//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
index 7b75405..bdedee3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
@@ -374,12 +374,7 @@
}
@Override
- public boolean commandFinished(Integer taskNo) {
- return false;
- }
-
- @Override
- public LiftCommand getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
+ public List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
/**
* 浠诲姟绫诲瀷
* 1=绉绘墭鐩橈紱鍗囬檷鏈哄皢婧愮珯鍙版墭鐩樼Щ鍒扮洰鏍囩珯鍙�
@@ -407,26 +402,29 @@
command.setMode(LiftCommandModeType.MOVE.id);
command.setOriginLev(sourceLev);
command.setTargetLev(targetLev);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
@Override
- public LiftCommand getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
+ public List<LiftCommand> getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
return getMoveCommand(taskNo, sourceLev, targetLev, mode);
}
@Override
- public LiftCommand getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
+ public List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
return getMoveCommand(taskNo, sourceLev, targetLev, mode);
}
@Override
- public LiftCommand getLockCommand(Integer taskNo, Boolean lock) {
+ public List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock) {
return null;
}
@Override
- public LiftCommand getShuttleSignalCommand(Integer taskNo, Boolean signal) {
+ public List<LiftCommand> getShuttleSignalCommand(Integer taskNo, Boolean signal) {
return null;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index 1766542..8366f44 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -27,8 +27,10 @@
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
@Slf4j
@SuppressWarnings("all")
@@ -405,36 +407,6 @@
return extend.getLock();
}
- @Override
- public boolean commandFinished(Integer taskNo) {
- try {
- LiftCommand command = getTaskClearCommand();
- String loginToken = requestLoginToken();
- if (loginToken == null) {
- return false;
- }
-
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Authorization", "Bearer " + loginToken);
-
- String response = new HttpHandler.Builder()
- .setUri(API_URL)
- .setPath("/RDS/lifterOperation")
- .setHeaders(headers)
- .setJson(command.getBody())
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- return true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
//***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
//璇锋眰鐧诲綍
@@ -499,7 +471,7 @@
//绌鸿浇绉诲姩
@Override
- public LiftCommand getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
+ public List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
int taskMode = 3;//绌鸿浇绉诲姩
HashMap<String, Object> body = new HashMap<>();
@@ -519,12 +491,16 @@
command.setMode(LiftCommandModeType.MOVE.id);
command.setOriginLev(0);
command.setTargetLev(targetLev);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ list.addAll(getTaskClearCommand());
+ return list;
}
//杞借溅绉诲姩
@Override
- public LiftCommand getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
+ public List<LiftCommand> getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode) {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "lifterTask");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -542,12 +518,16 @@
command.setMode(LiftCommandModeType.MOVE.id);
command.setOriginLev(sourceLev);
command.setTargetLev(targetLev);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ list.addAll(getTaskClearCommand());
+ return list;
}
//鎵樼洏鍑哄叆
@Override
- public LiftCommand getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
+ public List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "lifterTask");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -567,12 +547,16 @@
command.setTargetLev(targetLev);
command.setOriginSta(originSta);
command.setTargetSta(targetSta);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ list.addAll(getTaskClearCommand());
+ return list;
}
//閿佸畾/瑙ｉ攣鎻愬崌鏈�
@Override
- public LiftCommand getLockCommand(Integer taskNo, Boolean lock) {
+ public List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock) {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "lifterOperation");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -585,12 +569,15 @@
command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
command.setBody(JSON.toJSONString(body));
command.setMode(lock ? LiftCommandModeType.LOCK.id : LiftCommandModeType.UNLOCK.id);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
@Override
- public LiftCommand getShuttleSignalCommand(Integer taskNo, Boolean signal) {
+ public List<LiftCommand> getShuttleSignalCommand(Integer taskNo, Boolean signal) {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "lifterOperation");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -602,11 +589,14 @@
command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
command.setBody(JSON.toJSONString(body));
command.setMode(signal ? LiftCommandModeType.LOCK.id : LiftCommandModeType.UNLOCK.id);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
//鑾峰彇鎻愬崌鏈轰换鍔℃竻闄ゅ懡浠�
- private LiftCommand getTaskClearCommand() {
+ private List<LiftCommand> getTaskClearCommand() {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "lifterOperation");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -617,7 +607,10 @@
command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
command.setBody(JSON.toJSONString(body));
command.setMode(LiftCommandModeType.RESET.id);
- return command;
+
+ ArrayList<LiftCommand> list = new ArrayList<>();
+ list.add(command);
+ return list;
}
/**
--
Gitblit v1.9.1