From 00d72b2165634e2d695c0fd9e7e4b5190dfce574 Mon Sep 17 00:00:00 2001 From: vincent <1341870251@qq.com> Date: 星期二, 18 八月 2020 14:54:12 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/CrnThread.java | 106 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 74 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java index 3c3c77e..7ab78f7 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"); @@ -212,22 +212,80 @@ crnThread.connect(); crnThread.readStatus(); System.out.println(JSON.toJSONString(crnThread.crnProtocol)); + Thread.sleep(3000L); + + // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂 +// CrnCommand command = new CrnCommand(); +// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙� +// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡 +// command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓 +// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 +// command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 +// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� +// crnThread.write(command); + + // 2.鍑哄簱 婧愬拰鐩爣閮藉彂 +// CrnCommand command = new CrnCommand(); +// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙� +// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡 +// command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓 +// command.setSourcePosY((short) 4); // 婧愬簱浣嶅垪 +// command.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰 +// command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� +// crnThread.write(command); - CrnCommand command = new CrnCommand(); - command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙� - command.setTaskNo((short) 0); // 宸ヤ綔鍙� - command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡 - command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓 - command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 - command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 - command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺� - command.setDestinationPosY((short) 5); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ((short) 3); // 鐩爣搴撲綅灞� - crnThread.write(command); +// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass +// CrnCommand command = new CrnCommand(); +// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙� +// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 +// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓 +// command.setSourcePosY((short)4); // 婧愬簱浣嶅垪 +// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰 +// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short)3); // 鐩爣搴撲綅灞� +// crnThread.write(command); + // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂 +// CrnCommand command = new CrnCommand(); +// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙� +// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 +// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓 +// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪 +// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰 +// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞� +// crnThread.write(command); +// // 5.鍥炲師鐐� 涓嶇敤鍙� pass +// CrnCommand command = new CrnCommand(); +// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙� +// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡 +// 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); + +// // 7.鍧愭爣绉昏 鐩爣鍙� pass // CrnCommand command = new CrnCommand(); // command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙� // command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -236,26 +294,10 @@ // command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓 // command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 // command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 -// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� -// command.setDestinationPosY((short) 5); // 鐩爣搴撲綅鍒� +// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒� // command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� // crnThread.write(command); - - -// // 鍐� -// 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