From 526f1f59497e3b00905df2a2a838a08f0a110bc7 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 18 八月 2020 13:38:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 20 ++++++++++----------
src/main/java/com/zy/core/thread/CrnThread.java | 9 +++++----
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index ad60fa8..549c0ba 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -12,13 +12,13 @@
public class CrnCommand {
// 鍫嗗灈鏈哄彿
- private Integer crnNo;
+ private Integer crnNo = 0;
// 浠诲姟瀹屾垚纭浣�
- private Short ackFinish;
+ private Short ackFinish = 0;
// 浠诲姟鍙�
- private Short taskNo;
+ private Short taskNo = 0;
/**
* 浠诲姟妯″紡锛�
@@ -31,28 +31,28 @@
* 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
* 7 = 鍧愭爣绉昏 鐩爣鍙�
*/
- private Short taskMode;
+ private Short taskMode = 0;
@JSONField(serialize = false)
private CrnTaskModeType taskModeType;
// 婧愪綅缃帓鍙�
- private Short sourcePosX;
+ private Short sourcePosX = 0;
// 婧愪綅缃垪鍙�
- private Short sourcePosY;
+ private Short sourcePosY = 0;
// 婧愪綅缃眰鍙�
- private Short sourcePosZ;
+ private Short sourcePosZ = 0;
// 鐩爣浣嶇疆鎺掑彿
- private Short destinationPosX;
+ private Short destinationPosX = 0;
// 鐩爣浣嶇疆鍒楀彿
- private Short destinationPosY;
+ private Short destinationPosY = 0;
// 鐩爣浣嶇疆灞傚彿
- private Short destinationPosZ;
+ private Short destinationPosZ = 0;
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 3c3c77e..ae3930b 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -178,7 +178,7 @@
if (result.IsSuccess) {
System.out.println(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- readStatus();
+// readStatus();
} else {
System.out.println(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
@@ -202,7 +202,7 @@
/******************************************************************************************/
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
/*****************************************************************************************/
- public static void main(String[] args) {
+ public static void main(String[] args) throws InterruptedException {
CrnSlave slave = new CrnSlave();
slave.setId(1);
slave.setIp("192.168.6.9");
@@ -214,6 +214,7 @@
System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+ Thread.sleep(5000L);
CrnCommand command = new CrnCommand();
command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -223,8 +224,8 @@
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 5); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 3); // 鐩爣搴撲綅灞�
+ command.setDestinationPosY((short) 7); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 2); // 鐩爣搴撲綅灞�
crnThread.write(command);
--
Gitblit v1.9.1