From 1ca161e669cd20df4e333413de02df59ab0473ed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 五月 2021 11:00:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   72 +++++++++++++++++++++++++++--------
 1 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 529e806..37cd20f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,7 +5,6 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
-import com.core.common.Arith;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasDevp;
@@ -43,6 +42,7 @@
         add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);add(111);add(112);add(113);add(114);
         add(115);add(116);add(117);add(118);add(119);add(120);add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);
         add(200);add(201);add(202);add(203);add(204);add(205);
+        add(300);add(301);add(302);add(303);add(304);add(305);add(306);
     }};
 
     public SiemensDevpThread(DevpSlave slave) {
@@ -107,7 +107,7 @@
     private void read() throws InterruptedException {
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 140);
         if (result.IsSuccess) {
-            for (int i = 0; i < staNos.size(); i++) {
+            for (int i = 0; i < 35; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -115,21 +115,30 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-//                int divides = (int) Arith.divides(0, siteId, 100);
-//                int remainder = (int) Arith.remainder(siteId, 100);
-//                int index = ((divides - 1) * 50) + remainder;
                 staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 + 70));   // 鐩爣绔�
             }
         }
-        Thread.sleep(100);
+        Thread.sleep(50);
+        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB100.180", (short) 28);
+        if (result0.IsSuccess) {
+            for (int i = 0; i < 7; i++) {
+                Integer siteId = staNos.get(i + 35); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));     // 宸ヤ綔鍙�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2 + 14));   // 鐩爣绔�
+            }
+        }
+        Thread.sleep(50);
         OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.140", (short) 35);
         if (result1.IsSuccess) {
-            for (int i = 0; i < staNos.size(); i++) {
+            for (int i = 0; i < 35; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                int divides = (int) Arith.divides(0, siteId, 100);
-//                int remainder = (int) Arith.remainder(siteId, 100);
-//                int index = ((divides - 1) * 100) + remainder;
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
@@ -146,8 +155,29 @@
                 }
             }
         }
+        Thread.sleep(50);
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.208", (short) 7);
+        if (result2.IsSuccess) {
+            for (int i = 0; i < 7; i++) {
+                Integer siteId = staNos.get(i + 35); // 绔欑偣缂栧彿
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result2.Content, i, 1);
+                StaProtocol staProtocol = station.get(siteId);
+                staProtocol.setAutoing(status[0]);  // 鑷姩
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setOutEnable(status[3]);// 鍙嚭
+                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
+                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
+                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
+                staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
-        if (result.IsSuccess && result1.IsSuccess) {
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+        }
+
+        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -180,14 +210,21 @@
         if (null == staProtocol) {
             return;
         }
-//        int divides = (int) Arith.divides(0, staProtocol.getSiteId(), 100);
-//        int remainder = (int) Arith.remainder(staProtocol.getSiteId(), 100);
-//        int index = ((divides - 1) * 50) + remainder;
         int index = staNos.indexOf(staProtocol.getSiteId());
+        OperateResult write;
+        OperateResult write1;
+        // 涓�鏈�
+        if (staProtocol.getSiteId() < 300) {
+            write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (index*2 + 70), staProtocol.getStaNo());    // 鐩爣绔�
+        // 浜屾湡
+        } else {
+            write = siemensS7Net.Write("DB100." + index*2 + 180, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (index*2 + 14) + 180, staProtocol.getStaNo());    // 鐩爣绔�
+        }
 
-        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        Thread.sleep(200);
-        OperateResult write1 = siemensS7Net.Write("DB100." + (index*2 + 70), staProtocol.getStaNo());    // 鐩爣绔�
         if (!write.IsSuccess || !write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
@@ -233,6 +270,7 @@
     }
 
     public static void main(String[] args) {
+        System.out.println(staNos.size());
         for (int i = 0; i<staNos.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);

--
Gitblit v1.9.1