From 920d87ad2ca03711af3683237efbb8f7ef5f53ea Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 14 七月 2025 07:53:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 20 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 ab5b132..b585b55 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -18,6 +18,7 @@
import java.io.*;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketException;
import java.text.MessageFormat;
import java.util.*;
@@ -29,6 +30,7 @@
private RedisUtil redisUtil;
private Socket socket;
private boolean stopThread = false;
+ private HashMap<Integer, String> resultKeyMap = new HashMap<Integer, String>();
public NyShuttleThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -93,14 +95,22 @@
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) {
+ }catch (SocketException e) {
+ this.socket = null;
+ e.printStackTrace();
+ } catch (IOException e) {
e.printStackTrace();
}
}
@@ -134,13 +144,28 @@
}
}
- JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ JSONObject result = null;
+ try {
+ result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ }catch (Exception e){}
+
+ if(result == null) {
+ return;
+ }
+
+ 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);
@@ -149,18 +174,30 @@
deviceMsgModel.setDeviceMsgType("status");
deviceMsgModel.setDeviceMsg(data);
deviceMsgModel.setDeviceOriginMsg(sb.toString());
+ deviceMsgModel.setResultKey(resultKey);
deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
- return;
+ }else {
+ log.info("鏀跺埌Rcs Shuttle 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("鏀跺埌Shuttle 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);
}
}
- log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
-
- 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();
}
@@ -224,10 +261,56 @@
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;
+ Socket deviceSocket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
+ deviceSocket.setSoTimeout(10000);
+ deviceSocket.setKeepAlive(true);
+
+ if (this.deviceConfig.getFake()) {
+ //铏氭嫙璁惧闇�瑕佷笂鎶ヨ澶囦俊鎭�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("msgType", "fakeDeviceFirstConnect");
+ map.put("deviceConfig", this.deviceConfig);
+
+ // 鑾峰彇杈撳嚭娴�
+ OutputStreamWriter writer = new OutputStreamWriter(deviceSocket.getOutputStream());
+ writer.write(JSON.toJSONString(map) + "\r\n");
+ writer.flush();
+
+ // 鑾峰彇杈撳叆娴�
+ BufferedReader reader = new BufferedReader(new InputStreamReader(deviceSocket.getInputStream()));
+ // 璇诲彇鏈嶅姟鍣ㄧ殑鍝嶅簲
+ StringBuffer sb = new StringBuffer();
+ char[] chars = new char[2048];//缂撳啿鍖�
+ while (true) {
+ reader.read(chars);
+ String trim = new String(chars);
+ sb.append(trim);
+ if (trim.lastIndexOf("\r\n") != -1) {
+ break;
+ }
+ }
+
+ JSONObject result = null;
+ try {
+ result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
+ }catch (Exception e){}
+
+ if(result == null) {
+ return false;
+ }
+
+ if(result.getInteger("deviceNo") != deviceConfig.getDeviceNo()) {
+ return false;
+ }
+
+ if(!result.getString("status").equals("success")) {
+ return false;
+ }
+
+ this.socket = deviceSocket;
+ }else {
+ this.socket = deviceSocket;
+ }
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) {
--
Gitblit v1.9.1