From 4d03b2c0deae95ecf3e95547f4d208c2d715bb79 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 12 三月 2022 13:05:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 6cca57c..280813a 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -12,8 +12,8 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.SteCommand;
@@ -27,6 +27,7 @@
/**
* shuttle 绌挎杞︾嚎绋�
* Created by vincent on 2020/8/4
+ * 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
*/
@Data
@Slf4j
@@ -122,9 +123,10 @@
@Override
public boolean connect() {
boolean result = false;
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensS7Net.setRack(slave.getRack().byteValue());
- siemensS7Net.setSlot(slave.getSlot().byteValue());
+ // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
+ siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp());
+// siemensS7Net.setRack(slave.getRack().byteValue());
+// siemensS7Net.setSlot(slave.getSlot().byteValue());
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
@@ -149,7 +151,7 @@
// flag1=1;
// System.out.println("===");
// }
- OperateResultExOne<byte[]> result = siemensS7Net.Read("D20", (short) 70);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V20", (short) 70);
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
@@ -168,7 +170,7 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
- if (steProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+ if (steProtocol.getStatusType().equals(SteStatusType.WAITING)) {
if (resetFlag) {
SteCommand steCommand = new SteCommand();
// steCommand.setAckFinish((short)1);
--
Gitblit v1.9.1