From af2f9443ec9241de3aa2c8eed3d31eef382f89d0 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 15:36:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index 4bc480c..bdde4d8 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -2,7 +2,9 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
@@ -19,8 +21,6 @@
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
-
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -35,17 +35,19 @@
private List<ZyStationStatusEntity> statusList;
private List<ZyStationStatusEntity> barcodeStatusList;
- private final SiemensS7Net siemensNet;
- private final DeviceConfig deviceConfig;
+ private SiemensS7Net siemensNet;
+ private DeviceConfig deviceConfig;
+ private RedisUtil redisUtil;
- public ZyStationRealConnect(SiemensS7Net siemensNet, DeviceConfig deviceConfig) {
- this.siemensNet = siemensNet;
+ public ZyStationRealConnect(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
+ this.redisUtil = redisUtil;
}
@Override
public boolean connect() {
boolean connected = false;
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
OperateResult connect = siemensNet.ConnectServer();
if (connect.IsSuccess) {
connected = true;
--
Gitblit v1.9.1