From 2b463baf45d9602aae1569dd9a93a17a00ec308b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 八月 2020 09:31:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |  110 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 1695914..3fa7e7d 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -47,13 +47,11 @@
                 switch (step) {
                     // 璇绘暟鎹�
                     case 1:
-                        read();   // 璇诲彇鐘舵��
+                        read();
                         break;
+                    // 鍐欐暟鎹�
                     case 2:
-                        break;
-                    case 3:
-                        break;
-                    case 4:
+                        write((StaProtocol)task.getData());
                         break;
                     default:
                         break;
@@ -83,6 +81,58 @@
         return result;
     }
 
+    /**
+     * 璇诲彇鐘舵��
+     */
+    private void read(){
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
+        for (int i = 1; i <= 8; i++) {
+            StaProtocol staProtocol = station.get(i);
+            if (null == staProtocol) {
+                staProtocol = new StaProtocol();
+                staProtocol.setSiteId(i);
+                station.put(i, staProtocol);
+            }
+            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));
+        }
+        System.out.println("===> 鐘舵��");
+        OperateResultExOne<boolean[]> result1 = siemensS7Net.ReadBool("DB100.40", (short) 10);
+//        for (int i = 1; i <= 8; i++) {
+//            System.out.println(result1.Content.length);
+//            System.out.println(siemensS7Net.getByteTransform().TransByte(result.Content, (i-1)));
+//        }
+    }
+
+    /**
+     * 鍐欏叆
+     */
+    private void write(StaProtocol staProtocol){
+        if (null == staProtocol) {
+            return;
+        }
+        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+        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);     //  鐘舵��
+        if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
+            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+        }
+    }
+
+    @Override
+    public void close() {
+
+    }
+
     public static void main(String[] args) {
         Slave slave = new Slave();
         slave.setIp("192.168.2.125");
@@ -91,55 +141,17 @@
         System.out.println(connect);
         devpThread.read();
         // 鍐�
-        StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 666);
+        StaProtocol staProtocol = devpThread.getStation().get(2);
+        staProtocol.setWorkNo((short) 978);
+        staProtocol.setStaNo((short) 15);
+        staProtocol.setAutoing(true);
+        staProtocol.setEmptyMk(true);
         devpThread.write(staProtocol);
+        System.out.println("----------------------------------------");
         // 璇�
         devpThread.read();
         System.out.println(JSON.toJSONString(devpThread.station));
-    }
-
-    /**
-     * 璇诲彇鐘舵��
-     */
-    private void read(){
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
-        for (int i = 1; i <= 7; i++) {
-            StaProtocol staProtocol = station.get(i);
-            if (null == staProtocol) {
-                staProtocol = new StaProtocol();
-                staProtocol.setSiteId(i);
-                station.put(i, staProtocol);
-            }
-            System.out.println(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
-            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());
-        }
-        // todo
-//        OperateResultExOne<Short> shortOperateResultExOne = siemensS7Net.ReadInt16("DB100.0");
-//        System.out.println(shortOperateResultExOne.Content);
-    }
-
-
-
-
-    private void write(StaProtocol staProtocol){
-        if (null == staProtocol) {
-            return;
-        }
-        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());
-        if (write.IsSuccess) {
-            System.out.println("鍐欏叆鎴愬姛");
-        } else {
-            System.out.println("鍐欏叆澶辫触");
-        }
-
 
     }
 
-    @Override
-    public void close() {
-
-    }
 }

--
Gitblit v1.9.1