From 510a21954afdf40479bdf293568cc7979e6043ad Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 07 一月 2026 16:15:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  221 ++++++++++++++++++++----------------------------------
 1 files changed, 82 insertions(+), 139 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ea0532e..d412b8d 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.Cools;
 import com.core.common.DateUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasDevp;
@@ -13,7 +14,7 @@
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.IoModeType;
+import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
@@ -76,18 +77,7 @@
      */
     private int barcodeSize = 2;
 
-    /**
-     * 鍏ュ嚭搴撴ā寮�
-     * 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;
@@ -121,7 +111,16 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol) task.getData());
-                        log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
+                        log.info("杈撻�佺嚎涓嬪彂鍛戒护锛�" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
+                        break;
+                    // 鍐欐暟鎹� ID+鐩爣绔�
+                    case 3:
+                        write2((StaProtocol) task.getData());
+                        log.info("杈撻�佺嚎涓嬪彂鍛戒护3锛�");
+                        break;
+                    case 4:
+                        write4((StaProtocol) task.getData());
+                        log.info("杈撻�佺嚎涓嬪彂鍛戒护4锛�");
                         break;
                     default:
                         break;
@@ -251,84 +250,30 @@
             }
         }
 
+        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 2);
+        if (result4.IsSuccess) {
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
+            if (status[0] && status[1]) {
+                StaProtocol staProtocol = station.get(1007);
+                MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+                log.info("澶嶄綅1007");
+            }
+        }
+
         //鏉$爜鎵弿鍣�
-//        ArrayList<Integer> barcodeList = BarcodeList;
-//        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1648", (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);
-//                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.1608", (short) (staNoErrsSize * 8));
-//        if (resultErr.IsSuccess) {
-//            for (int i = 0; i < 2; 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]);
-//            }
-//        }
-
-        //plc鏁呴殰
-//        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.1728", (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]);
-//
-//        }
-
+        ArrayList<Integer> barcodeList = BarcodeList;
+        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8));
+        if (result5.IsSuccess) {
+            for (int i = 0; i < barcodeList.size(); i++) {
+                Integer barcodeId = barcodeList.get(i);
+                String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+                if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
+                    log.info("鏂欑鐮侊細{}",barcode);
+                }
+            }
+        }
 
         if (result.IsSuccess) {
 
@@ -396,30 +341,60 @@
         }
     }
 
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
-    private void updateIoMode() throws InterruptedException {
-        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());
+    private void write2(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        OperateResult write = null;
+        boolean[] array = new boolean[1];
+        array[0] = true;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB102.0", array);
+            if (write.IsSuccess) {
+                log.error("鍐欏叆杈撻�佺嚎DB102.0鍛戒护鎴愬姛3銆傝緭閫佺嚎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) {
+            News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         }
     }
 
-    /**
-     * 蹇冭烦
-     */
-    private void heartbeat() {
-        if (heartBeatVal == 1) {
-            heartBeatVal = 2;
-        } else {
-            heartBeatVal = 1;
+    private void write4(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
         }
-        OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
+        OperateResult write = null;
+        boolean[] array = new boolean[2];
+        array[0] = false;
+        array[1] = false;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB102.0", array);
+            if (write.IsSuccess) {
+                log.error("44鍐欏叆杈撻�佺嚎DB102.0鍛戒护鎴愬姛3銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            } else {
+                writeCount++;
+                log.error("44鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        } while (writeCount < 5);
+
         if (!write.IsSuccess) {
-            News.error("SiemensDevp" + " - 7" + " - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         }
     }
+
+
+
+
 
     /**
      * 璁剧疆鍏ュ簱鏍囪
@@ -437,38 +412,6 @@
         siemensS7Net.ConnectClose();
     }
 
-    public static void main(String[] args) {
-        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 = staNos1.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("192.168.2.125");
-//        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-//        devpThread.connect();
-//        devpThread.read();
-//        // 鍐�
-//        StaProtocol staProtocol = devpThread.getStation().get(1);
-//        staProtocol.setWorkNo((short) 232);
-//        staProtocol.setStaNo((short) 6);
-//        staProtocol.setAutoing(true);
-//        staProtocol.setEmptyMk(true);
-//        staProtocol.setInEnable(true);
-//        devpThread.write(staProtocol);
-//        System.out.println("----------------------------------------");
-//        // 璇�
-//        devpThread.read();
-//        System.out.println(JSON.toJSONString(devpThread.station));
-//
-//    }
 
 }

--
Gitblit v1.9.1