From b75406f7a322d0baa21b4ec908bf3738b948b0c0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 09 七月 2025 15:49:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 47 insertions(+), 58 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..9a9aa99 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -17,7 +17,6 @@
import java.io.*;
import java.net.InetAddress;
-import java.net.ServerSocket;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.*;
@@ -29,21 +28,17 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private Socket socket;
- private ServerSocket serverSocket;
-
- private boolean fake = false;
private boolean stopThread = false;
+ private HashMap<Integer, String> resultKeyMap = new HashMap<Integer, String>();
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) {
@@ -130,11 +94,16 @@
return;
}
- Object command = deviceCommandMsg.getCommand();
+ String command = JSON.toJSONString(deviceCommandMsg.getCommand());
+ JSONObject commandObj = JSON.parseObject(command);
+ JSONObject request = commandObj.getJSONObject("request");
+ JSONObject header = request.getJSONObject("header");
+ Integer requestId = header.getInteger("requestId");
+ resultKeyMap.put(requestId, deviceCommandMsg.getResultKey());
// 鑾峰彇杈撳嚭娴�
OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
- writer.write(JSON.toJSONString(command) + "\r\n");
+ writer.write(command + "\r\n");
writer.flush();
// System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
}catch (Exception e) {
@@ -151,9 +120,9 @@
DeviceMsgUtils deviceMsgUtils = null;
try {
deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- }catch (Exception e){
+ } catch (Exception e) {
}
- if(deviceMsgUtils == null) {
+ if (deviceMsgUtils == null) {
return;
}
@@ -172,12 +141,19 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ JSONObject response = result.getJSONObject("response");
+ JSONObject header = response.getJSONObject("header");
+ JSONObject body = response.getJSONObject("body");
String msgType = result.getString("msgType");
+
+// log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
if ("responseMsg".equals(msgType)) {
- JSONObject response = result.getJSONObject("response");
- JSONObject body = response.getJSONObject("body");
- if (body.containsKey("workingMode")) {
+ Integer responseId = header.getInteger("responseId");
+ String resultKey = resultKeyMap.get(responseId);
+
+ String responseType = body.getString("responseType");
+ if (responseType.equals("state")) {
//read
JSONObject data = parseSocketResult(body);
@@ -186,19 +162,32 @@
deviceMsgModel.setDeviceMsgType("status");
deviceMsgModel.setDeviceMsg(data);
deviceMsgModel.setDeviceOriginMsg(sb.toString());
+ deviceMsgModel.setResultKey(resultKey);
deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
- return;
+ }else {
+ log.info("鏀跺埌Server Command Data: {}", JSON.toJSONString(result));
+ DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
+ deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
+ deviceMsgModel.setDeviceMsgType("command");
+ deviceMsgModel.setDeviceMsg(result);
+ deviceMsgModel.setDeviceOriginMsg(sb.toString());
+ deviceMsgModel.setResultKey(resultKey);
+ deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
+ }
+ } else if ("requestMsg".equals(msgType)) {
+ log.info("鏀跺埌Server Init Data: {}", JSON.toJSONString(result));
+ String requestType = body.getString("requestType");
+ if (requestType.equals("init")) {
+ DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
+ deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
+ deviceMsgModel.setDeviceMsgType("shuttleInit");
+ deviceMsgModel.setDeviceMsg(result);
+ deviceMsgModel.setDeviceOriginMsg(sb.toString());
+ deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
}
}
-
- DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
- deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
- deviceMsgModel.setDeviceMsgType("command");
- deviceMsgModel.setDeviceMsg(result);
- deviceMsgModel.setDeviceOriginMsg(sb.toString());
- deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
@@ -254,6 +243,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 +278,4 @@
this.stopThread = true;
}
- @Override
- public boolean isFake() {
- return this.fake;
- }
}
--
Gitblit v1.9.1