From 945eceb084846942610fec5a5f879d0172f41b6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 16:53:33 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |   87 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 6545d5b..8946211 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;
@@ -28,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;
@@ -44,20 +46,34 @@
                 switch (step) {
                     // 璇绘暟鎹�
                     case 1:
-                        readStatus();   // 璇诲彇鐘舵��
+                        readStatus();
                         break;
+                    // 鍐欏叆鏁版嵁
                     case 2:
-                        CrnCommand command = (CrnCommand) task.getData();
-                        break;
-                    case 3:
+                        write((CrnCommand) task.getData());
                         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();
             }
@@ -86,7 +102,7 @@
      * 璇诲彇鐘舵��
      */
     private void readStatus(){
-        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 10);
+        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 46);
         if (result.IsSuccess) {
             if (null == crnProtocol) {
                 crnProtocol = new CrnProtocol();
@@ -99,7 +115,7 @@
             crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
             crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
             crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+//            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
             crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
             crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
             crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 22));
@@ -120,12 +136,32 @@
      * 鍐欏叆鏁版嵁
      */
     private void write(CrnCommand command){
-
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return;
+        }
+        command.setCrnNo(slave.getId());
+        short[] array = new short[9];
+        array[0] = command.getAckFinish();
+        array[1] = command.getTaskNo();
+        array[2] = command.getTaskMode();
+        array[3] = command.getSourcePosX();
+        array[4] = command.getSourcePosY();
+        array[5] = command.getSourcePosZ();
+        array[6] = command.getDestinationPosX();
+        array[7] = command.getDestinationPosY();
+        array[8] = command.getDestinationPosZ();
+        OperateResult result = siemensNet.Write("DB8.0", array);
+        if (result.IsSuccess) {
+            readStatus();
+        } else {
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+        }
     }
 
     @Override
     public void close() {
-
+        siemensNet.ConnectClose();
     }
 
     public CrnProtocol getCrnProtocol(){
@@ -134,4 +170,33 @@
         }
         return this.crnProtocol;
     }
+
+
+    /******************************************************************************************/
+    /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+    /*****************************************************************************************/
+    public static void main(String[] args) {
+        CrnSlave slave = new CrnSlave();
+        slave.setIp("192.168.2.9");
+        slave.setRack(0);
+        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