From 93f9f03112dd065e605417dab4c996a1161722d1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 八月 2020 14:47:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index af1d65d..d4561b8 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -14,6 +14,7 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -93,15 +94,18 @@
                 staProtocol.setSiteId(i);
                 station.put(i, staProtocol);
             }
-            System.out.println(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+            System.out.println("------");
+            System.out.println("绔欑偣缂栧彿锛�" + i);
+            System.out.println("宸ヤ綔鍙凤細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+            System.out.println("鐩爣绔欙細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
             staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
             staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
-//            staProtocol.setAutoing(siemensS7Net.getByteTransform().TransBool());
         }
         System.out.println("===> 鐘舵��");
         OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 10);
-        for (int i = 1; i <= 8; i++) {
-            System.out.println(siemensS7Net.getByteTransform().TransByte(result.Content, (i-1)));
+        if (result1.IsSuccess) {
+//            System.out.println("鐘舵��:"+Arrays.toString(result1.Content));
+            System.out.println(Arrays.toString(siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
         }
     }
 
@@ -113,14 +117,15 @@
             return;
         }
         OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        OperateResult write1 = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2 + 20, staProtocol.getSiteId());    // 鐩爣绔�
+        System.out.println(((staProtocol.getSiteId() - 1) * 2) + 20);
+        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 鐩爣绔�
         boolean[] status = new boolean[8];
         status[0] = staProtocol.isAutoing();
         status[1] = staProtocol.isLoading();
         status[2] = staProtocol.isInEnable();
         status[3] = staProtocol.isOutEnable();
         status[4] = staProtocol.isEmptyMk();
-        OperateResult write2 = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2 + 40, status);//  鐘舵��
+        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status);     //  鐘舵��
         if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
             log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         }
@@ -140,7 +145,8 @@
         devpThread.read();
         // 鍐�
         StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 666);
+        staProtocol.setWorkNo((short) 978);
+        staProtocol.setStaNo((short) 150);
         staProtocol.setAutoing(true);
         staProtocol.setEmptyMk(true);
         devpThread.write(staProtocol);
@@ -148,6 +154,27 @@
         // 璇�
         devpThread.read();
         System.out.println(JSON.toJSONString(devpThread.station));
+
+
+        System.out.println("[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+        boolean[] status = new boolean[8];
+        status[0] = false;
+        status[1] = false;
+        status[2] = false;
+        status[3] = false;
+        status[4] = false;
+        OperateResult write2 = devpThread.siemensS7Net.Write("DB100.40", status);     //  鐘舵��
+        if (write2.IsSuccess) {
+            System.out.println("success");
+        }
+        OperateResultExOne<byte[]> result1 = devpThread.siemensS7Net.Read("DB100.40", (short) 10);
+        if (result1.IsSuccess) {
+//            System.out.println("鐘舵��:"+Arrays.toString(result1.Content));
+            System.out.println(Arrays.toString(result1.Content));
+            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
+            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 1, 1)));
+            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 2, 1)));
+        }
     }
 
 }

--
Gitblit v1.9.1