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

---
 src/main/java/com/zy/core/thread/RgvThread.java           |   15 +++++++++++++++
 src/main/java/com/zy/asrs/controller/RgvController.java   |   16 ++++++++++++++--
 src/main/java/com/zy/core/model/protocol/RgvProtocol.java |    4 ++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 0e45ca0..a1fad69 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -468,8 +468,20 @@
                         if (rgvCircularShuttleParam.getStatus()==0){
                             rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
                         }
-                        if (rgvCircularShuttleParam.getError()==0){
-                            rgvCircularShuttleParam.setError$(rgvProtocol.getAlarm$());
+                        if (rgvProtocol.getAlarmList().isEmpty()){
+                            rgvCircularShuttleParam.setError(0);
+                            rgvCircularShuttleParam.setError$("-");
+                        } else {
+                            StringBuilder alarmList = new StringBuilder();
+                            for (Integer alarm : rgvProtocol.getAlarmList()){
+                                BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm);
+                                alarmList.append((rgvErr==null || rgvErr.getErrName()==null)? "鏈煡寮傚父:"+alarm:rgvErr.getErrName());
+                                if (alarm.equals(rgvProtocol.getAlarmList().get(rgvProtocol.getAlarmList().size() - 1))){
+                                    break;
+                                }
+                                alarmList.append("---");
+                            }
+                            rgvCircularShuttleParam.setError$(alarmList.toString());
                         }
                     }
                 }
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index b44627f..955956d 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -4,6 +4,9 @@
 import com.zy.core.enums.*;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by vincent on 2020/8/7
  */
@@ -104,6 +107,7 @@
      * 寮傚父鐮�
      */
     public Short alarm;
+    public List<Integer> alarmList = new ArrayList<>();
 
     /**
      * 蹇冭烦鎸囦护 1-2姣忕鍒囨崲涓�娆�
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index e60fe8f..4ebfcfd 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -27,7 +27,9 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * RGV绾跨▼
@@ -251,6 +253,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);
+            OperateResultExOne<byte[]> resultError = siemensNet.Read("DB13.0", (short) 13);
             if (result.IsSuccess && resultV.IsSuccess && resultE.IsSuccess) {
                 if (null == rgvProtocol) {
                     rgvProtocol = new RgvProtocol();
@@ -267,9 +270,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);
+                    }
+                }
+                rgvProtocol.setAlarmList(alarmList);
+
 //                rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
                 OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
+
                 try {
                     // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
                     BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);

--
Gitblit v1.9.1