From 7c4bbcb2ceed34e82212b82d2aa551a87bdaaa0d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 16:55:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 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 319e1e7..fbb504c 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -13,11 +13,11 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
import com.zy.core.thread.ShuttleThread;
+import io.netty.handler.timeout.ReadTimeoutException;
import lombok.extern.slf4j.Slf4j;
import java.io.*;
import java.net.InetAddress;
-import java.net.ServerSocket;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.*;
@@ -29,21 +29,16 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private Socket socket;
- private ServerSocket serverSocket;
-
- private boolean fake = false;
private boolean stopThread = false;
public NyShuttleThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
this.redisUtil = redisUtil;
- this.fake = deviceConfig.getFake();
}
@Override
public void run() {
News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", deviceConfig.getDeviceNo());
- this.connect();
//鐩戝惉娑堟伅
Thread innerThread = new Thread(() -> {
@@ -52,9 +47,8 @@
break;
}
- System.out.println("read");
-
try {
+ this.connect();
Thread.sleep(200);
listenSocketMessage();
} catch (Exception e) {
@@ -71,7 +65,6 @@
break;
}
- System.out.println("executeThread");
try {
DeviceMsgUtils deviceMsgUtils = null;
try {
@@ -93,35 +86,6 @@
}
});
executeThread.start();
-
- if (this.fake) {
- Thread fakeThread = new Thread(() -> {
- try {
- serverSocket = new ServerSocket(deviceConfig.getPort());
-
- while (true) {
- if(stopThread) {
- break;
- }
-
- System.out.println("fakeThread");
- Socket accept = serverSocket.accept();
- handleClient(accept);
- }
- }catch (Exception e){
- e.printStackTrace();
- }
- });
- fakeThread.start();
- }
- }
-
- private void handleClient(Socket socket) throws IOException {
- InputStream inputStream = socket.getInputStream();
- OutputStream outputStream = socket.getOutputStream();
- outputStream.write("test".getBytes());
- outputStream.flush();
- socket.close();
}
private void executeCommand(DeviceCommandMsgModel deviceCommandMsg) {
@@ -151,9 +115,9 @@
DeviceMsgUtils deviceMsgUtils = null;
try {
deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- }catch (Exception e){
+ } catch (Exception e) {
}
- if(deviceMsgUtils == null) {
+ if (deviceMsgUtils == null) {
return;
}
@@ -172,6 +136,7 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
String msgType = result.getString("msgType");
if ("responseMsg".equals(msgType)) {
@@ -198,7 +163,7 @@
deviceMsgModel.setDeviceOriginMsg(sb.toString());
deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
@@ -254,6 +219,10 @@
@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());
@@ -285,8 +254,4 @@
this.stopThread = true;
}
- @Override
- public boolean isFake() {
- return this.fake;
- }
}
--
Gitblit v1.9.1