From d7ffd5ba5ecb61a930b30c664b1e5efc27760b07 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 16:54:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4839c5b..7b4ef4c 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -4,8 +4,10 @@
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;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
@@ -50,15 +52,28 @@
case 2:
write((CrnCommand) task.getData());
break;
- case 3:
- break;
// 澶嶄綅
- case 4:
+ 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); // 浠诲姟瀹屾垚纭浣�
+ 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); // 鐩爣搴撲綅灞�
+ write(command);
break;
default:
break;
}
- Thread.sleep(3000);
+ Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
}
@@ -146,7 +161,7 @@
@Override
public void close() {
-
+ siemensNet.ConnectClose();
}
public CrnProtocol getCrnProtocol(){
@@ -155,4 +170,30 @@
}
return this.crnProtocol;
}
+
+
+ /******************************************************************************************/
+ /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+ /*****************************************************************************************/
+ public static void main(String[] args) {
+ CrnSlave slave = new CrnSlave();
+ 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