From ee4515cc893919da1b00770cb6d7b2dc8dd4738d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 05 七月 2025 13:26:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 5014298..3296a6b 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -2,16 +2,16 @@
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.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;
@@ -27,20 +27,20 @@
@SuppressWarnings("all")
public class NyShuttleThread implements ShuttleThread {
- private ShuttleSlave slave;
+ private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private Socket socket;
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());
+ News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", deviceConfig.getDeviceNo());
this.connect();
//鐩戝惉娑堟伅
@@ -59,8 +59,14 @@
Thread executeThread = new Thread(() -> {
while (true) {
try {
- DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- DeviceCommandMsgModel 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;
}
@@ -99,7 +105,11 @@
return;
}
- DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
+ DeviceMsgUtils deviceMsgUtils = null;
+ try {
+ deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
+ }catch (Exception e){
+ }
if(deviceMsgUtils == null) {
return;
}
@@ -129,21 +139,21 @@
JSONObject data = parseSocketResult(body);
DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
- deviceMsgModel.setDeviceId(slave.getId());
+ deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
deviceMsgModel.setDeviceMsgType("status");
deviceMsgModel.setDeviceMsg(data);
deviceMsgModel.setDeviceOriginMsg(sb.toString());
- deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), deviceMsgModel);
+ deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
return;
}
}
DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
- deviceMsgModel.setDeviceId(slave.getId());
+ deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
deviceMsgModel.setDeviceMsgType("command");
deviceMsgModel.setDeviceMsg(result);
deviceMsgModel.setDeviceOriginMsg(sb.toString());
- deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), deviceMsgModel);
+ deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
} catch (Exception e) {
e.printStackTrace();
}
@@ -152,16 +162,16 @@
@Override
public boolean connect() {
try {
- InetAddress address = InetAddress.getByName(slave.getIp());
+ 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;
}
--
Gitblit v1.9.1