From 3c79aac6d67bc302b87498e7a7d3c7ca8b98ed79 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 14:20:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/DevpThread.java |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 3fa7e7d..387fef4 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -31,12 +31,12 @@
 
     public DevpThread(Slave slave) {
         this.slave = slave;
-        connect();
     }
 
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
+        connect();
         while (true) {
             try {
                 int step = 1;
@@ -56,7 +56,7 @@
                     default:
                         break;
                 }
-                Thread.sleep(3000);
+                Thread.sleep(400);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -75,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;
@@ -93,17 +93,21 @@
                 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));
+            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)));
-//        }
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 8);
+        if (result1.IsSuccess) {
+            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]);  // 绌烘澘淇″彿
+            }
+        }
     }
 
     /**
@@ -114,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();
@@ -122,7 +125,7 @@
         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));
         }
@@ -130,22 +133,22 @@
 
     @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.connect();
         devpThread.read();
         // 鍐�
-        StaProtocol staProtocol = devpThread.getStation().get(2);
-        staProtocol.setWorkNo((short) 978);
-        staProtocol.setStaNo((short) 15);
+        StaProtocol staProtocol = devpThread.getStation().get(1);
+        staProtocol.setWorkNo((short) 232);
+        staProtocol.setStaNo((short) 6);
         staProtocol.setAutoing(true);
         staProtocol.setEmptyMk(true);
+        staProtocol.setInEnable(true);
         devpThread.write(staProtocol);
         System.out.println("----------------------------------------");
         // 璇�

--
Gitblit v1.9.1