From 82c36e2b434fa7a1c16b0448aa4cf1483107f79c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 16:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 4629f30..059ebf8 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -2,6 +2,7 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
@@ -25,13 +26,13 @@
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
- public ZyCrnRealConnect(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
- this.siemensNet = siemensS7Net;
+ public ZyCrnRealConnect(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
public boolean connect() {
boolean connected = false;
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
OperateResult connect = siemensNet.ConnectServer();
if(connect.IsSuccess){
connected = true;
@@ -167,7 +168,7 @@
}
}
idx++;
- Thread.sleep(500L);
+ Thread.sleep(500);
} while (idx < 5);
if (command.getAckFinish() == 0) {
@@ -184,7 +185,7 @@
}
}
i++;
- Thread.sleep(500L);
+ Thread.sleep(500);
} while (i < 5);
}
@@ -220,7 +221,7 @@
null, // 淇敼浜哄憳
null, // 澶囨敞
JSON.toJSONString(command), // 鎸囦护
- JSON.toJSONString(command), // 绯荤粺鐘舵��
+ JSON.toJSONString(getStatus()), // 绯荤粺鐘舵��
1, // 涓嬪彂鐘舵�亄0:鏈笅鍙�,1:宸蹭笅鍙憓
JSON.toJSONString(response) // 鍝嶅簲
);
--
Gitblit v1.9.1