From 23b4e7942a8524ed1e89d93c55a470f0dc263d5a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 13:54:01 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java |  176 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 152 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 496ec77..e60fe8f 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -48,6 +48,7 @@
      * 宸ヤ綅2澶嶄綅淇″彿
      */
     private boolean resetFlag2 = false;
+    private boolean connectRgv = false;
 
     public RgvThread(RgvSlave slave) {
         this.slave = slave;
@@ -56,18 +57,51 @@
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        this.connect();
+        connectRgv = this.connect();
+        while(!connectRgv){
+            try {
+                connectRgv = this.connect();
+                Thread.sleep(100);
+            } catch (Exception e){
+
+            }
+        }
+
+        // 鍚姩绾跨▼鑷姩閲嶈繛
+        new Thread(this::rgvConnect).start();
+
+        // 鍚姩璇绘暟鎹嚎绋�
+        new Thread(this::readStatusRgv).start();
+
+        // 鍚姩浠诲姟涓嬪彂绾跨▼
+        new Thread(this::taskIssued).start();
+    }
+
+
+    /**
+     * 浠诲姟涓嬪彂
+     */
+    private void taskIssued() {
         while (true) {
             try {
+                if(!connectRgv){
+                    try {
+                        Thread.sleep(1000L);
+                    } catch (Exception e){
+
+                    }
+                    continue;
+                }
                 int step = 1;
                 Task task = MessageQueue.poll(SlaveType.Rgv, slave.getId());
                 if (task != null) {
                     step = task.getStep();
                 }
                 switch (step) {
-                    // 璇绘暟鎹�
+                    //婕父浠诲姟瀹屾垚淇″彿
                     case 1:
-                        readStatus();
+//                        readStatus();
+                        taskComplete();
                         break;
                     //宸ヤ綅1鍐欏叆鏁版嵁
                     case 2:
@@ -87,15 +121,82 @@
                         command.setDestinationStaNo1((short)0);     // 鐩爣绔�
                         write3(command);
                         break;
+                    // 澶嶄綅
+                    case 4:
+                        RgvCommand command4 = (RgvCommand) task.getData();
+                        if (null == command4) {
+                            command4 = new RgvCommand();
+                        }
+                        command4.setRgvNo(slave.getId()); // RGV缂栧彿
+                        command4.setTaskNo1((short) 0); // 宸ヤ綔鍙�
+                        command4.setAckFinish1((short) 1);  // 浠诲姟瀹屾垚纭浣�
+                        command4.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
+                        command4.setSourceStaNo1((short)0);     // 婧愮珯
+                        command4.setDestinationStaNo1((short)0);     // 鐩爣绔�
+                        write3(command4);
+                        break;
+                    // 婕父
+                    case 5:
+                        write5((Long) task.getData());
+                        break;
                     default:
                         break;
                 }
-                Thread.sleep(500);
+                Thread.sleep(50);
             } catch (Exception e) {
+                log.error("RGV鍐欑嚎绋嬪紓甯�"+e.getMessage());
 //                e.printStackTrace();
             }
 
         }
+    }
+
+    private void rgvConnect() {
+        while (true) {
+            try {
+                Thread.sleep(1000);
+                if(!connectRgv){
+                    try {
+                        connectRgv = this.connect();
+                        Thread.sleep(100);
+                    } catch (Exception e){
+
+                    }
+                }
+            } catch (Exception e) {
+
+                log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                initRgv();
+//                e.printStackTrace();
+            }
+        }
+    }
+
+    private void readStatusRgv() {
+        while (true) {
+            try {
+                if(!connectRgv){
+                    try {
+                        Thread.sleep(1000L);
+                    } catch (Exception e){
+
+                    }
+                    initRgv();
+                    continue;
+                }
+                Thread.sleep(40);
+                readStatus();
+
+            } catch (Exception e) {
+                log.error("RGV璇荤嚎绋嬪紓甯�"+e.getMessage());
+
+                log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                initRgv();
+//                e.printStackTrace();
+            }
+
+        }
+
     }
 
     /**
@@ -150,7 +251,7 @@
             OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 20);
             OperateResultExOne<byte[]> resultV = siemensNet.Read("DB20.16", (short) 2);
             OperateResultExOne<byte[]> resultE = siemensNet.Read("DB20.26", (short) 2);
-            if (result.IsSuccess) {
+            if (result.IsSuccess && resultV.IsSuccess && resultE.IsSuccess) {
                 if (null == rgvProtocol) {
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
@@ -223,7 +324,7 @@
         if (command.getAckFinish1().equals((short)0)) {
 //            Thread.sleep(100L);
             siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
-            Thread.sleep(100L);
+            Thread.sleep(20L);
             result = siemensNet.Write("DB24.10.0", true);
         } else {
             siemensNet.Write("DB24.10.1", true);
@@ -250,8 +351,8 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
+//            Thread.sleep(200);
+//            this.readStatus();
             log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
             return true;
@@ -261,6 +362,33 @@
             return false;
         }
     }
+
+    /**
+     * 瀹屾垚
+     */
+    private void taskComplete() {
+        try {
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB24.11", (short) 1);
+            boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, 0, 1);
+            if (status[0]){
+                OperateResult result4 = siemensNet.Write("DB24.11.0", false);
+            }
+        } catch (Exception e) {
+            log.error("RGV鏁版嵁浠诲姟涓嬪彂澶嶄綅绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        }
+    }
+
+    private void write5(Long devperimeter){
+        try {
+            siemensNet.Write("DB24.12", devperimeter.intValue());
+            Thread.sleep(10L);
+            siemensNet.Write("DB24.11.0", true);
+
+        } catch (Exception ignore) {
+            log.error("鍐欏叆RGV plc宸ヤ綅1婕父鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        }
+    }
+
     private boolean write3(RgvCommand command) throws InterruptedException {
         if (null == command) {
             log.error("RGV鍐欏叆鍛戒护涓虹┖");
@@ -281,7 +409,7 @@
 //        OperateResult result = siemensNet.Write("DB24.0", array);
         OperateResult result = null;
         if (command.getAckFinish1().equals((short)0)) {
-            Thread.sleep(100L);
+            Thread.sleep(20L);
             result = siemensNet.Write("DB24.10.0", true);
         } else {
             siemensNet.Write("DB24.10.1", true);
@@ -308,8 +436,8 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
+//            Thread.sleep(200);
+//            this.readStatus();
             log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
             return true;
@@ -328,18 +456,18 @@
     /******************************************************************************************/
     /**************************************** 娴嬭瘯涓撶敤 *****************************************/
     /*****************************************************************************************/
-    public static void main(String[] args) throws InterruptedException {
-        RgvSlave slave = new RgvSlave();
-        slave.setId(1);
-        slave.setIp("192.168.6.9");
-        slave.setRack(0);
-        slave.setSlot(0);
-        RgvThread rgvThread = new RgvThread(slave);
-        rgvThread.connect();
-        rgvThread.readStatus();
-        System.out.println(JSON.toJSONString(rgvThread.rgvProtocol));
-        Thread.sleep(3000L);
-
-    }
+//    public static void main(String[] args) throws InterruptedException {
+//        RgvSlave slave = new RgvSlave();
+//        slave.setId(1);
+//        slave.setIp("192.168.6.9");
+//        slave.setRack(0);
+//        slave.setSlot(0);
+//        RgvThread rgvThread = new RgvThread(slave);
+//        rgvThread.connect();
+//        rgvThread.readStatus();
+//        System.out.println(JSON.toJSONString(rgvThread.rgvProtocol));
+//        Thread.sleep(3000L);
+//
+//    }
 
 }

--
Gitblit v1.9.1