From d09206a5ed559999f3d191df5732fe0ac0c1383c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 09:43:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 0ac542a..382a801 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -14,7 +14,6 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -57,7 +56,7 @@
                     default:
                         break;
                 }
-                Thread.sleep(3000);
+                Thread.sleep(500);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -94,17 +93,12 @@
                 staProtocol.setSiteId(i);
                 station.put(i, staProtocol);
             }
-            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.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));     // 宸ヤ綔鍙�
+            staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));   // 鐩爣绔�
         }
         OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 8);
         if (result1.IsSuccess) {
             for (int i = 1; i <= 8; i++) {
-                System.out.println(Arrays.toString(siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i-1, 1);
                 StaProtocol staProtocol = station.get(i);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
@@ -112,7 +106,6 @@
                 staProtocol.setInEnable(status[2]); // 鍙叆
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-
             }
         }
     }
@@ -125,7 +118,6 @@
             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();
@@ -141,22 +133,21 @@
 
     @Override
     public void close() {
-
+        siemensS7Net.ConnectClose();
     }
 
     public static void main(String[] args) {
         Slave slave = new Slave();
         slave.setIp("192.168.2.125");
         DevpThread devpThread = new DevpThread(slave);
-        boolean connect = devpThread.connect();
-        System.out.println(connect);
         devpThread.read();
         // 鍐�
         StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 9999);
-        staProtocol.setStaNo((short) 100);
-        staProtocol.setAutoing(false);
-        staProtocol.setEmptyMk(false);
+        staProtocol.setWorkNo((short) 888);
+        staProtocol.setStaNo((short) 1001);
+        staProtocol.setAutoing(true);
+        staProtocol.setEmptyMk(true);
+        staProtocol.setInEnable(true);
         devpThread.write(staProtocol);
         System.out.println("----------------------------------------");
         // 璇�

--
Gitblit v1.9.1