From 334caa4ba8b118453a0227374d2feca7d850d44d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 14:03:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4ac451e..d36adba 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -4,6 +4,7 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.alibaba.fastjson.JSON;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.CrnTaskModeType;
@@ -29,12 +30,12 @@
public CrnThread(CrnSlave slave) {
this.slave = slave;
- this.connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ this.connect();
while (true) {
try {
int step = 1;
@@ -54,6 +55,9 @@
// 澶嶄綅
case 3:
CrnCommand command = (CrnCommand) task.getData();
+ if (null == command) {
+ command = new CrnCommand();
+ }
command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
@@ -69,7 +73,7 @@
default:
break;
}
- Thread.sleep(3000);
+ Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
}
@@ -157,7 +161,7 @@
@Override
public void close() {
-
+ siemensNet.ConnectClose();
}
public CrnProtocol getCrnProtocol(){
@@ -166,4 +170,33 @@
}
return this.crnProtocol;
}
+
+
+ /******************************************************************************************/
+ /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+ /*****************************************************************************************/
+ public static void main(String[] args) {
+ CrnSlave slave = new CrnSlave();
+ slave.setIp("192.168.2.9");
+ slave.setRack(1);
+ slave.setSlot(0);
+ CrnThread crnThread = new CrnThread(slave);
+ crnThread.readStatus();
+ System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+// // 鍐�
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+ }
+
}
--
Gitblit v1.9.1