From 36485d6d285438c2ccfa5c8352ab8b3fd831bed0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 07 四月 2026 16:56:42 +0800
Subject: [PATCH] 1

---
 zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java    |   35 +++---
 zy-acs-cv/src/main/java/com/zy/core/constant/PlcAlarmDefinition.java |   50 ++++++++++
 zy-acs-cv/src/main/java/com/zy/core/constant/TaskField.java          |   45 +++++++++
 zy-acs-cv/src/main/java/com/zy/core/model/DevpSlave.java             |    2 
 zy-acs-cv/src/main/resources/application.yml                         |   17 +++
 zy-acs-cv/src/main/java/com/zy/core/constant/DeviceField.java        |   45 +++++++++
 zy-acs-cv/src/main/java/com/zy/core/constant/PlcConstant.java        |   10 ++
 zy-acs-cv/src/main/java/com/zy/core/constant/StationStatusField.java |   45 +++++++++
 8 files changed, 229 insertions(+), 20 deletions(-)

diff --git a/zy-acs-cv/src/main/java/com/zy/core/constant/DeviceField.java b/zy-acs-cv/src/main/java/com/zy/core/constant/DeviceField.java
new file mode 100644
index 0000000..a4aa2e1
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/core/constant/DeviceField.java
@@ -0,0 +1,45 @@
+package com.zy.core.constant;
+
+
+/**
+ * 璁惧瀛楁鏋氫妇锛堝搴� 搂2.2锛�
+ */
+public enum DeviceField {
+    // 鎵爜鍣細姣忕珯鐐�16瀛楄妭锛孲tring[14]
+    BARCODE("DB101", 0, 16),
+    // 绉伴噸锛氭瘡绔欑偣4瀛楄妭锛孎loat
+    WEIGHT("DB102", 0, 4),
+    // 灏哄寮傚父锛氭瘡绔欑偣2瀛楄妭锛孊it鏁扮粍
+    DIMENSION_WORD("DB103", 0, 2);
+
+    private final String addressPattern;
+    private final int offset;
+    private final int byteLength;
+
+    DeviceField(String addressPattern, int offset, int byteLength) {
+        this.addressPattern = addressPattern;
+        this.offset = offset;
+        this.byteLength = byteLength;
+    }
+
+    public String getAddressPattern() {
+        return addressPattern;
+    }
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public int getByteLength() {
+        return byteLength;
+    }
+
+    /**
+     * 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
+     *
+     * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
+     */
+    public String buildAddress() {
+        return addressPattern + PlcConstant.ADDRESS_CONCATENATION + offset;
+    }
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/constant/PlcAlarmDefinition.java b/zy-acs-cv/src/main/java/com/zy/core/constant/PlcAlarmDefinition.java
new file mode 100644
index 0000000..40a5938
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/core/constant/PlcAlarmDefinition.java
@@ -0,0 +1,50 @@
+package com.zy.core.constant;
+
+/**
+ * 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 int byteLength;
+    private final String 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;
+    }
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/constant/PlcConstant.java b/zy-acs-cv/src/main/java/com/zy/core/constant/PlcConstant.java
new file mode 100644
index 0000000..e2f7839
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/core/constant/PlcConstant.java
@@ -0,0 +1,10 @@
+package com.zy.core.constant;
+
+
+public interface PlcConstant {
+
+
+    public static final String ADDRESS_CONCATENATION = ".";
+
+
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/constant/StationStatusField.java b/zy-acs-cv/src/main/java/com/zy/core/constant/StationStatusField.java
new file mode 100644
index 0000000..5319491
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/core/constant/StationStatusField.java
@@ -0,0 +1,45 @@
+package com.zy.core.constant;
+
+
+/**
+ * 绔欑偣鐘舵�佸瓧娈垫灇涓撅紙瀵瑰簲 搂2.1锛�
+ */
+public enum StationStatusField {
+    ALL("DB100", 0, 12),
+    TASK_NUMBER("DB100", 0, 4),          // 浠诲姟鍙凤紝鍋忕Щ0锛�4瀛楄妭
+    FINAL_TARGET("DB100", 4, 2),          // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
+    STATUS_WORD("DB100", 6, 2),           // 鐘舵�佸瓧锛屽亸绉�6锛�2瀛楄妭
+    TASK_WRITABLE("DB100", 8, 2);          // 浠诲姟鍙啓鍖猴紝鍋忕Щ8锛�2瀛楄妭
+
+    private final String addressPattern;
+    private final int offset;
+    private final int byteLength;
+
+    StationStatusField(String addressPattern, int offset, int byteLength) {
+        this.addressPattern = addressPattern;
+        this.offset = offset;
+        this.byteLength = byteLength;
+    }
+
+    /**
+     * 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
+     *
+     * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.D0"
+     */
+    public String buildAddress() {
+        return addressPattern + PlcConstant.ADDRESS_CONCATENATION + offset;
+    }
+
+
+    public String getAddressPattern() {
+        return addressPattern;
+    }
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public int getByteLength() {
+        return byteLength;
+    }
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/constant/TaskField.java b/zy-acs-cv/src/main/java/com/zy/core/constant/TaskField.java
new file mode 100644
index 0000000..d76519c
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/core/constant/TaskField.java
@@ -0,0 +1,45 @@
+package com.zy.core.constant;
+
+
+/**
+ * 浠诲姟涓嬪彂瀛楁鏋氫妇锛堝搴� 搂2.4锛�
+ */
+public enum TaskField {
+    ALL("DB13", 0, 12),
+    TASK_NUMBER("DB13", 0, 4),
+    START_STATION("DB13", 4, 2),
+    DEST_STATION("DB13", 6, 2),
+    DIRECTION("DB13", 8, 2),
+    ROUTE_NUMBER("DB13", 10, 2);
+
+    private final String addressPattern;
+    private final int offset;
+    private final int byteLength;
+
+    TaskField(String addressPattern, int offset, int byteLength) {
+        this.addressPattern = addressPattern;
+        this.offset = offset;
+        this.byteLength = byteLength;
+    }
+
+    public String getAddressPattern() {
+        return addressPattern;
+    }
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public int getByteLength() {
+        return byteLength;
+    }
+
+    /**
+     * 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
+     *
+     * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
+     */
+    public String buildAddress() {
+        return addressPattern + PlcConstant.ADDRESS_CONCATENATION + offset;
+    }
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/model/DevpSlave.java b/zy-acs-cv/src/main/java/com/zy/core/model/DevpSlave.java
index 2cd4ca6..5c07830 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/model/DevpSlave.java
@@ -29,6 +29,8 @@
 
     private List<Integer> staNos = new ArrayList<>();
 
+    private List<Integer> staNosError = new ArrayList<>();
+
     @Data
     public static class Sta {
 
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e4a8a7d..1d424f4 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -15,6 +15,7 @@
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
+import com.zy.core.constant.*;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.enums.TaskType;
 import com.zy.core.model.DevpSlave;
@@ -134,7 +135,7 @@
     private void read() throws InterruptedException {
         List<Integer> staNos = slave.getStaNos();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize * 10));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read(StationStatusField.ALL.buildAddress(), (short) (staNoSize * StationStatusField.ALL.getByteLength()));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -144,9 +145,9 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransUInt32(result.Content, i * 10));
-                staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 10 + 4));
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 10 + 6, 2);
+                staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransUInt32(result.Content, i * StationStatusField.ALL.getByteLength()));
+                staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * StationStatusField.ALL.getByteLength() + 4));
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * StationStatusField.ALL.getByteLength() + 6, 2);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
@@ -165,10 +166,10 @@
 
         //鏉$爜鎵弿鍣�
         List<Integer> barcodeArr = slave.getBarcodeArr();
-        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.0", (short) (barcodeArr.size() * 8));
+        OperateResultExOne<byte[]> result5 = siemensS7Net.Read(DeviceField.BARCODE.buildAddress(), (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
         if (result5.IsSuccess) {
             for (int i = 0; i < barcodeArr.size(); i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8");
+                String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * DeviceField.BARCODE.getByteLength(), DeviceField.BARCODE.getByteLength(), "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeArr.get(i));
                 if (Cools.isEmpty(barcode)) {
                     barcodeThread.clearBarcode();
@@ -181,22 +182,18 @@
             }
         }
 
-        OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB103.0", (short) (staNoSize * 2));
+        List<Integer> staNosError = slave.getStaNosError();
+        OperateResultExOne<byte[]> resultError = siemensS7Net.Read(DeviceField.DIMENSION_WORD.buildAddress(), (short) (staNoSize * DeviceField.DIMENSION_WORD.getByteLength()));
         if (resultError.IsSuccess) {
-            ArrayList<Integer> staNoError = new ArrayList<Integer>() {{
-                add(102);
-                add(201);
-                add(211);
-            }};
-            for (int i = 0; i < staNoError.size(); i++) {
-                Integer siteId = staNoError.get(i); // 绔欑偣缂栧彿
+            for (int i = 0; i < staNosError.size(); i++) {
+                Integer siteId = staNosError.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
                     staProtocol = new StaProtocol();
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i * 2, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i * DeviceField.DIMENSION_WORD.getByteLength(), DeviceField.DIMENSION_WORD.getByteLength());
                 staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
                 staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
                 staProtocol.setHighErr(status[2]);// 楂樿秴闄�
@@ -208,11 +205,11 @@
         }
 
         //plc鏁呴殰
-        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB25.0", (short) (staNoSize * 4));
+        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read(PlcAlarmDefinition.ALL.buildAddress(), (short) (staNoSize * PlcAlarmDefinition.ALL.getByteLength()));
         if (resultErr2.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * 4, 2);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * PlcAlarmDefinition.ALL.getByteLength(), PlcAlarmDefinition.ALL.getByteLength());
                 StaProtocol staProtocol = station.get(siteId);
                 if (staProtocol != null) {
                     staProtocol.setBreakerErr(status[0]);
@@ -270,9 +267,9 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB13." + index * 12, staProtocol.getWorkNo().shortValue());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write(TaskField.TASK_NUMBER.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.TASK_NUMBER.getOffset()), staProtocol.getWorkNo().shortValue());    // 宸ヤ綔鍙�
             Thread.sleep(200);
-            write1 = siemensS7Net.Write("DB13." + (index * 12 + 6), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            write1 = siemensS7Net.Write(TaskField.DEST_STATION.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.DEST_STATION.getOffset()), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if (write.IsSuccess && write1.IsSuccess) {
                 log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 break;
diff --git a/zy-acs-cv/src/main/resources/application.yml b/zy-acs-cv/src/main/resources/application.yml
index 729075c..e39450a 100644
--- a/zy-acs-cv/src/main/resources/application.yml
+++ b/zy-acs-cv/src/main/resources/application.yml
@@ -79,7 +79,22 @@
     port: 102
     rack: 0
     slot: 0
-    staNos: 1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013
+    staNos:
+      - 1001
+      - 1002
+      - 1003
+      - 1004
+      - 1005
+      - 1006
+      - 1007
+      - 1008
+      - 1009
+      - 1010
+      - 1011
+      - 1012
+      - 1013
+    staNosError:
+      - 1006
     barcodeArr: 1
     # ctu鏀捐揣绔欑偣
     releaseSta[0]:

--
Gitblit v1.9.1