From 1c80f6410a4bd8d2d7cfece250d32b9bbac98ef8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 17 九月 2025 10:08:58 +0800
Subject: [PATCH] WCS配置完善

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  269 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 172 insertions(+), 97 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 83ae93d..1d45d5c 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,17 +5,23 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.service.BasDevpService;
+import com.core.exception.CoolException;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.IoModeType;
 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 com.zy.entity.BasDevp;
+import com.zy.service.BasDevpService;
+import com.zy.utils.News;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,15 +44,39 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
+    private StaError1 staError1;
     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);
-        add(300);add(301);add(302);add(303);add(304);add(305);add(306);add(307);add(308);
+        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
     }};
+
+    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
+        add(1); add(2);
+    }};
+    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
+        add(101); add(103);
+    }};
+
+    /**
+     * 鏉$爜鏁伴噺
+     */
+    private int barcodeSize = 2;
+
+    /**
+     * 鍏ュ嚭搴撴ā寮�
+     * 0锛氭湭鐭�
+     * 1锛氬叆搴撳惎鍔ㄤ腑
+     * 2.鍏ュ簱妯″紡
+     * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+     * 4.鍑哄簱妯″紡
+     */
+    public IoModeType ioModeOf101 = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
+    }
+
+    private ArrayList<Integer> getStaNo() {
+        return staNos;
     }
 
     @Override
@@ -68,18 +98,46 @@
                     // 鍐欐暟鎹� 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() {
+        ArrayList<Integer> staNos = getStaNo();
+            // 绔欑偣缂栧彿
+            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);
+                }
+            }
     }
 
     @Override
@@ -92,22 +150,25 @@
         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;
     }
 
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
-    private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 140);
+    private void read() {
+
+        // 璇讳竴妤艰繛缁�8涓珯鐐�
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
         if (result.IsSuccess) {
-            for (int i = 0; i < 35; i++) {
+            for (int i = 0; i < 8; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -115,53 +176,11 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 + 70));   // 鐩爣绔�
-            }
-        }
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB100.180", (short) 36);
-        if (result0.IsSuccess) {
-            for (int i = 0; i < 9; 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 < 35; 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.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
 
-                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                    staProtocol.setPakMk(true);
-                }
-            }
-        }
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.216", (short) 9);
-        if (result2.IsSuccess) {
-            for (int i = 0; i < 9; i++) {
-                Integer siteId = staNos.get(i + 35); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result2.Content, i, 1);
-                StaProtocol staProtocol = station.get(siteId);
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 鐩爣绔�
+
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
@@ -177,7 +196,53 @@
             }
         }
 
-        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
+        // 鏉$爜鎵弿鍣�
+        OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.1672", (short) ((BarcodeList.size()+1) * 8)); // 涓嶈繛缁�
+        if (barcodeResult.IsSuccess) {
+            for (int i = 0; i < BarcodeList.size(); i++) {
+                String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*16,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, BarcodeList.get(i));
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
+                }
+            }
+        }
+
+        // 澶栧舰妫�娴�
+        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.1652", (short) ((staNosErrList.size()+1)*4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+        if (resultErr.IsSuccess){
+            for (int i = 0;i<staNosErrList.size();i++){
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*8+2, 1);
+                StaProtocol staProtocol = station.get(staNosErrList.get(i));
+                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]);
+            }
+        }
+
+        // 璇讳竴妤艰繛缁�8涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
+        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.3312", (short) (8*2));
+        if (resultErr2.IsSuccess) {
+            for (int i = 0; i < 8; i++) {
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*2 + 1, 1);
+                StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
+                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]);
+
+            }
+        }
+
+        if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -188,18 +253,21 @@
                     StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
                 }
+
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (!basDevpService.updateBatchById(basDevps)) {
+                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                     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 {
             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:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+//            log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         }
     }
 
@@ -210,31 +278,49 @@
         if (null == staProtocol) {
             return;
         }
-        int index = staNos.indexOf(staProtocol.getSiteId());
+
+        int address = -1;
+        switch (staProtocol.getSiteId()) {
+            case 100: address = 0; break;
+            case 101: address = 4; break;
+            case 102: address = 8; break;
+            case 103: address = 12; break;
+            case 104: address = 16; break;
+            case 105: address = 20; break;
+            case 106: address = 24; break;
+            case 107: address = 28; break;
+            default:
+        }
+        if(address == -1) {
+            throw new CoolException("鍐欏叆绔欑偣寮傚父锛�" + staProtocol.getSiteId());
+        }
         OperateResult write;
         OperateResult write1;
-        // 涓�鏈�
-        if (staProtocol.getSiteId() < 300) {
-            write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(100);
-            write1 = siemensS7Net.Write("DB100." + (index*2 + 70), staProtocol.getStaNo());    // 鐩爣绔�
-        // 浜屾湡
-        } else {
-            write = siemensS7Net.Write("DB100." + (index-35)*2 + 180, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(100);
-            write1 = siemensS7Net.Write("DB100." + (index-35) + 216, staProtocol.getStaNo());    // 鐩爣绔�
-        }
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write1 = siemensS7Net.Write("DB100." + (address+2), staProtocol.getStaNo());    // 鐩爣绔�
+            write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo().shortValue());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            if(write.IsSuccess && write1.IsSuccess){
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
-        if (!write.IsSuccess || !write1.IsSuccess) {
+        if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
                 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));
         }
     }
 
@@ -249,7 +335,7 @@
         }
         OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
         if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("SiemensDevp"+" - 7"+" - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
         }
     }
 
@@ -269,24 +355,13 @@
         siemensS7Net.ConnectClose();
     }
 
-    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);
-//            System.out.println(i);
-        }
-        int index = staNos.indexOf(128);
-        System.out.println(index*2);
-        System.out.println(index*2 + 200);
-    }
+    public static void main(String[] args) throws Exception {
+        DevpSlave slave = new DevpSlave();
+        slave.setIp("10.10.10.18");
+        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
+        devpThread.connect();
 
-//    public static void main(String[] args) throws Exception {
-//        DevpSlave slave = new DevpSlave();
-//        slave.setIp("192.168.2.125");
-//        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-//        devpThread.connect();
-//        devpThread.read();
+        devpThread.read();
 //        // 鍐�
 //        StaProtocol staProtocol = devpThread.getStation().get(1);
 //        staProtocol.setWorkNo((short) 232);
@@ -299,7 +374,7 @@
 //        // 璇�
 //        devpThread.read();
 //        System.out.println(JSON.toJSONString(devpThread.station));
-//
-//    }
+
+    }
 
 }

--
Gitblit v1.9.1