From 9d24c64b9d81ae166f4c150f038793304d7161fa Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 19 十二月 2025 11:13:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyStationConnectDriver.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index 61edc2a..25877fb 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -1,6 +1,7 @@
package com.zy.core.network;
import com.zy.asrs.entity.DeviceConfig;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.ThreadHandler;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
@@ -21,14 +22,18 @@
@Slf4j
public class ZyStationConnectDriver implements ThreadHandler {
+ private static final ZyStationFakeConnect zyStationFakeConnect = new ZyStationFakeConnect();
+
private boolean connected = false;
private DeviceConfig deviceConfig;
+ private RedisUtil redisUtil;
private ZyStationConnectApi zyStationConnectApi;
private volatile boolean closed = false;
private ScheduledExecutorService executor;
- public ZyStationConnectDriver(DeviceConfig deviceConfig) {
+ public ZyStationConnectDriver(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
+ this.redisUtil = redisUtil;
}
@Override
@@ -39,9 +44,10 @@
@Override
public boolean connect() {
if (deviceConfig.getFake() == 0) {
- zyStationConnectApi = new ZyStationRealConnect(deviceConfig);
+ zyStationConnectApi = new ZyStationRealConnect(deviceConfig, redisUtil);
} else {
- zyStationConnectApi = new ZyStationFakeConnect(deviceConfig);
+ zyStationFakeConnect.addFakeConnect(deviceConfig, redisUtil);
+ zyStationConnectApi = zyStationFakeConnect;
}
boolean connect = zyStationConnectApi.connect();
@@ -92,10 +98,10 @@
if (zyStationConnectApi == null) {
return null;
}
- return zyStationConnectApi.getStatus();
+ return zyStationConnectApi.getStatus(deviceConfig.getDeviceNo());
}
public CommandResponse sendCommand(StationCommand command) {
- return zyStationConnectApi.sendCommand(command);
+ return zyStationConnectApi.sendCommand(deviceConfig.getDeviceNo(), command);
}
}
--
Gitblit v1.9.1