From 3951add7a40f76bb403ead8c0acffb970d1bfa5c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:24:53 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java |  217 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 192 insertions(+), 25 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..34ae595 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -8,7 +8,9 @@
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasRgv;
+import com.zy.asrs.entity.BasRgvErrLog;
 import com.zy.asrs.entity.BasRgvOpt;
+import com.zy.asrs.service.BasRgvErrLogService;
 import com.zy.asrs.service.BasRgvOptService;
 import com.zy.asrs.service.BasRgvService;
 import com.zy.asrs.utils.NumUtils;
@@ -27,7 +29,10 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * RGV绾跨▼
@@ -48,6 +53,8 @@
      * 宸ヤ綅2澶嶄綅淇″彿
      */
     private boolean resetFlag2 = false;
+    private boolean connectRgv = false;
+    private boolean alarmChangeSign = false;
 
     public RgvThread(RgvSlave slave) {
         this.slave = slave;
@@ -56,22 +63,57 @@
     @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:
-                        write((RgvCommand) task.getData());
+                        RgvCommand command2 = (RgvCommand) task.getData();
+                        rgvOpt(command2);
+                        write(command2);
                         break;
                     // 澶嶄綅
                     case 3:
@@ -85,17 +127,73 @@
                         command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
                         command.setSourceStaNo1((short)0);     // 婧愮珯
                         command.setDestinationStaNo1((short)0);     // 鐩爣绔�
+                        rgvOpt(command);
                         write3(command);
+                        break;
+                    // 婕父
+                    case 5:
+                        Long aLong = (Long) task.getData();
+                        rgvOpt(aLong);
+                        write5(aLong);
                         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 +248,8 @@
             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) {
+            OperateResultExOne<byte[]> resultError = siemensNet.Read("DB13.0", (short) 13);
+            if (result.IsSuccess && resultV.IsSuccess && resultE.IsSuccess) {
                 if (null == rgvProtocol) {
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
@@ -166,8 +265,21 @@
                 rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
                 rgvProtocol.setInstantaneousSpeed(Double.valueOf(siemensNet.getByteTransform().TransInt16(resultV.Content, 0)));
                 rgvProtocol.setEndStaM(siemensNet.getByteTransform().TransInt16(resultE.Content, 0));
+                boolean[] statusAlarmList = siemensNet.getByteTransform().TransBool(resultError.Content, 0, 13);
+                int alarmCount = 0;
+                List<Integer> alarmList = new ArrayList<>();
+                for (boolean alarmSign : statusAlarmList){
+                    alarmCount++;
+                    if (alarmSign){
+                        alarmList.add(alarmCount);
+                    }
+                }
+                alarmChangeSign = new HashSet<>(alarmList).equals(new HashSet<>(rgvProtocol.getAlarmList()));
+                rgvProtocol.setAlarmList(alarmList);
+
 //                rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
                 OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
 
                 try {
                     // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -179,6 +291,16 @@
                     if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
                         log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                     }
+                    try{
+                        if (!alarmChangeSign && !alarmList.isEmpty()){
+                            BasRgvErrLogService basRgvErrLogService = SpringUtils.getBean(BasRgvErrLogService.class);
+                            BasRgvErrLog basRgvErrLog = new BasRgvErrLog(rgvProtocol.getAlarmList(), rgvProtocol.getTaskNo1(), rgvProtocol.getRgvNo());
+                            basRgvErrLogService.insert(basRgvErrLog);
+                        }
+                    } catch (Exception e){
+                        log.error("RGV寮傚父淇℃伅淇濆瓨澶辫触锛侊紒");
+                    }
+
                 } catch (Exception ignore) {
 
                 }
@@ -199,6 +321,24 @@
     /**
      * 宸ヤ綅1鍐欏叆鏁版嵁
      */
+    private void rgvOpt(RgvCommand command) {
+        try{
+            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+            basRgvOptService.insert(basRgvOpt);
+        }catch (Exception e){
+            log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+        }
+    }
+    private void rgvOpt(Long command) {
+        try{
+            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+            basRgvOptService.insert(basRgvOpt);
+        }catch (Exception e){
+            log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+        }
+    }
     private boolean write(RgvCommand command) throws InterruptedException {
         if (null == command) {
             log.error("RGV鍐欏叆鍛戒护涓虹┖");
@@ -223,7 +363,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 +390,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 +401,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 +448,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 +475,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 +495,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