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 | 161 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 135 insertions(+), 26 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 478e932..6737009 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -2,20 +2,20 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
+import com.zy.common.SpringUtils;
+import com.zy.common.utils.DateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
-import com.zy.core.Utils.DeviceMsgUtils;
+import com.zy.core.model.DeviceCommandMsgModel;
+import com.zy.core.model.DeviceMsgModel;
+import com.zy.core.properties.DeviceConfig;
+import com.zy.core.utils.DeviceMsgUtils;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.ShuttleSlave;
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;
@@ -25,26 +25,30 @@
@SuppressWarnings("all")
public class NyShuttleThread implements ShuttleThread {
- private ShuttleSlave slave;
+ private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private Socket socket;
+ private boolean stopThread = false;
- private static final boolean DEBUG = false;//璋冭瘯妯″紡
-
- public NyShuttleThread(ShuttleSlave slave, RedisUtil redisUtil) {
- this.slave = slave;
+ public NyShuttleThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
+ this.deviceConfig = deviceConfig;
this.redisUtil = redisUtil;
}
@Override
public void run() {
- News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", slave.getId());
- this.connect();
+ News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", deviceConfig.getDeviceNo());
//鐩戝惉娑堟伅
Thread innerThread = new Thread(() -> {
while (true) {
+ if(stopThread) {
+ break;
+ }
+
try {
+ this.connect();
+ Thread.sleep(200);
listenSocketMessage();
} catch (Exception e) {
e.printStackTrace();
@@ -56,9 +60,19 @@
//鎵ц鎸囦护
Thread executeThread = new Thread(() -> {
while (true) {
+ if(stopThread) {
+ break;
+ }
+
try {
- DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- Object deviceCommandMsg = deviceMsgUtils.getDeviceCommandMsg(SlaveType.Shuttle, slave.getId());
+ DeviceMsgUtils deviceMsgUtils = null;
+ try {
+ deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
+ }catch (Exception e){}
+ if (deviceMsgUtils == null) {
+ continue;
+ }
+ DeviceCommandMsgModel deviceCommandMsg = deviceMsgUtils.getDeviceCommandMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo());
if (deviceCommandMsg == null) {
continue;
}
@@ -73,15 +87,17 @@
executeThread.start();
}
- private void executeCommand(Object deviceCommandMsg) {
+ private void executeCommand(DeviceCommandMsgModel deviceCommandMsg) {
try {
if (this.socket == null) {
return;
}
+ Object command = deviceCommandMsg.getCommand();
+
// 鑾峰彇杈撳嚭娴�
OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
- writer.write(JSON.toJSONString(deviceCommandMsg) + "\r\n");
+ writer.write(JSON.toJSONString(command) + "\r\n");
writer.flush();
// System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
}catch (Exception e) {
@@ -95,8 +111,12 @@
return;
}
- DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- if(deviceMsgUtils == null) {
+ DeviceMsgUtils deviceMsgUtils = null;
+ try {
+ deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
+ } catch (Exception e) {
+ }
+ if (deviceMsgUtils == null) {
return;
}
@@ -115,25 +135,103 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
- deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), result);
+ log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
+
+ String msgType = result.getString("msgType");
+ if ("responseMsg".equals(msgType)) {
+ JSONObject response = result.getJSONObject("response");
+ JSONObject body = response.getJSONObject("body");
+ if (body.containsKey("workingMode")) {
+ //read
+ JSONObject data = parseSocketResult(body);
+
+ DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
+ deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
+ deviceMsgModel.setDeviceMsgType("status");
+ deviceMsgModel.setDeviceMsg(data);
+ deviceMsgModel.setDeviceOriginMsg(sb.toString());
+ deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
+ return;
+ }
+ }
+
+ 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();
}
+ }
+
+ public JSONObject parseSocketResult(JSONObject data) {
+ JSONObject device = new JSONObject();
+
+ //灏忚溅璁惧鐘舵��
+ device.put("deviceStatus", data.getInteger("free"));
+ //灏忚溅妯″紡
+ device.put("mode", data.getInteger("workingMode"));
+ //褰撳墠浜岀淮鐮�
+ device.put("currentCode", data.getString("point"));
+ //鐢垫睜鐢甸噺
+ device.put("batteryPower", data.getString("powerPercent"));
+ //鐢垫睜鐢靛帇
+ device.put("batteryVoltage", data.getInteger("voltage"));
+ //鏁呴殰
+ device.put("errorCode", data.getJSONArray("errCode").getString(0));
+
+ //鏄惁椤跺崌
+ device.put("hasLift", data.getInteger("liftPosition") == 2 ? true : false);
+ //鏄惁鏈夋墭鐩�
+ device.put("hasPallet", data.getInteger("loadState") == 1 ? true : false);
+ //琛岄┒鏂瑰悜
+ device.put("runDirection", data.getString("runDir") == null ? "none" : data.getString("runDir"));
+ //鏄惁涓哄厖鐢电姸鎬�
+ device.put("hasCharge", data.getInteger("chargState") == 1 ? true : false);
+ //杩愯閫熷害
+ device.put("speed", data.getInteger("speed"));
+
+ //*********璇诲彇鎵╁睍瀛楁**********
+
+ JSONObject extend = new JSONObject();
+ device.put("extend", extend);
+
+ //绠″埗鐘舵��
+ extend.put("suspendState", data.getInteger("suspendState"));
+ //鏈�楂樼數鑺數鍘�(mV)
+ extend.put("maxCellVoltage", data.getInteger("maxCellVoltage"));
+ //鏈�浣庣數鑺數鍘�(mV)
+ extend.put("minCellVoltage", data.getInteger("minCellVoltage"));
+ //鐢垫睜鐢靛帇
+ extend.put("voltage", data.getInteger("voltage"));
+ //鍏呮斁鐢靛惊鐜鏁�
+ extend.put("chargeCycleTimes", data.getInteger("chargeCycleTimes"));
+ //鍓╀綑鐢甸噺
+ extend.put("surplusQuantity", data.getInteger("surplusQuantity"));
+ //鎬荤數閲�
+ extend.put("countQuantity", data.getInteger("countQuantity"));
+ return device;
}
@Override
public boolean connect() {
try {
- InetAddress address = InetAddress.getByName(slave.getIp());
+ if(this.socket != null) {
+ return true;
+ }
+
+ InetAddress address = InetAddress.getByName(deviceConfig.getIp());
if (address.isReachable(10000)) {
- Socket socket = new Socket(slave.getIp(), slave.getPort());
+ 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()), slave.getId(), slave.getIp(), slave.getPort()));
+ 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()), slave.getId(), slave.getIp(), slave.getPort()));
+ 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;
}
@@ -144,4 +242,15 @@
public void close() {
}
+
+ @Override
+ public DeviceConfig getDeviceConfig() {
+ return this.deviceConfig;
+ }
+
+ @Override
+ public void stopThread() {
+ this.stopThread = true;
+ }
+
}
--
Gitblit v1.9.1