From 9042e885de0413ccfa89d231fc77ddf70c9e58d5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 14:28:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4dde49d..5a12873 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@
 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;
@@ -38,6 +39,11 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
+    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+        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);
+    }};
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -66,9 +72,8 @@
                     default:
                         break;
                 }
-
                 // 蹇冭烦
-                heartbeat();
+//                heartbeat();
                 Thread.sleep(400);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -100,30 +105,41 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 350);
         if (result.IsSuccess) {
-            for (int i = 1; i <= 8; i++) {
-                StaProtocol staProtocol = station.get(i);
+            for (int i = 0; i < staNos.size(); i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
                     staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(i);
-                    station.put(i, staProtocol);
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));   // 鐩爣绔�
+                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, index*2));     // 宸ヤ綔鍙�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, index*2 + 200));   // 鐩爣绔�
             }
         }
         Thread.sleep(100);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 8);
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.500", (short) 106);
         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);
+            for (int i = 0; i < staNos.size(); 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, index, 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 (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
@@ -138,8 +154,8 @@
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
             try {
                 List<BasDevp> basDevps = new ArrayList<>();
-                for (int i = 1; i <= 8; i++) {
-                    StaProtocol staProtocol = station.get(i);
+                for (Integer siteId : staNos) {
+                    StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
                 }
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
@@ -164,16 +180,13 @@
         if (null == staProtocol) {
             return;
         }
-        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+        int divides = (int) Arith.divides(0, staProtocol.getSiteId(), 100);
+        int remainder = (int) Arith.remainder(staProtocol.getSiteId(), 100);
+        int index = ((divides - 1) * 50) + remainder;
+
+        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
         Thread.sleep(300);
-        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) + 40), status);     //  鐘舵��
+        OperateResult write1 = siemensS7Net.Write("DB100." + (index*2 + 200), staProtocol.getStaNo());    // 鐩爣绔�
         if (!write.IsSuccess || !write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {

--
Gitblit v1.9.1