From 8478a159d79bf9ca5da04ab18562f2d7cdddb05c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 25 九月 2025 17:06:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  512 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 426 insertions(+), 86 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 25d9512..35476e4 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,8 +8,12 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgvMap;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvMapService;
+import com.zy.common.utils.News;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -18,15 +22,13 @@
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaError1;
 import com.zy.core.model.protocol.StaProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -41,20 +43,129 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);
-        add(201);add(202);add(203);add(204);
-        add(301);add(302);add(303);add(304);add(305);add(306);
+    private StaError1 staError1;
+//    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+//
+//    }};
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+        add(1001);add(1002);add(1004);
+        add(1005);add(1007);
+        add(1008);add(1010);
+        add(1011);add(1012);add(1014);
+        add(1015);add(1016);add(1018);
+        add(1019);add(1021);
+        add(1022);add(1024);
+        add(1025);add(1026);add(1028);
+        add(1029);add(1031);
+        add(1032);add(1033);add(1035);
+        add(1036);add(1037);add(1038);
+        add(1039);add(1041);
+//        add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);
+//        add(1058);add(1059);add(1060);add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);
+//        add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);add(1080);add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);
+//        add(1088);add(1089);add(1090);add(1091);add(1092);add(1093);add(1094);add(1095);add(1096);add(1097);add(1098);add(1099);add(1100);add(1101);add(1102);
+//        add(1103);add(1104);add(1105);add(1106);add(1107);add(1108);add(1109);
     }};
+
+    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+        add(2001);add(2003);
+        add(2004);add(2006);
+        add(2007);add(2009);
+        add(2010);add(2012);
+        add(2013);add(2015);
+        add(2016);add(2018);
+        add(2019);add(2021);
+        add(2022);add(2024);
+        add(2025);add(2027);
+        add(2031);add(2033);
+        add(2034);add(2035);add(2037);
+        add(2041);add(2042);add(2043);add(2044);
+        add(2045);add(2046);add(2047);add(2048);
+        add(2101);add(2102);add(2103);add(2104);add(2105);add(2106);add(2107);add(2108);add(2109);add(2110);
+        add(2111);add(2112);add(2113);add(2114);add(2115);add(2116);add(2117);add(2118);add(2119);add(2120);
+        add(4001);add(4003);add(4004);add(4006);
+    }};
+
+    // 绔欑偣鍋忕Щ閲忔槧灏勮〃
+    public static final Map<Integer, Integer> siteOffsetMap = new HashMap<Integer, Integer>() {{
+        put(1001, 0);put(1002, 116);put(1003, 208);put(1004, 300);put(1005, 392);put(1006, 508);put(1007, 600);
+        put(1008, 692);put(1009, 808);put(1010, 900);put(1011, 992);put(1012, 1108);put(1013, 1200);put(1014, 1292);
+        put(1015, 1384);put(1016, 1500);put(1017, 1592);put(1018, 1684);put(1019, 1776);put(1020, 1892);put(1021, 1984);
+        put(1022, 2076);put(1023, 2192);put(1024, 2284);put(1025, 2376);put(1026, 2492);put(1027, 2584);put(1028, 2676);
+        put(1029, 0);put(1030, 116);put(1031, 208);put(1032, 300);put(1033, 416);put(1034, 508);put(1035, 600);
+        put(1036, 692);put(1037, 784);put(1038, 876);put(1039, 968);put(1040, 1084);put(1041, 1176);
+        // 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
+    }};
+
+    // 鐗规畩绔欑偣闆嗗悎
+    private static final Set<Integer> specialSites = new HashSet<>(
+            Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039));
+
+
+    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
+        add(0); add(1); add(2);
+    }};
+    public static final ArrayList<Integer> BarcodeListMat = new ArrayList<Integer>() {{
+        add(3); add(4);
+    }};
+    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
+        add(1036);
+    }};
+
+    private Integer count=0;
+
+    // 鍋忕Щ閲忚绠楁柟娉�
+    public static int getOffsetBySiteId(int siteId) {
+        int offset = 0;
+        if (specialSites.contains(siteId)) {
+            offset = 96; // 鐗规畩绔欑偣鍗� 96
+        } else {
+            offset = 72; // 鏅�氱珯鐐瑰崰 72
+        }
+        return offset;
+    }
+    // 鍋忕Щ閲忚绠楁柟娉�
+    public static int getOffsetBySiteId2(int siteId) {
+        int offset = 0;
+        if (specialSites.contains(siteId)) {
+            offset = 72; // 鐗规畩绔欑偣鍗� 96
+        } else {
+            offset = 60; // 鏅�氱珯鐐瑰崰 72
+        }
+        return offset;
+    }
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 3;
-    public IoModeType ioMode = IoModeType.NONE;
+    private int barcodeSize = 6;
+
+    /**
+     * 鍏ュ嚭搴撴ā寮�
+     * 0锛氭湭鐭�
+     * 1锛氬叆搴撳惎鍔ㄤ腑
+     * 2.鍏ュ簱妯″紡
+     * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+     * 4.鍑哄簱妯″紡
+     */
+    public IoModeType ioModeOf2F = IoModeType.NONE;
+//    public IoModeType ioMode = IoModeType.NONE;
+    public IoModeType ioModeOf4F = IoModeType.NONE;
+//    public IoModeType ioMode = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
+    }
+
+    private ArrayList<Integer> getStaNo() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos1;
+            case 2:
+                return staNos2;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
     }
 
     @Override
@@ -76,17 +187,48 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol)task.getData());
+                        log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
                         break;
                     default:
                         break;
                 }
                 // 蹇冭烦
 //                heartbeat();
-                Thread.sleep(400);
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
+        }
+    }
+    /**
+     * 鍒濆鍖栫珯鐐圭姸鎬�
+     */
+    private void initSite() {
+        count ++;
+        ArrayList<Integer> staNos = getStaNo();
+        if(count > 77) {
+            // 绔欑偣缂栧彿
+            for (Integer siteId : staNos) {
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setWorkNo(0);    // ID
+                staProtocol.setAutoing(false);      // 鑷姩
+                staProtocol.setLoading(false);      // 鏈夌墿
+                staProtocol.setInEnable(false);     // 鍙叆
+                staProtocol.setOutEnable(false);    // 鍙嚭
+                staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
+                staProtocol.setStaNo((short) 0);     // 鐩爣绔�
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+            count = 0;
         }
     }
 
@@ -100,12 +242,13 @@
         if(connect.IsSuccess){
             result = true;
             OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.info("SiemensDevp"+" - 1"+" - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } else {
             OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
+        initSite();
         return result;
     }
 
@@ -115,9 +258,14 @@
     private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
+        ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
-        if (result.IsSuccess) {
+        OperateResultExOne<byte[]> result = null;
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.0", (short) (2764));//1001-1028
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0", (short) (1264));//1029-1037
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB104.0", (short) (1264));//1042-1053
+
+        if (result1.IsSuccess && result2.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
@@ -126,66 +274,209 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                if(siteId < 1029){
+                    result = result1;
+                }else if(siteId < 1042){
+                    result = result2;
+                }else if(siteId < 1054){
+                    result = result3;
+                }
+                // 鑾峰彇璇ョ珯鐐瑰搴旂殑鍋忕Щ閲�
+                Integer offset = siteOffsetMap.get(siteId);
+                if (offset == null) {
+                    continue; // 濡傛灉娌″畾涔夊亸绉婚噺锛岃烦杩�
+                }
+                Integer offset2 = getOffsetBySiteId(siteId);
+                Integer offset3 = getOffsetBySiteId2(siteId);
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
-            }
-        }
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-//        if (result0.IsSuccess) {
-//            for (int i = 0; i < 93; i++) {
-//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                StaProtocol staProtocol = station.get(siteId);
-//                if (null == staProtocol) {
-//                    staProtocol = new StaProtocol();
-//                    staProtocol.setSiteId(siteId);
-//                    station.put(siteId, staProtocol);
-//                }
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
-//            }
-//        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize));
-        if (result1.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.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]);      // 浣庡簱浣�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset + offset2 + 12));   // 鐩爣绔�
+
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 2);
+                staProtocol.setAutoing(!status[0]);  // 鑷姩
+                boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
+
+                staProtocol.setLoading(!status1[0]);  // 鏈夌墿
+
+                staProtocol.setInEnable(true); // 鍙叆
+                staProtocol.setOutEnable(true);// 鍙嚭
+//                staProtocol.setInEnable(status1[1]); // 鍙叆
+//                staProtocol.setOutEnable(status1[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);
                 }
             }
         }
-
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)(barcodeSize*8));
-        if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                    barcodeThread.setBarcode(barcode);
-                }
-            }
-
-        }
-
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
+        BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
+//        RGV灏忚溅1
+//        Thread.sleep(100);
+//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.",(short)27);
+//        if (result3.IsSuccess) {
+//            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
+//            if (!Cools.isEmpty(basRgvMap)){
+//                Integer siteId1 = 1;
+//                Integer siteId2 = 2;
+//                StaProtocol staProtocol1 = station.get(siteId1);
+//                StaProtocol staProtocol2 = station.get(siteId1);
+//
+//                if (null == staProtocol1) {
+//                    staProtocol1 = new StaProtocol();
+//                    staProtocol1.setSiteId(siteId1);
+//                    station.put(siteId1, staProtocol1);
+//                }
+//                if (null == staProtocol2) {
+//                    staProtocol2 = new StaProtocol();
+//                    staProtocol2.setSiteId(siteId2);
+//                    station.put(siteId2, staProtocol2);
+//
+//                }
+//                String pos = String.valueOf(getRgvPosI(siemensS7Net.getByteTransform().TransInt32(result.Content, 4)));
+//                staProtocol1.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) == 2);
+//                staProtocol2.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) == 2);
+//                staProtocol1.setNearbySta(pos);
+//                staProtocol1.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, 8));
+//                staProtocol2.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, 8));
+//                staProtocol1.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 16));
+//                staProtocol2.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 20));
+//                boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, 24, 2);
+//                staProtocol1.setLoading(status1[0]);
+//                staProtocol2.setLoading(status1[1]);
+//                //                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
+//            }
+//        }
+        //RGV灏忚溅2
+//        Thread.sleep(100);
+//        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
+//        if (result4.IsSuccess) {
+//            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
+//            if (!Cools.isEmpty(basRgvMap)){
+//                Integer siteId = 2;
+//                StaProtocol staProtocol = station.get(siteId);
+//                if (null == staProtocol) {
+//                    staProtocol = new StaProtocol();
+//                    staProtocol.setSiteId(siteId);
+//                    station.put(siteId, staProtocol);
+//                }
+//                staProtocol.setAutoing(true);
+//                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 8)));
+//            }
 //        }
 
-        if (result.IsSuccess && result1.IsSuccess) {
+//        //RGV灏忚溅3
+////        Thread.sleep(100);
+//        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
+//        if (result5.IsSuccess) {
+//            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
+//            if (!Cools.isEmpty(basRgvMap)){
+//                Integer siteId = 3;
+//                StaProtocol staProtocol = station.get(siteId);
+//                if (null == staProtocol) {
+//                    staProtocol = new StaProtocol();
+//                    staProtocol.setSiteId(siteId);
+//                    station.put(siteId, staProtocol);
+//                }
+//                staProtocol.setAutoing(true);
+//                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8)));
+//            }
+//        }
+
+//        //鏉$爜鎵弿鍣�
+//        ArrayList<Integer> barcodeList = BarcodeList;
+//        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
+//        if (result2.IsSuccess) {
+//            for (int i = 0; i < barcodeList.size(); i++) {
+//                Integer barcodeId = barcodeList.get(i);
+//                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+//                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+//                    barcodeThread.setBarcode(barcode);
+//                }
+//            }
+//        }
+        //鏉$爜鎵弿鍣�
+//        ArrayList<Integer> barcodeListMat = BarcodeListMat;
+//        OperateResultExOne<byte[]> result2Mat = siemensS7Net.Read("DB103.0", (short) (barcodeListMat.size() * 30));
+//        if (result2Mat.IsSuccess) {
+//            for (int i = 0; i < barcodeListMat.size(); i++) {
+//                Integer barcodeId = barcodeListMat.get(i);
+//                String barcode = siemensS7Net.getByteTransform().TransString(result2Mat.Content,i*30,30, "UTF-8");
+//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+//                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+//                    barcodeThread.setBarcode(barcode);
+//                }
+//            }
+//        }
+        //澶栧舰妫�娴�
+//        ArrayList<Integer> staNoErrs = staNosErrList;
+//        int staNoErrsSize = staNoErrs.size();
+//        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNoErrsSize*8));
+//        if (resultErr.IsSuccess){
+//            for (int i = 0;i<3;i++){
+//                Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
+//                StaProtocol staProtocol = station.get(siteId);
+//                staProtocol.setFrontErr(status[0]);
+//                staProtocol.setBackErr(status[1]);
+//                staProtocol.setHighErr(status[2]);
+//                staProtocol.setLeftErr(status[3]);
+//                staProtocol.setRightErr(status[4]);
+//                staProtocol.setWeightErr(status[5]);
+//                staProtocol.setBarcodeErr(status[6]);
+//            }
+//        }
+
+//        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+//        if (resultErr2.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.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[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
+//        if (resultErr3.IsSuccess) {
+//            if (staError1 == null){
+//                staError1 = new StaError1();
+//            }
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
+//            staError1.setEMERGENCY_Stop_Core(status[0]);
+//            staError1.setEMERGENCY_STOP1(status[1]);
+//            staError1.setEMERGENCY_STOP2(status[2]);
+//            staError1.setEMERGENCY_STOP3(status[3]);
+//            staError1.setEMERGENCY_STOP4(status[4]);
+//
+//            staError1.setDoor_EMERGENCY_STOP1(status[5]);
+//            staError1.setDoor_EMERGENCY_STOP2(status[6]);
+//            staError1.setDoor_EMERGENCY_STOP3(status[7]);
+//            staError1.setDoor_EMERGENCY_STOP4(status[8]);
+//            staError1.setDoor_EMERGENCY_STOP5(status[9]);
+//            staError1.setDoor_EMERGENCY_STOP6(status[10]);
+//
+//            staError1.setDoor_Open_Err1(status[11]);
+//            staError1.setDoor_Open_Err1(status[12]);
+//            staError1.setDoor_Open_Err1(status[13]);
+//            staError1.setDoor_Open_Err1(status[14]);
+//            staError1.setDoor_Open_Err1(status[15]);
+//            staError1.setDoor_Open_Err1(status[16]);
+//
+//        }
+
+
+        if (result1.IsSuccess && result2.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -202,9 +493,10 @@
                     throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
                 }
             } catch (Exception e) {
+                initSite();
                 e.printStackTrace();
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-                log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+                News.error("SiemensDevp"+" - 3"+" - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
         } else {
@@ -220,15 +512,36 @@
         if (null == staProtocol) {
             return;
         }
+        ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[10];
-        array[0] = staProtocol.getWorkNo();
-        array[1] = staProtocol.getStaNo();
-        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-
-//        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//        Thread.sleep(500);
-//        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
+        Integer siteId = staProtocol.getSiteId();
+        // 鑾峰彇璇ョ珯鐐瑰搴旂殑鍋忕Щ閲�
+        Integer offset = siteOffsetMap.get(siteId);
+        Integer offset2 = getOffsetBySiteId(siteId);
+        Integer offset3 = getOffsetBySiteId2(siteId);
+        OperateResult write = null;
+        OperateResult write1 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            if(siteId > 1028){
+                write = siemensS7Net.Write("DB101." + (offset + offset2), staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+                Thread.sleep(200);
+                write1 = siemensS7Net.Write("DB101." + (offset + offset2 + 12), staProtocol.getStaNo().intValue());    // 鐩爣绔�
+            }else{
+                write = siemensS7Net.Write("DB100." + (offset + offset2), staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+                Thread.sleep(200);
+                write1 = siemensS7Net.Write("DB100." + (offset + offset2 + 12), staProtocol.getStaNo().intValue());    // 鐩爣绔�
+            }
+            if(write.IsSuccess && write1.IsSuccess){
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
         if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
@@ -236,21 +549,48 @@
                 staProtocol.setPakMk(true);
             }
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+            News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         } else {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+            News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
         }
     }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
-        if (this.ioMode != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB200", this.ioMode.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+        if (this.ioModeOf2F != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
+    }
+    public Integer getRgvPosI(Integer pos) {
+        if (pos == null) return 0;
+
+        // key: 绔欑偣鍙�  value: 鍩哄噯鐗╃悊浣嶇疆
+        Map<Integer, Integer> posMap = new HashMap<>();
+        posMap.put(1004, 6534);
+        posMap.put(1007, 33634);
+        posMap.put(1010, 75174);
+        posMap.put(1014, 102124);
+        posMap.put(1018, 138224);
+        posMap.put(1021, 178034);
+        posMap.put(1024, 219684);
+        posMap.put(1028, 246724);
+        posMap.put(1031, 288194);
+        posMap.put(1035, 315204);
+        int tolerance = 50; // 鍏佽璇樊鑼冨洿
+
+        for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
+            int site = entry.getKey();
+            int basePos = entry.getValue();
+            if (Math.abs(pos - basePos) <= tolerance) {
+                return site;
+            }
+        }
+
+        return 0; // 娌″尮閰嶅埌绔欑偣
     }
 
     /**
@@ -264,7 +604,7 @@
         }
         OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
         if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("SiemensDevp"+" - 7"+" - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
         }
     }
 
@@ -285,14 +625,14 @@
     }
 
     public static void main(String[] args) {
-        System.out.println(staNos.indexOf(129));
-        System.out.println(staNos.size());
-        for (int i = 0; i<staNos.size(); i++) {
+        System.out.println(staNos1.indexOf(129));
+        System.out.println(staNos1.size());
+        for (int i = 0; i<staNos1.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);
 //            System.out.println(i);
         }
-        int index = staNos.indexOf(128);
+        int index = staNos1.indexOf(128);
         System.out.println(index*2);
         System.out.println(index*2 + 200);
     }

--
Gitblit v1.9.1