From 8e19e67d1178e834a868f4a820d827ddf64c6e01 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 12:46:08 +0800
Subject: [PATCH] #ZH

---
 src/main/java/com/zy/core/thread/RgvThread.java             |    7 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   39 +++++++++
 pom.xml                                                     |   12 +-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |  130 +++++++++++++++++++++++++-------
 4 files changed, 151 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b6fe46..bf09a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,12 +61,12 @@
 <!--        </dependency>-->
 
         <!-- 鏄惧紡鎺掗櫎slf4j-simple -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version>
-            <scope>provided</scope> <!-- 鎴栫洿鎺ュ垹闄よ渚濊禆 -->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.slf4j</groupId>-->
+<!--            <artifactId>slf4j-simple</artifactId>-->
+<!--            <version>1.7.30</version>-->
+<!--            <scope>provided</scope> &lt;!&ndash; 鎴栫洿鎺ュ垹闄よ渚濊禆 &ndash;&gt;-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver8</artifactId>
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f9b5f6e..b477145 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -200,6 +200,25 @@
                             continue;
                         }
                         String barcode = barcodeThread.getBarcode();
+                        int signI = 0;
+                        while (signI<6){
+                            Thread.sleep(200);
+                            signI = signI +1;
+                            // 鑾峰彇鏉$爜鎵弿浠俊鎭�
+                            if (Cools.isEmpty(barcode) || barcode.equals("000000")) {
+                                devpThread.setErrorDev(staProtocol.getSiteId(), "寰幆娆℃暟锛�"+signI+"锛涙壂鐮佸�硷細"+barcode);
+
+                                BarcodeThread barcodeThreadO = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+                                if (barcodeThreadO == null) {
+                                    continue;
+                                }
+                                barcode = barcodeThreadO.getBarcode();
+                            } else {
+                                break;
+                            }
+                        }
+
+
                         if (!Cools.isEmpty(barcode) && !barcode.equals("99999999") && !barcode.equals("000000")) {
                             // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
                             ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, workNo == 9998? 0 : 1);
@@ -1664,6 +1683,8 @@
                         if (!sign && staList.size()==1){
                             if (rgvOtherIDLEOther(rgvSlave)){
                                 if (!rgvOtherIDLE(rgvSlave,staList.get(0))){
+                                    System.out.println("绌洪棽灏辫繎璺宠繃==="+rgvSlave.getId()+"===");
+
                                     sign=true;
                                 }
                             }
@@ -1675,6 +1696,8 @@
                                             Integer outStaNo = BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint());
                                             for (RgvSlave.RgvStn rgvSuper : rgvSlave.getRgvSuperSta()){
                                                 if (rgvSuper.getStaNo().equals(outStaNo)){
+                                                    System.out.println("绌洪棽灏辫繎璺宠繃鍚庡洜鏈�杩滃啀娆℃墽琛�==="+rgvSlave.getId()+"===");
+
                                                     sign=false;
                                                     break;
                                                 }
@@ -1696,6 +1719,9 @@
                                         if (taskWrk != null) {
                                             BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
                                             if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
+                                                System.out.println("鍏ㄨ寖鍥存墽琛�==="+rgvSlave.getId()+"==="+taskWrk);
+                                                System.out.println("鍏ㄨ寖鍥存墽琛�==="+rgvSlave.getId()+"==="+JSON.toJSONString(belongToRange));
+
                                                 sign = taskGenerate(rgvSlave, rgvStn, 0);
                                             }
                                         }
@@ -1717,6 +1743,9 @@
                                             Integer outStaNo = BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint());
                                             for (RgvSlave.RgvStn rgvStnOut : rgvSlave.getRgvOutSta()) {
                                                 if (rgvStnOut.getStaNo().equals(outStaNo)) {
+                                                    System.out.println("绛涢�夎寖鍥村唴鍙栬揣浠诲姟==="+rgvSlave.getId()+"==="+taskWrk);
+                                                    System.out.println("绛涢�夎寖鍥村唴鍙栬揣浠诲姟==="+rgvSlave.getId()+"==="+JSON.toJSONString(belongToRange));
+
                                                     sign = taskGenerate(rgvSlave, rgvStn, 0);
                                                     break;
                                                 }
@@ -1734,12 +1763,14 @@
                         if (!sign && staList.size()==1){
                             if (rgvOtherIDLEOther2(rgvSlave)){
                                 if (!rgvOtherIDLE2(rgvSlave,staList.get(0))){
+                                    System.out.println("杩愯灏辫繎璺宠繃==="+rgvSlave.getId()+"===");
+
                                     sign=true;
                                 }
                             }
                         }
 
-                        if (!sign) {
+                        if (!sign && staList.size()>1) {
                             for (Integer staNoNow : rangeList) {
                                 for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
                                     if (rgvStn.getStaNo().equals(staNoNow)) {
@@ -1747,6 +1778,9 @@
                                         if (taskWrk != null) {
                                             BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
                                             if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
+                                                System.out.println("绛涢�夊崐杈硅寖鍥村唴浠诲姟==="+rgvSlave.getId()+"==="+taskWrk);
+                                                System.out.println("绛涢�夊崐杈硅寖鍥村唴浠诲姟==="+rgvSlave.getId()+"==="+JSON.toJSONString(belongToRange));
+
                                                 sign = taskGenerate(rgvSlave, rgvStn, 0);
                                             }
                                         }
@@ -1768,6 +1802,9 @@
                                             Integer outStaNo = BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint());
                                             for (RgvSlave.RgvStn rgvStnOut : rgvSlave.getRgvOutSta()) {
                                                 if (rgvStnOut.getStaNo().equals(outStaNo)) {
+                                                    System.out.println("绛涢�夊崐杈硅寖鍥村彇璐т换鍔�==="+rgvSlave.getId()+"==="+taskWrk);
+                                                    System.out.println("绛涢�夊崐杈硅寖鍥村彇璐т换鍔�==="+rgvSlave.getId()+"==="+JSON.toJSONString(belongToRange));
+
                                                     sign = taskGenerate(rgvSlave, rgvStn, 0);
                                                     break;
                                                 }
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index b755b34..c823915 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -104,6 +104,7 @@
     private void rgvConnect() {
         while (true) {
             try {
+                Thread.sleep(1000);
                 if(!connectRgv){
                     try {
                         connectRgv = this.connect();
@@ -308,7 +309,9 @@
                     rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                     rgvRun.setRgvNo(slave.getOtherId());
                     RgvRunCache.updateRgvStatus(rgvRun);
-                    RgvErrCache.updateRgvErr(slave.getId(),errorRgv);
+                    if (!errorRgv.equals("鏃�")){
+                        RgvErrCache.updateRgvErr(slave.getId(),errorRgv);
+                    }
                     continue;
                 }
 
@@ -494,7 +497,7 @@
             return false;
         }
         if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM)) {
-            errorRgv = slave.getId()+"鍙峰皬杞﹂潪绌洪棽";
+            errorRgv = "鏃�";
             return false;
         }
         if ( (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM)) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 11ccf15..87150cc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,6 +50,8 @@
         add(1008);add(1009);add(1010);add(1011);add(1012);add(1013);add(1014);add(1015);
         add(1016);add(1017);add(1018);add(1019);add(1020);add(1021);add(1022);add(1023);
     }};
+    private boolean connectDev = false;
+
 
     /**
      * 鏉$爜鏁伴噺
@@ -82,36 +84,53 @@
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        connect();
-        while (true) {
+        connectDev = connect();
+        while(!connectDev){
             try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        read();
-                        break;
-                    // 鍐欐暟鎹� ID+鐩爣绔�
-                    case 2:
-                        write((StaProtocol)task.getData());
-                        break;
-                    default:
-                        break;
-                }
-                // 蹇冭烦
-//                heartbeat();
-                Thread.sleep(400);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+                connectDev = this.connect();
+                Thread.sleep(100);
+            } catch (Exception e){
 
+            }
         }
+
+        // 鍚姩绾跨▼鑷姩閲嶈繛
+        new Thread(this::devConnect).start();
+        new Thread(this::readStatusDev).start();
+        new Thread(this::writeStatusDev).start();
+
+
     }
 
+
+    private void devConnect() {
+        while (true) {
+            try {
+                Thread.sleep(1000);
+
+                if(!connectDev){
+                    try {
+                        connectDev = this.connect();
+                        Thread.sleep(100);
+                    } catch (Exception e){
+
+                    }
+                }
+            } catch (Exception e) {
+                log.info("dev杩炴帴澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+//                log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                try{
+                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+                    deviceErrorService.addDeviceError("dev", slave.getId(), "rgv杩炴帴澶辫触"+e.getMessage());
+                } catch (Exception e2){
+//                    log.error("e2:"+e2.getMessage());
+                }
+                initSite();
+//                e.printStackTrace();
+            }
+        }
+    }
     /**
      * 鍒濆鍖栫珯鐐圭姸鎬�
      */
@@ -161,6 +180,61 @@
         return result;
     }
 
+
+
+    private void writeStatusDev() {
+        while (true) {
+            try {
+                int step = 1;
+                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+                if (task != null) {
+                    step = task.getStep();
+                }
+                switch (step) {
+                    // 璇绘暟鎹�
+                    case 1:
+//                        read();
+                        break;
+                    // 鍐欐暟鎹� ID+鐩爣绔�
+                    case 2:
+                        write((StaProtocol)task.getData());
+                        break;
+                    default:
+                        break;
+                }
+                // 蹇冭烦
+//                heartbeat();
+                Thread.sleep(200);
+            } catch (Exception e) {
+//                e.printStackTrace();
+            }
+
+        }
+    }
+    private void readStatusDev() {
+        while (true) {
+            try {
+                Thread.sleep(50);
+//                System.out.println("璇荤嚎绋�"+ slave.getId());
+
+                read();
+
+            } catch (Exception e) {
+                log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                try{
+                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
+                } catch (Exception e2){
+//                    log.error("e2:"+e2.getMessage());
+                }
+                initSite();
+//                e.printStackTrace();
+            }
+
+        }
+
+    }
+
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
@@ -191,7 +265,7 @@
                 staProtocol.setInEnable(status[2]); // 鍙叆
 //                staProtocol.setInEnable(true); // 鍙叆
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
-                staProtocol.setOutEnable(true);// 鍙嚭
+//                staProtocol.setOutEnable(true);// 鍙嚭
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
                 staProtocol.setHigh(status[6]);     // 楂樺簱浣�
@@ -212,7 +286,7 @@
         }
 
         //鏉$爜
-        Thread.sleep(200);
+//        Thread.sleep(50);
         OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
         if (result2.IsSuccess) {
             for (int i = 0; i < barcodeSize; i++) {
@@ -225,7 +299,7 @@
         }
 
         //鏉$爜
-        Thread.sleep(200);
+//        Thread.sleep(50);
         int[] staW = new int[]{1004,1014,1020};
 
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));

--
Gitblit v1.9.1