From 338b5b8b620208c596a6d1a9a2a57d4be88f96ab Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 08 十二月 2025 14:38:04 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  166 ++++++++++++++++++++++---------------------------------
 1 files changed, 67 insertions(+), 99 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ea54383..880a0ad 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -44,16 +44,21 @@
     private short heartBeatVal = 1;
 
     /**
+     * 鏉$爜鏁伴噺
+     */
+    private int barcodeSize = 3;
+
+    /**
      * 鏃ュ織閲囬泦鏃堕棿
      */
     private Long deviceDataLogTime = System.currentTimeMillis();
 
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
-        add(301);add(302);add(303);add(304);add(305);add(306);
+        add(301);add(302);add(303);add(304);add(305);add(306);add(307);
     }};
 
     public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-        add(307);
+
     }};
 
 
@@ -197,7 +202,7 @@
 //        updateIoMode();
         ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 18));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -207,40 +212,19 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setSiteId(siteId);
-                staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 18)));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 18) + 4));   // 鐩爣绔�
+                staProtocol.setWorkNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
 
-                short locHeight = siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 8);//搴撲綅楂樺害
-                if (locHeight == 2) {//high
-                    staProtocol.setHigh(true);
-                    staProtocol.setLow(false);
-                }else {//low
-                    staProtocol.setHigh(false);
-                    staProtocol.setLow(true);
-                }
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 鐩爣绔�
 
-                staProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 10));   // 鎶ヨ
-
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 18) + 12, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-
-                boolean[] statusError = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 18) + 13, 1);
-                staProtocol.setFrontError(statusError[0]);  // 鍓嶈秴鎶ヨ
-                staProtocol.setBackError(statusError[1]);  // 鍚庤秴鎶ヨ
-                staProtocol.setHighError(statusError[2]); // 瓒呴珮鎶ヨ
-                staProtocol.setLeftError(statusError[3]);// 宸﹂珮鎶ヨ
-                staProtocol.setRightError(statusError[4]);  // 鍙抽珮鎶ヨ
-                staProtocol.setWeightError(statusError[5]);  // 瓒呴噸鎶ヨ
-                staProtocol.setBarcodeError(statusError[6]);  // 鎵爜鎶ヨ
-
-                short emptyInType = siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 14);//棰勭暀1-绌烘墭鍏ュ簱绫诲瀷锛�1:绔嬪簱鏂瑰悜 2:浜х嚎鏂瑰悜
-                staProtocol.setEmptyInType(emptyInType);
+                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
+                staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
@@ -248,40 +232,57 @@
             }
         }
 
-        //鏉$爜鎵弿鍣�
-        Thread.sleep(200);
-        ArrayList<Integer> barcodeList = getBarcode();
-        int barcodeSize = barcodeList.size();
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB103.0", (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");
-                Integer barcodeId = barcodeList.get(i);
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
-                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-                    barcodeThread.setBarcode(barcode);
-                }
+        //澶栧舰妫�娴�
+        Integer[] arr={301,304,307};
+        OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.702.0", (short) (arr.length*6));
+        for (int i = 0; i < arr.length; i++) {
+            StaProtocol staProtocol1 = station.get(arr[i]);
+            if(resultErr1.IsSuccess){
+                boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, i*6, 1);
+                staProtocol1.setFrontError(status1[0]);
+                staProtocol1.setBackError(status1[1]);
+                staProtocol1.setHighError(status1[2]);
+                staProtocol1.setLeftError(status1[3]);
+                staProtocol1.setRightError(status1[4]);
+                staProtocol1.setWeightError(status1[5]);
+                staProtocol1.setBarcodeError(status1[6]);
             }
-
         }
 
-        if (System.currentTimeMillis() - deviceDataLogTime > 1000 * 1) {
-            //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
-            //淇濆瓨鏁版嵁璁板綍
-            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
-            DeviceDataLog deviceDataLog = new DeviceDataLog();
-            deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
-            deviceDataLog.setWcsData(JSON.toJSONString(station));
-            deviceDataLog.setType("devp");
-            deviceDataLog.setDeviceNo(slave.getId());
-            deviceDataLog.setCreateTime(new Date());
-            deviceDataLogService.insert(deviceDataLog);
 
-            //鏇存柊閲囬泦鏃堕棿
-            deviceDataLogTime = System.currentTimeMillis();
+
+        Thread.sleep(200);
+        if(slave.getId()==1) {
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602.0", (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);
+                    }
+                }
+
+            }
         }
+        if (result.IsSuccess) {
+            if (System.currentTimeMillis() - deviceDataLogTime > 1000 * 1) {
+                //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+                //淇濆瓨鏁版嵁璁板綍
+                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+                DeviceDataLog deviceDataLog = new DeviceDataLog();
+                deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
+                deviceDataLog.setWcsData(JSON.toJSONString(station));
+                deviceDataLog.setType("devp");
+                deviceDataLog.setDeviceNo(slave.getId());
+                deviceDataLog.setCreateTime(new Date());
+                deviceDataLogService.insert(deviceDataLog);
 
-        if (result.IsSuccess && result2.IsSuccess) {
+                //鏇存柊閲囬泦鏃堕棿
+                deviceDataLogTime = System.currentTimeMillis();
+            }
+        }
+        if (result.IsSuccess) {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -317,57 +318,24 @@
         }
         ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        int[] array = new int[3];
-        array[0] = staProtocol.getWorkNo().intValue();
-        array[1] = staProtocol.getStaNo().intValue();
-        array[2] = staProtocol.getPalletSize().intValue();
+        short[] array = new short[2];
+        OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6,  staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+        OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo());    // 鐩爣绔�
 
-        OperateResult write = siemensS7Net.Write("DB102." + index * 16, array);
+//        OperateResult write = siemensS7Net.Write("DB100.0" + index*4, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+//        Thread.sleep(500);
+//        OperateResult write1 = siemensS7Net.Write("DB100.2" + index*4+2, staProtocol.getStaNo());    // 鐩爣绔�
 
-//        OperateResult write = null;
-//        OperateResult write1 = null;
-//        //浠诲姟涓嬪彂娆℃暟
-//        int writeCount = 0;
-//        do {
-//            write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//            Thread.sleep(500);
-//            write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
-//            if(write.IsSuccess || write1.IsSuccess){
-//                Thread.sleep(200);
-//                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*2, (short) 2);
-//                OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB101." + index*2, (short) 2);
-//                if(readResult.IsSuccess && readResult1.IsSuccess){
-//                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-//                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
-//                    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);
-//                    }
-//                } else {
-//                    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 (!write.IsSuccess) {
+        if (!writeResult1.IsSuccess&&!writeResult2.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));
+            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎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));
+            log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
         }
     }
 

--
Gitblit v1.9.1