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 | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 255604a..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,7 +28,6 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import javax.swing.*;
import java.io.IOException;
import java.net.Socket;
import java.text.MessageFormat;
@@ -115,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);
@@ -249,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();
@@ -271,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()));
@@ -358,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());
}
@@ -374,7 +372,7 @@
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;
}
@@ -407,7 +405,7 @@
//涓婁竴鏉℃寚浠ょ殑鐩爣浣嶇疆鍜屽綋鍓嶅皬杞︿綅缃浉鍚岋紝鍒欒瀹氫笂涓�鏉′换鍔″畬鎴�
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());
@@ -429,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()) {
//涓婁竴鏉′换鍔℃湭瀹屾垚锛岀姝笅鍙戝懡浠�
@@ -440,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
@@ -534,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;
}
@@ -546,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;
}
@@ -630,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;
}
@@ -716,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;//褰撳墠涓嶅彲琛岃蛋锛岀瓑寰呬笅涓�娆℃墽琛岃蛋鏂拌矾寰�
// }
--
Gitblit v1.9.1