From 3fef108b925349b467f0639aede38e0a918a2a7f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 22:00:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 6 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 e3854e0..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.*;
@@ -106,7 +107,10 @@
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();
}
}
@@ -140,7 +144,15 @@
}
}
- 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");
@@ -249,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