From b095bc486863e7fb15f7f798595b8a365b1cd26e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 21:45:26 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/core/enums/IoModeType.java | 32 ++++++++++++++++++++++++++++++++
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 14 +++++++++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/IoModeType.java b/src/main/java/com/zy/core/enums/IoModeType.java
new file mode 100644
index 0000000..6fe2be5
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/IoModeType.java
@@ -0,0 +1,32 @@
+package com.zy.core.enums;
+
+/**
+ * 鍏ュ嚭搴撴ā寮忔灇涓�
+ */
+public enum IoModeType {
+
+ NONE((short) 0, "鏈煡"),
+ PAKIN_BOOTING((short) 1, "鍏ュ簱鍚姩涓�"),
+ PAKIN_MODE((short) 2, "鍏ュ簱妯″紡"),
+ PAKOUT_BOOTING((short) 3, "鍑哄簱鍚姩涓�"),
+ PAKOUT_MODE((short) 4, "鍑哄簱妯″紡"),
+ ;
+
+ public Short id;
+ public String desc;
+
+ IoModeType(Short id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static IoModeType get(Short id) {
+ for (IoModeType type : IoModeType.values()) {
+ if (id.equals(type.id)) {
+ return type;
+ }
+ }
+ return IoModeType.NONE;
+ }
+
+}
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 6db683c..b2499cd 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -13,6 +13,7 @@
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
@@ -40,7 +41,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- public Integer ioModeOf1F1.
+ public IoModeType ioModeOf2_5 = IoModeType.NONE;
private short heartBeatVal = 1;
private int barcodeSize = 10;
@@ -296,4 +297,15 @@
}
+ // 鏇存柊鍏ュ嚭搴撴ā寮�
+ private void updateIoMode() throws InterruptedException {
+ if (slave.getId() == 1 && this.ioModeOf2_5 != null) {
+ if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
+ log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
+ }
+ }
+
+ }
+
}
--
Gitblit v1.9.1