From 867505775ff2d205f335be55570a14ee9d15368d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 24 五月 2024 10:39:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  133 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 119 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 78b31bf..6322db8 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -47,6 +47,7 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
+    private Integer rgvCount = 4;
     public static final ArrayList<Integer> staNos1 = 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);
@@ -69,6 +70,12 @@
     public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
         add(400);add(401);add(402);add(403);
         add(404);add(405);add(406);add(407);
+    }};
+    public static final ArrayList<Integer> hoist1 = new ArrayList<Integer>() {{
+        add(302);add(303);
+    }};
+    public static final ArrayList<Integer> hoist2 = new ArrayList<Integer>() {{
+        add(402);add(403);
     }};
 
     /**
@@ -96,6 +103,17 @@
                 return staNos3;
             case 4:
                 return staNos4;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
+
+    private ArrayList<Integer> getHoist() {
+        switch (slave.getId()) {
+            case 3:
+                return hoist1;
+            case 4:
+                return hoist2;
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -168,6 +186,20 @@
                 staProtocol.setPakMk(true);
             }
         }
+        if (slave.getId() == 2){
+            for (int i = 1;i<5;i++){
+                StaProtocol staProtocol = station.get(i);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(i);
+                    station.put(i, staProtocol);
+                }
+                staProtocol.setWorkNo((short) 0);
+                staProtocol.setNearbySta((short) 1);
+                staProtocol.setLoading(false);
+                staProtocol.setAutoing(false);
+            }
+        }
     }
 
     @Override
@@ -235,6 +267,59 @@
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
                 }
+            }
+        }
+
+        if (slave.getId() == 2){
+
+            OperateResultExOne<byte[]> resultRgvWrkNo = siemensS7Net.Read("DB55.222", (short) 98);
+            OperateResultExOne<byte[]> resultRgvLocation = siemensS7Net.Read("DB43.0", (short) 8);
+            OperateResultExOne<byte[]> resultRgvload = siemensS7Net.Read("DB192.0", (short) 8);
+            if (resultRgvWrkNo.IsSuccess && resultRgvLocation.IsSuccess && resultRgvload.IsSuccess){
+                for (int i = 0;i<4;i++){
+                    short wrkNo = siemensS7Net.getByteTransform().TransInt16(resultRgvWrkNo.Content, i * 32);
+                    short location = siemensS7Net.getByteTransform().TransInt16(resultRgvLocation.Content, i * 2);
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgvload.Content, i*2, 1);
+                    StaProtocol staProtocol = station.get((i+1));
+                    if (null == staProtocol) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId((i+1));
+                        station.put((i+1), staProtocol);
+                    }
+                    staProtocol.setWorkNo(wrkNo);
+                    staProtocol.setAutoing(true);
+                    staProtocol.setNearbySta(location);
+                    staProtocol.setLoading(status[0]);
+                }
+            }
+        }
+        if (slave.getId() == 3 || slave.getId() == 4){
+            ArrayList<Integer> hoist = getHoist();
+            int hoistSize = hoist.size();
+            OperateResultExOne<byte[]> resultHoist = siemensS7Net.Read("DB15.0", (short) 33);
+            if (resultHoist.IsSuccess) {
+                    Integer siteId = hoist.get(0); // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId(siteId);
+                        station.put(siteId, staProtocol);
+                    }
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultHoist.Content, 32, 1);
+                    staProtocol.setPlace1(status[0]);
+                    staProtocol.setPlace2(status[1]);
+
+                Integer siteId2 = hoist.get(1); // 绔欑偣缂栧彿
+                staProtocol = station.get(siteId2);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(resultHoist.Content, 32, 1);
+                staProtocol.setPlace1(status2[2]);
+                staProtocol.setPlace2(status2[3]);
+
             }
         }
 
@@ -388,28 +473,48 @@
             }
         }
 
+        if(slave.getId() != 2){
+            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+            if (resultErr.IsSuccess) {
+                for (int i = 0; i < staNoSize; i++) {
+                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
+                    StaProtocol staProtocol = station.get(siteId);
+                    staProtocol.setBreakerErr(status[0]);
+                    staProtocol.setInfraredErr(status[1]);
+                    staProtocol.setOutTimeErr(status[2]);
+                    staProtocol.setSeizeSeatErr(status[3]);
+                    staProtocol.setWrkYgoodsN(status[4]);
+                    staProtocol.setInverterErr(status[5]);
+                    staProtocol.setContactErr(status[6]);
+                    staProtocol.setUpcontactErr(status[7]);
 
-        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
-        if (resultErr.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
-                StaProtocol staProtocol = station.get(siteId);
-                staProtocol.setBreakerErr(status[0]);
-                staProtocol.setInfraredErr(status[1]);
-                staProtocol.setOutTimeErr(status[2]);
-                staProtocol.setSeizeSeatErr(status[3]);
-                staProtocol.setWrkYgoodsN(status[4]);
-                staProtocol.setInverterErr(status[5]);
-                staProtocol.setContactErr(status[6]);
-                staProtocol.setUpcontactErr(status[7]);
+                }
+            }
+        }else {
+            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB1003.2", (short) (staNoSize*4));
+            if (resultErr.IsSuccess) {
+                for (int i = 0; i < staNoSize; i++) {
+                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
+                    StaProtocol staProtocol = station.get(siteId);
+                    staProtocol.setBreakerErr(status[0]);
+                    staProtocol.setInfraredErr(status[1]);
+                    staProtocol.setOutTimeErr(status[2]);
+                    staProtocol.setSeizeSeatErr(status[3]);
+                    staProtocol.setWrkYgoodsN(status[4]);
+                    staProtocol.setInverterErr(status[5]);
+                    staProtocol.setContactErr(status[6]);
+                    staProtocol.setUpcontactErr(status[7]);
 
+                }
             }
         }
 
 
 
 
+
 //        //RGV鍙拌溅浣嶇疆
 //        Thread.sleep(200);
 //        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4);

--
Gitblit v1.9.1