From ff2b6e2329ae2c5d3fede2f9413170fd6e87c46c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 09:27:52 +0800
Subject: [PATCH] #输送线读取
---
src/main/java/com/zy/core/thread/NyShuttleThread.java | 173 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 122 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 9a8b6d1..2d2b4ad 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -10,7 +10,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
-import com.zy.common.model.NyShuttleOperaResult;
import com.zy.common.service.CommonService;
import com.zy.common.utils.*;
import com.zy.core.News;
@@ -29,12 +28,12 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import javax.swing.*;
import java.io.IOException;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
/**
@@ -114,12 +113,6 @@
private void readStatus() {
try {
- if (null == shuttleProtocol) {
- shuttleProtocol = new NyShuttleProtocol();
- shuttleProtocol.setShuttleNo(slave.getId().shortValue());
- shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
- }
-
//----------璇诲彇鍥涘悜绌挎杞︾姸鎬�-----------
NyShuttleHttpCommand readStatusCommand = NyHttpUtils.getReadStatusCommand(slave.getId());
JSONObject jsonObject = NyHttpUtils.requestCommand(socket, readStatusCommand);
@@ -248,6 +241,7 @@
OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
}
+// log.warn(JSON.toJSONString(shuttleProtocol));//杈撳嚭灏忚溅鐘舵��
}
} catch (Exception e) {
e.printStackTrace();
@@ -270,6 +264,11 @@
socket.setSoTimeout(60000);
socket.setKeepAlive(true);
this.socket = socket;
+ if (null == shuttleProtocol) {
+ shuttleProtocol = new NyShuttleProtocol();
+ shuttleProtocol.setShuttleNo(slave.getId().shortValue());
+ }
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
log.info(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
} catch (IOException e) {
OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -357,7 +356,7 @@
shuttleProtocol.setAssignCommand(assignCommand);
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("shuttle_wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.SHUTTLE.key + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
//鎵ц涓嬪彂浠诲姟
executeWork(assignCommand.getTaskNo());
}
@@ -369,10 +368,11 @@
return false;
}
+ NavigateMapUtils navigateMapUtils = SpringUtils.getBean(NavigateMapUtils.class);
WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(wrkNo.intValue());
- Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
if (o == null) {
return false;
}
@@ -386,7 +386,7 @@
return false;
}
- NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(shuttleProtocol.getCurrentLocNo()));
+ checkIOSta(commands, commandStep);//妫�娴嬪皬杞︽槸鍚﹁繘鍑烘彁鍗囨満杈撻�佺珯
boolean isLock = false;//鏄惁瑙ｉ攣璺緞
//鍙栧嚭鍛戒护
@@ -405,13 +405,21 @@
//涓婁竴鏉℃寚浠ょ殑鐩爣浣嶇疆鍜屽綋鍓嶅皬杞︿綅缃浉鍚岋紝鍒欒瀹氫笂涓�鏉′换鍔″畬鎴�
lastCommand.setComplete(true);
//瑙ｉ攣閿佸畾璺緞锛屼笂涓�鏉¤矾寰�
- List<NavigateNode> nodes = lastCommand.getNodes();
+ List<NavigateNode> nodes = JSON.parseArray(JSON.toJSONString(lastCommand.getNodes()), NavigateNode.class);//杩涜娣卞害copy
// //瑙ｉ攣褰撳墠璺緞
// if (command != null && command.getNodes() != null) {
// nodes.addAll(command.getNodes());
// }
if (nodes != null) {
- navigateMapData.writeNavigateNodeToRedisMap(nodes, false);//瑙ｉ攣璺緞
+ NavigateNode targetNode = assignCommand.getNodes().get(assignCommand.getNodes().size() - 1);//鏈�缁堣妭鐐�
+ NavigateNode node = nodes.get(nodes.size() - 1);
+ if (!(targetNode.getX() == node.getX() && targetNode.getY() == node.getY())) {
+ nodes.remove(nodes.size() - 1);//鍓旈櫎灏捐妭鐐�
+ }
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(shuttleProtocol.getCurrentLocNo()), nodes, false);//瑙ｉ攣璺緞
+ if (!result) {
+ return false;//瑙ｉ攣澶辫触
+ }
isLock = true;//瑙ｉ攣杩囪矾寰�
}
}
@@ -419,7 +427,7 @@
lastCommand.setComplete(true);//鍏朵粬鍛戒护榛樿璁や负瀹屾垚
}
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.SHUTTLE.key + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
if (!lastCommand.getComplete()) {
//涓婁竴鏉′换鍔℃湭瀹屾垚锛岀姝笅鍙戝懡浠�
@@ -430,7 +438,7 @@
NyShuttleHttpCommand endCommand = commands.get(commands.size() - 1);
if (endCommand.getComplete()) {
//鍒犻櫎redis
- redisUtil.del("shuttle_wrk_no_" + redisCommand.getWrkNo());
+ redisUtil.del(RedisKeyType.SHUTTLE.key + redisCommand.getWrkNo());
if (!assignCommand.getCharge()) {
//瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
@@ -468,38 +476,41 @@
return false;
}
- if (command.getRequest().getBody().get("requestType").equals("move")) {
- ArrayList<int[]> whiteList = new ArrayList<>();//璁剧疆鑺傜偣鐨勭櫧鍚嶅崟
- if (wrkMast != null && ((wrkMast.getIoType() > 100 && wrkMast.getIoType() < 200) || wrkMast.getIoType() == 11)) {
- //鍑哄簱浠诲姟锛屼笉妫�娴嬮鑺傜偣
- int[] startArr = NavigatePositionConvert.positionToXY(wrkMast.getSourceLocNo());//寮�濮嬭妭鐐�
- whiteList.add(startArr);
- }
-
- //瑙ｉ攣杩囪矾寰勶紝鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
- if (isLock) {
- //鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
- //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
- if (!checkPath(nextNodes == null ? command.getNodes() : nextNodes, null, whiteList)) {
- return false;
- }
- }else {
- //妫�娴嬪綋鍓嶈矾寰勫拰涓嬩竴娈佃矾寰�
- //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
- if (!checkPath(command.getNodes(), nextNodes, whiteList)) {
- return false;
- }
- }
-
- //閿佸畾璺緞锛岄攣瀹氬綋鍓嶈矾寰勫拰涓嬩竴姝ヨ矾寰�
- List<NavigateNode> nodes = command.getNodes();
- if (nextNodes != null) {
- nodes.addAll(nextNodes);
- }
- if (nodes != null) {
- navigateMapData.writeNavigateNodeToRedisMap(nodes, true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
- }
- }
+// if (command.getRequest().getBody().get("requestType").equals("move")) {
+// ArrayList<int[]> whiteList = new ArrayList<>();//璁剧疆鑺傜偣鐨勭櫧鍚嶅崟
+// if (wrkMast != null && ((wrkMast.getIoType() > 100 && wrkMast.getIoType() < 200) || wrkMast.getIoType() == 11)) {
+// //鍑哄簱浠诲姟锛屼笉妫�娴嬮鑺傜偣
+// int[] startArr = NavigatePositionConvert.positionToXY(wrkMast.getSourceLocNo());//寮�濮嬭妭鐐�
+// whiteList.add(startArr);
+// }
+//
+// //瑙ｉ攣杩囪矾寰勶紝鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
+// if (isLock) {
+// //鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
+// //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
+// if (!checkPath(nextNodes == null ? command.getNodes() : nextNodes, null, whiteList)) {
+// return false;
+// }
+// }else {
+// //妫�娴嬪綋鍓嶈矾寰勫拰涓嬩竴娈佃矾寰�
+// //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
+// if (!checkPath(command.getNodes(), nextNodes, whiteList)) {
+// return false;
+// }
+// }
+//
+// //閿佸畾璺緞锛岄攣瀹氬綋鍓嶈矾寰勫拰涓嬩竴姝ヨ矾寰�
+// List<NavigateNode> nodes = command.getNodes();
+// if (nextNodes != null) {
+// nodes.addAll(nextNodes);
+// }
+// if (nodes != null) {
+// boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(shuttleProtocol.getCurrentLocNo()), nodes, true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+// if (!result) {
+// return false;//璺緞閿佸畾澶辫触
+// }
+// }
+// }
//鍙墽琛屽懡浠�
if (!write(command, assignCommand)) {
@@ -521,7 +532,7 @@
//鏇存柊redis鏁版嵁
redisCommand.setCommandStep(commandStep);
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
+ redisUtil.set(RedisKeyType.SHUTTLE.key + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
return true;
}
@@ -533,7 +544,7 @@
return false;
}
- Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
if (o == null) {
return false;
}
@@ -617,7 +628,7 @@
return false;
}
- Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
+ Object o = redisUtil.get(RedisKeyType.SHUTTLE.key + wrkNo);
if (o == null) {
return false;
}
@@ -703,7 +714,7 @@
// assignCommand.setCommands(commands);
// redisCommand.setAssignCommand(assignCommand);
// //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-// redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
+// redisUtil.set(RedisKeyType.SHUTTLE.key + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
// return false;//褰撳墠涓嶅彲琛岃蛋锛岀瓑寰呬笅涓�娆℃墽琛岃蛋鏂拌矾寰�
// }
@@ -803,4 +814,64 @@
}
}
+ //妫�娴嬪皬杞︽槸鍚﹁繘鍑烘彁鍗囨満杈撻�佺珯
+ public void checkIOSta(List<NyShuttleHttpCommand> commands, int commandStep) {
+ if (commandStep != 0) {
+ NyShuttleHttpCommand lastCommand = commands.get(commandStep - 1);//涓婁竴姝ュ懡浠�
+ if (lastCommand.getRequest().getBody().get("requestType").equals("move")) {
+ //妫�娴嬭捣鐐规槸鍚︿负鎻愬崌鏈鸿緭閫佺珯鐐�
+ NyShuttleProtocol.NyShuttlePointClass start = JSON.parseObject(lastCommand.getRequest().getBody().get("start").toString(), NyShuttleProtocol.NyShuttlePointClass.class);
+ int[] startPoint = NavigatePositionConvert.NyXyzToWCSXyz(start.getX(), start.getY(), start.getZ());
+ if (startPoint[0] == 13 && (startPoint[1] == 22 || startPoint[1] == 38 || startPoint[1] == 57)) {
+ //杈撻�佺珯鐐逛綅缃�
+
+ int liftNo;
+ if (startPoint[1] == 22) {
+ liftNo = 1;
+ } else if (startPoint[1] == 38) {
+ liftNo = 2;
+ } else {
+ liftNo = 3;
+ }
+
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("lev", startPoint[2]);
+ data.put("status", false);//鍑鸿緭閫佺珯
+
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Lift, liftNo, new Task(4, data));
+ }
+ }
+ }
+
+ if (commands.size() == commandStep) {
+ return;
+ }
+ NyShuttleHttpCommand command = commands.get(commandStep);//褰撳墠鍛戒护
+ if (command.getRequest().getBody().get("requestType").equals("move")) {
+ NyShuttleProtocol.NyShuttlePointClass target = JSON.parseObject(command.getRequest().getBody().get("target").toString(), NyShuttleProtocol.NyShuttlePointClass.class);
+ int[] targetPoint = NavigatePositionConvert.NyXyzToWCSXyz(target.getX(), target.getY(), target.getZ());
+ //妫�娴嬬洰鏍囦綅缃槸鍚︿负鎻愬崌鏈鸿緭閫佺珯鐐�
+ if (targetPoint[0] == 13 && (targetPoint[1] == 22 || targetPoint[1] == 38 || targetPoint[1] == 57)) {
+ //杈撻�佺珯鐐逛綅缃�
+
+ int liftNo;
+ if (targetPoint[1] == 22) {
+ liftNo = 1;
+ } else if (targetPoint[1] == 38) {
+ liftNo = 2;
+ } else {
+ liftNo = 3;
+ }
+
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("lev", targetPoint[2]);
+ data.put("status", true);//杩涜緭閫佺珯
+
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Lift, liftNo, new Task(4, data));
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1