From cab1fb65541de6dd4a50e2cf925f1ff21e2e03ce Mon Sep 17 00:00:00 2001 From: vincent <1341870251@qq.com> Date: 星期二, 18 八月 2020 13:00:14 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/CrnThread.java | 65 +++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java index d6b9786..3c3c77e 100644 --- a/src/main/java/com/zy/core/thread/CrnThread.java +++ b/src/main/java/com/zy/core/thread/CrnThread.java @@ -9,6 +9,7 @@ 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.CrnTaskModeType; import com.zy.core.enums.SlaveType; import com.zy.core.model.CrnSlave; @@ -67,7 +68,7 @@ command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣� - command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 + command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡 command.setSourcePosX((short)0); // 婧愬簱浣嶆帓 command.setSourcePosY((short)0); // 婧愬簱浣嶅垪 command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰 @@ -90,7 +91,7 @@ @Override public boolean connect() { boolean result = false; - siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp()); + siemensNet = new SiemensS7Net(SiemensPLCS.S300, slave.getIp()); siemensNet.setRack(slave.getRack().byteValue()); siemensNet.setSlot(slave.getSlot().byteValue()); OperateResult connect = siemensNet.ConnectServer(); @@ -110,7 +111,7 @@ * 璇诲彇鐘舵�� */ private void readStatus(){ - OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 46); + OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56); if (result.IsSuccess) { OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); if (null == crnProtocol) { @@ -131,13 +132,23 @@ crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2)); crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2)); crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26)); - crnProtocol.setXSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28)); - crnProtocol.setYSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30)); - crnProtocol.setZSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32)); - crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 34)); - crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 38)); - crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 42)); - crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 46)); + crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28)); + crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32)); + crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36)); + crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40)); + crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44)); + crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48)); + crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52)); + + /** + * 褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃� + * 涓嬪彂浠诲姟瀹屾垚鎸囦护 + */ + if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) { + CrnCommand crnCommand = new CrnCommand(); + crnCommand.setAckFinish((short)1); + write(crnCommand); + } } else { 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())); log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); @@ -165,9 +176,11 @@ array[8] = command.getDestinationPosZ(); OperateResult result = siemensNet.Write("DB8.0", array); 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(); } 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())); log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); } @@ -191,12 +204,44 @@ /*****************************************************************************************/ public static void main(String[] args) { CrnSlave slave = new CrnSlave(); + slave.setId(1); slave.setIp("192.168.6.9"); slave.setRack(0); slave.setSlot(0); CrnThread crnThread = new CrnThread(slave); + crnThread.connect(); crnThread.readStatus(); System.out.println(JSON.toJSONString(crnThread.crnProtocol)); + + + 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); + + +// 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) 0); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short) 5); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� +// crnThread.write(command); + + // // 鍐� // CrnCommand command = new CrnCommand(); // command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙� -- Gitblit v1.9.1