From 547da9acb9683a683c4f6aebd55eee8aa3980220 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 10:42:18 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
index 78728db..2817e65 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
@@ -1,26 +1,50 @@
package com.zy.acs.conveyor.core.constant;
- /**
- * PLC 鎶ヨ瀹氫箟锛堝搴� 搂2.3锛�
- */
- public enum PlcAlarmDefinition {
- EMERGENCY_STOP("DB25",1, "鎬ュ仠"),
- LOWER_BREAKER_TRIP("DB25",2, "浣庝綅鏂矾鍣ㄦ柇寮�"),
- LOWER_INVERTER_FAULT("DB25",3, "浣庝綅鍙橀鍣ㄦ晠闅�"),
- CONVEYOR_TIMEOUT("DB25",4, "杈撻�佽繍琛岃秴鏃�"),
- LIFT_TIMEOUT("DB25",5, "椤跺崌杩愯瓒呮椂"),
- TASK_REQUEST_TIMEOUT("DB25",6, "鐢宠浠诲姟瓒呮椂"),
- PALLET_PROTRUSION("DB25",7, "鎵樼洏绐佸嚭鎶ヨ"),
- TASK_DUPLICATE("DB25",8, "浠诲姟閲嶅鎶ヨ"),
- PRECONDITION_ERROR("DB25",9, "鍏ョ珯杩囩▼涓墠缃潯浠跺紓甯�");
+/**
+ * PLC 鎶ヨ瀹氫箟锛堝搴� 搂2.3锛�
+ */
+public enum PlcAlarmDefinition {
+ ALL("DB25", 0, 4, "鎵�鏈夋姤璀�"),
+ EMERGENCY_STOP("DB25", 1, 4, "鎬ュ仠"),
+ LOWER_BREAKER_TRIP("DB25", 2, 4, "浣庝綅鏂矾鍣ㄦ柇寮�"),
+ LOWER_INVERTER_FAULT("DB25", 3, 4, "浣庝綅鍙橀鍣ㄦ晠闅�"),
+ CONVEYOR_TIMEOUT("DB25", 4, 4, "杈撻�佽繍琛岃秴鏃�"),
+ LIFT_TIMEOUT("DB25", 5, 4, "椤跺崌杩愯瓒呮椂"),
+ TASK_REQUEST_TIMEOUT("DB25", 6, 4, "鐢宠浠诲姟瓒呮椂"),
+ PALLET_PROTRUSION("DB25", 7, 4, "鎵樼洏绐佸嚭鎶ヨ"),
+ TASK_DUPLICATE("DB25", 8, 4, "浠诲姟閲嶅鎶ヨ"),
+ PRECONDITION_ERROR("DB25", 9, 4, "鍏ョ珯杩囩▼涓墠缃潯浠跺紓甯�");
- private final String addressPattern;
- private final int index; // 鎶ヨ搴忓彿锛�1-based锛�
- private final String description;
+ private final String addressPattern;
+ private final int index; // 鎶ヨ搴忓彿锛�1-based锛�
+ private final int byteLength;
+ private final String description;
- PlcAlarmDefinition(String addressPattern,int index, String description) {
- this.addressPattern = addressPattern;
- this.index = index;
- this.description = description;
- }
+ PlcAlarmDefinition(String addressPattern, int index, int byteLength, String description) {
+ this.addressPattern = addressPattern;
+ this.index = index;
+ this.byteLength = byteLength;
+ this.description = description;
}
+
+
+ public String buildAddress() {
+ return addressPattern + PlcConstant.ADDRESS_CONCATENATION + index;
+ }
+
+ public String getAddressPattern() {
+ return addressPattern;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getByteLength() {
+ return byteLength;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+}
--
Gitblit v1.9.1