From c4b6b51afdd3374735ed5f358457987eaa6e476f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 九月 2025 16:55:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 120 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 85 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index 19af9d7..53fbe7f 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.DeviceConfig;
@@ -52,6 +51,7 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private ShuttleProtocol shuttleProtocol;
+ private ShuttleAction shuttleAction = null;
private static final boolean DEBUG = false;//璋冭瘯妯″紡
@@ -92,14 +92,11 @@
// Thread executeThread = new Thread(() -> {
// while (true) {
// try {
-// ShuttleAction shuttleAction = null;
-// try {
-// shuttleAction = SpringUtils.getBean(ShuttleAction.class);
-// }catch (Exception e){
-// continue;
-// }
-//
// if (shuttleAction == null) {
+// try {
+// shuttleAction = SpringUtils.getBean(ShuttleAction.class);
+// }catch (Exception e){
+// }
// continue;
// }
//
@@ -764,13 +761,15 @@
@Override
public synchronized boolean setTaskNo(Integer taskNo) {
+ redisUtil.set(RedisKeyType.SHUTTLE_FLAG.key + shuttleProtocol.getShuttleNo(), taskNo);
this.shuttleProtocol.setTaskNo(taskNo);
return true;
}
@Override
public synchronized boolean setSyncTaskNo(Integer taskNo) {
- this.shuttleProtocol.setSyncTaskNo(taskNo);
+ redisUtil.setSync(RedisKeyType.SHUTTLE_FLAG.key + shuttleProtocol.getShuttleNo(), taskNo);
+ this.shuttleProtocol.setTaskNo(taskNo);
return true;
}
@@ -929,8 +928,11 @@
return false;
}
+ List<NavigationMapType> restartCalcMapTypes = new ArrayList<>(mapTypes);
+ restartCalcMapTypes.add(NavigationMapType.SHUTTLE);
+
String currentLocNo = shuttleProtocol.getCurrentLocNo();
- List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(currentLocNo, locNo, mapTypes, assignCommand, this);
+ List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(currentLocNo, locNo, restartCalcMapTypes, assignCommand, this);
if (commands == null) {
return false;
}
@@ -976,12 +978,11 @@
HashMap<String, Object> body = new HashMap<>();
body.put("requestType", "move");//绉诲姩鍛戒护
body.put("taskId", taskId);//TaskID闇�瑕侀殢鏈�
-// body.put("start", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(startCodeNum, device.getHostId())));//璧风偣
-// body.put("target", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(distCodeNum, device.getHostId())));//缁堢偣
body.put("path", path);
request.setBody(body);
NavigateNode startNode = nodes.get(0);
+ List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
for (NavigateNode node : nodes) {
HashMap<String, Object> data = new HashMap<>();
String codeNum = NavigatePositionConvert.xyToPosition(node.getX(), node.getY(), node.getZ());
@@ -990,7 +991,6 @@
int yp = Integer.parseInt(String.valueOf(nyNode.get("x")));
int z = Integer.parseInt(String.valueOf(nyNode.get("z")));
- List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
List<MapNode> mapNodes = mapData.get(node.getX());
MapNode mapNode = mapNodes.get(node.getY());
@@ -1004,18 +1004,70 @@
httpStandard.setRequest(request);
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("qr_code_value", distCodeNum));
- if (locMast == null) {
- throw new CoolException("搴撲綅淇℃伅涓嶅瓨鍦�");
- }
+ Object object = redisUtil.get(RedisKeyType.LOC_MAP.key);
+ HashMap<String, String> locMap = (HashMap<String, String>) object;
+ String targetLocNo = locMap.get(distCodeNum);
ShuttleCommand command = new ShuttleCommand();
command.setShuttleNo(deviceConfig.getDeviceNo());
command.setBody(JSON.toJSONString(httpStandard));
command.setMode(ShuttleCommandModeType.MOVE.id);
- command.setTargetLocNo(locMast.getLocNo());
+ command.setTargetLocNo(targetLocNo);
+ command.setTaskNo(taskId);
+ return command;
+ }
+
+ @Override
+ public ShuttleCommand getMoveLiftCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes, Boolean moveIn) {
+ NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
+ NyShuttleHttpCommand httpStandard = getHttpStandard(deviceConfig.getDeviceNo(), taskNo);
+ NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();
+
+ ArrayList<HashMap<String, Object>> path = new ArrayList<>();
+
+ Integer taskId = getTaskId();
+ HashMap<String, Object> body = new HashMap<>();
+ if (moveIn) {
+ body.put("requestType", "intoLift");//杩涙彁鍗囨満
+ }else {
+ body.put("requestType", "outLift");//鍑烘彁鍗囨満
+ }
+ body.put("taskId", taskId);//TaskID闇�瑕侀殢鏈�
+ body.put("path", path);
+ request.setBody(body);
+
+ NavigateNode startNode = nodes.get(0);
+ List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
+ for (NavigateNode node : nodes) {
+ HashMap<String, Object> data = new HashMap<>();
+ String codeNum = NavigatePositionConvert.xyToPosition(node.getX(), node.getY(), node.getZ());
+ Map<String, Object> nyNode = navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(codeNum));
+ int xp = Integer.parseInt(String.valueOf(nyNode.get("y")));
+ int yp = Integer.parseInt(String.valueOf(nyNode.get("x")));
+ int z = Integer.parseInt(String.valueOf(nyNode.get("z")));
+
+ List<MapNode> mapNodes = mapData.get(node.getX());
+ MapNode mapNode = mapNodes.get(node.getY());
+
+ data.put("xp", xp);
+ data.put("yp", yp);
+ data.put("z", z);
+ data.put("x", mapNode.getXBase());
+ data.put("y", mapNode.getYBase());
+ path.add(data);
+ }
+
+ httpStandard.setRequest(request);
+
+ Object object = redisUtil.get(RedisKeyType.LOC_MAP.key);
+ HashMap<String, String> locMap = (HashMap<String, String>) object;
+ String targetLocNo = locMap.get(distCodeNum);
+
+ ShuttleCommand command = new ShuttleCommand();
+ command.setShuttleNo(deviceConfig.getDeviceNo());
+ command.setBody(JSON.toJSONString(httpStandard));
+ command.setMode(ShuttleCommandModeType.MOVE.id);
+ command.setTargetLocNo(targetLocNo);
command.setTaskNo(taskId);
return command;
}
@@ -1084,7 +1136,6 @@
//鑾峰彇灏忚溅澶嶄綅鍝嶅簲鍛戒护
public ShuttleCommand getInitCommand(Integer taskNo, Integer code) {
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
NyShuttleHttpCommand httpStandard = getHttpStandard(deviceConfig.getDeviceNo(), taskNo);
NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();
@@ -1100,15 +1151,14 @@
map.put("z", lev);
String mapStr = JSON.toJSONString(map);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("qr_code_value", mapStr));
- if (locMast == null) {
- throw new CoolException("鍦板潃鐮佷笉瀛樺湪");
- }
+
+ Object object = redisUtil.get(RedisKeyType.LOC_MAP.key);
+ HashMap<String, String> locMap = (HashMap<String, String>) object;
+ String targetLocNo = locMap.get(mapStr);
List<List<MapNode>> mapData = navigateMapData.getJsonData(lev, NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
- List<MapNode> mapNodes = mapData.get(locMast.getRow1());
- MapNode mapNode = mapNodes.get(locMast.getBay1());
+ List<MapNode> mapNodes = mapData.get(Utils.getRow(targetLocNo));
+ MapNode mapNode = mapNodes.get(Utils.getBay(targetLocNo));
HashMap<String, Object> location = new HashMap<>();
location.put("xp", row);
@@ -1214,16 +1264,16 @@
private JSONObject queryCommandStatus(String resultKey) {
// 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
- // 灏濊瘯50娆�
JSONObject result = null;
- for (int i = 0; i < 50; i++) {
+ long startTime = System.currentTimeMillis();
+ while (true) {
+ if((System.currentTimeMillis() - startTime) > 1000 * 10) {
+ break;
+ }
+
result = getRequestBody(resultKey);
if (result == null) {
- try {
- Thread.sleep(500);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ continue;
}else {
break;
}
--
Gitblit v1.9.1