From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 14 五月 2025 14:43:00 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  140 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 96 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 55297e1..76aa674 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -295,15 +295,16 @@
                 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]);
-
+                if (staProtocol != null) {
+                    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]);
+                }
             }
         }
 
@@ -340,43 +341,81 @@
         if (null == staProtocol) {
             return;
         }
-        System.out.println(staProtocol);
         int index = staNosAll.indexOf(staProtocol.getSiteId());
         OperateResult write = null;
         OperateResult write1 = null;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
+        boolean wrkNoFlag = false;
+        boolean staNoFlag = false;
         do {
-            write = siemensS7Net.Write("DB100." + index * 6, (int) staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(300);
-            write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo());    // 鐩爣绔�
-            Thread.sleep(100);
-            if (write.IsSuccess && write1.IsSuccess) {
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
-                OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
-                if (readResult.IsSuccess && readResult1.IsSuccess) {
-                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 2);
-                    if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                        break;
-                    } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
-                        writeCount++;
-                        log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                    }
+            if (!wrkNoFlag) {
+                write = siemensS7Net.Write("DB100." + index * 6, (int) staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+                if (write.IsSuccess) {
+                    wrkNoFlag = true;
+//                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
+//                    if (readResult.IsSuccess) {
+//                        short workNo = (short) siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+//                        if (staProtocol.getWorkNo().equals(workNo)) {
+//                            //浠诲姟鍛戒护鍐欏叆鎴愬姛
+//                            log.info("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getWorkNo(), workNo, writeCount);
+//                            wrkNoFlag = true;
+//                        } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
+//                            writeCount++;
+//                            log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getWorkNo(), workNo, writeCount);
+//                        }
+//                    } else {
+//                        writeCount++;
+//                        log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+//                    }
                 } else {
                     writeCount++;
-                    log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                    log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅけ璐ャ�傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 }
-            } else {
-                writeCount++;
-                log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
-        } while (writeCount < 5);
+            if (!staNoFlag) {
+                write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo());    // 鐩爣绔�
+                if (write1.IsSuccess) {
+                    staNoFlag = true;
+//                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
+//                    if (readResult1.IsSuccess) {
+//                        short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
+//                        if (staProtocol.getStaNo().equals(staNo)) {
+//                            //浠诲姟鍛戒护鍐欏叆鎴愬姛
+//                            log.info("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getStaNo(), staNo, writeCount);
+//                            staNoFlag = true;
+//                        } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
+//                            writeCount++;
+//                            log.error("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getStaNo(), staNo, writeCount);
+//                        }
+//                    } else {
+//                        writeCount++;
+//                        log.error("鍐欏叆鐩爣绔欏懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+//                    }
+                } else {
+                    writeCount++;
+                    log.error("鍐欏叆鐩爣绔欏懡浠ゅけ璐ャ�傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                }
+            }
+            if (wrkNoFlag && staNoFlag) {
+                break;
+            }
+            Thread.sleep(200);
+        } while (writeCount < 20);
 
         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)));
+            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)));
+            News.info("SiemensDevp" + " - 5" + " - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+        }
+
+        if (!write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
                 staProtocol.setPakMk(true);
@@ -431,16 +470,29 @@
     }
 
     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);
+        int i=1;
+        do {
+            System.out.println(i);
+            i++;
+            if (i==4){
+                break;
+            }
+
+        }while (i<6);
+        StaProtocol staProtocol = new StaProtocol();
+        staProtocol.setWorkNo((short) 6071);
+        //short i = (short) 6071;
+        //System.out.println(staProtocol.getWorkNo().equals(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 = staNos1.indexOf(128);
+//        System.out.println(index * 2);
+//        System.out.println(index * 2 + 200);
     }
 
 //    public static void main(String[] args) throws Exception {

--
Gitblit v1.9.1