From 5769bdadc879fa93523be0e95ffc8d5ee9ba1e01 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 10:40:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |   56 +++++++++++++++++++-------------------------------------
 1 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index f580f58..c89b569 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(400);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -76,7 +75,7 @@
             result = true;
             log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } else {
-            log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
         return result;
@@ -94,18 +93,20 @@
                 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));   // 鐩爣绔�
         }
-        System.out.println("===> 鐘舵��");
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 10);
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 8);
         if (result1.IsSuccess) {
-//            System.out.println("鐘舵��:"+Arrays.toString(result1.Content));
-            System.out.println(Arrays.toString(siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
+            for (int i = 1; i <= 8; i++) {
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i-1, 1);
+                StaProtocol staProtocol = station.get(i);
+                staProtocol.setAutoing(status[0]);  // 鑷姩
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setOutEnable(status[3]);// 鍙嚭
+                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
+            }
         }
     }
 
@@ -117,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();
@@ -133,45 +133,27 @@
 
     @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) 978);
-        staProtocol.setStaNo((short) 150);
-        staProtocol.setAutoing(true);
+        staProtocol.setWorkNo((short) 222);
+        staProtocol.setStaNo((short) 2);
+        staProtocol.setAutoing(false);
         staProtocol.setEmptyMk(true);
+        staProtocol.setInEnable(true);
         devpThread.write(staProtocol);
         System.out.println("----------------------------------------");
         // 璇�
         devpThread.read();
         System.out.println(JSON.toJSONString(devpThread.station));
 
-
-        System.out.println("[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
-        boolean[] status = new boolean[8];
-        status[0] = true;
-        status[1] = false;
-        status[2] = true;
-        status[3] = false;
-        status[4] = true;
-        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(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
-        }
     }
 
 }

--
Gitblit v1.9.1