From f3ec64035a323a6a31bf5e98401ea2dc342c8aa2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 16:25:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 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 3296a6b..6737009 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -15,9 +15,7 @@
import com.zy.core.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import java.io.*;
import java.net.InetAddress;
import java.net.Socket;
import java.text.MessageFormat;
@@ -30,8 +28,7 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private Socket socket;
-
- private static final boolean DEBUG = false;//璋冭瘯妯″紡
+ private boolean stopThread = false;
public NyShuttleThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -41,12 +38,17 @@
@Override
public void run() {
News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", deviceConfig.getDeviceNo());
- this.connect();
//鐩戝惉娑堟伅
Thread innerThread = new Thread(() -> {
while (true) {
+ if(stopThread) {
+ break;
+ }
+
try {
+ this.connect();
+ Thread.sleep(200);
listenSocketMessage();
} catch (Exception e) {
e.printStackTrace();
@@ -58,6 +60,10 @@
//鎵ц鎸囦护
Thread executeThread = new Thread(() -> {
while (true) {
+ if(stopThread) {
+ break;
+ }
+
try {
DeviceMsgUtils deviceMsgUtils = null;
try {
@@ -108,9 +114,9 @@
DeviceMsgUtils deviceMsgUtils = null;
try {
deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- }catch (Exception e){
+ } catch (Exception e) {
}
- if(deviceMsgUtils == null) {
+ if (deviceMsgUtils == null) {
return;
}
@@ -129,6 +135,7 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
String msgType = result.getString("msgType");
if ("responseMsg".equals(msgType)) {
@@ -155,32 +162,8 @@
deviceMsgModel.setDeviceOriginMsg(sb.toString());
deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
- }
-
- @Override
- public boolean connect() {
- try {
- InetAddress address = InetAddress.getByName(deviceConfig.getIp());
- if (address.isReachable(10000)) {
- Socket socket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
- socket.setSoTimeout(10000);
- socket.setKeepAlive(true);
- this.socket = socket;
- log.info(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- }
- } catch (Exception e) {
- OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- return false;
- }
-
- return true;
- }
-
- @Override
- public void close() {
-
}
public JSONObject parseSocketResult(JSONObject data) {
@@ -231,4 +214,43 @@
extend.put("countQuantity", data.getInteger("countQuantity"));
return device;
}
+
+ @Override
+ public boolean connect() {
+ try {
+ if(this.socket != null) {
+ return true;
+ }
+
+ InetAddress address = InetAddress.getByName(deviceConfig.getIp());
+ if (address.isReachable(10000)) {
+ Socket socket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
+ socket.setSoTimeout(10000);
+ socket.setKeepAlive(true);
+ this.socket = socket;
+ log.info(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ }
+ } catch (Exception e) {
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public DeviceConfig getDeviceConfig() {
+ return this.deviceConfig;
+ }
+
+ @Override
+ public void stopThread() {
+ this.stopThread = true;
+ }
+
}
--
Gitblit v1.9.1