From 2f9849905dbb8d65faa28628a40084708a0386ef Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 25 十二月 2025 10:58:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyStationConnectDriver.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index 7ec13eb..185902d 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -22,6 +22,8 @@
@Slf4j
public class ZyStationConnectDriver implements ThreadHandler {
+ private static final ZyStationFakeConnect zyStationFakeConnect = new ZyStationFakeConnect();
+
private boolean connected = false;
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
@@ -44,7 +46,8 @@
if (deviceConfig.getFake() == 0) {
zyStationConnectApi = new ZyStationRealConnect(deviceConfig, redisUtil);
} else {
- zyStationConnectApi = new ZyStationFakeConnect(deviceConfig, redisUtil);
+ zyStationFakeConnect.addFakeConnect(deviceConfig, redisUtil);
+ zyStationConnectApi = zyStationFakeConnect;
}
boolean connect = zyStationConnectApi.connect();
@@ -95,10 +98,18 @@
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);
+ }
+
+ public CommandResponse sendOriginCommand(String address, short[] data) {
+ return zyStationConnectApi.sendOriginCommand(address, data);
+ }
+
+ public byte[] readOriginCommand(String address, int length) {
+ return zyStationConnectApi.readOriginCommand(address, length);
}
}
--
Gitblit v1.9.1