From 366ba040d2447bacd3455299425e3166f1f992bb Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 20 十一月 2025 14:38:32 +0800
Subject: [PATCH] 添加大车、大理片笼以及多设备串行/并行执行写入基础逻辑
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java
index f034b9e..dc65a65 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java
@@ -16,7 +16,6 @@
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -40,6 +39,22 @@
private final DeviceGroupRelationService deviceGroupRelationService;
private final PlcTestWriteService plcTestWriteService;
private final ObjectMapper objectMapper;
+
+ public enum PlcOperationType {
+ REQUEST("PLC璇锋眰", "PLC 璇锋眰鍙戦�佹垚鍔�", "PLC 璇锋眰鍙戦�佸け璐�"),
+ REPORT("PLC姹囨姤", "PLC 姹囨姤妯℃嫙鎴愬姛", "PLC 姹囨姤妯℃嫙澶辫触"),
+ RESET("PLC閲嶇疆", "PLC 鐘舵�佸凡閲嶇疆", "PLC 鐘舵�侀噸缃け璐�");
+
+ private final String display;
+ private final String successMsg;
+ private final String failedMsg;
+
+ PlcOperationType(String display, String successMsg, String failedMsg) {
+ this.display = display;
+ this.successMsg = successMsg;
+ this.failedMsg = failedMsg;
+ }
+ }
@Override
public DevicePlcVO.OperationResult triggerRequest(Long deviceId) {
@@ -280,20 +295,6 @@
throw new IllegalStateException("鏃犳硶瑙ｆ瀽璁惧鐨� PLC 椤圭洰鏍囪瘑, deviceId=" + device.getId());
}
- public enum PlcOperationType {
- REQUEST("PLC璇锋眰", "PLC 璇锋眰鍙戦�佹垚鍔�", "PLC 璇锋眰鍙戦�佸け璐�"),
- REPORT("PLC姹囨姤", "PLC 姹囨姤妯℃嫙鎴愬姛", "PLC 姹囨姤妯℃嫙澶辫触"),
- RESET("PLC閲嶇疆", "PLC 鐘舵�佸凡閲嶇疆", "PLC 鐘舵�侀噸缃け璐�");
- private final String display;
- private final String successMsg;
- private final String failedMsg;
-
- PlcOperationType(String display, String successMsg, String failedMsg) {
- this.display = display;
- this.successMsg = successMsg;
- this.failedMsg = failedMsg;
- }
- }
}
--
Gitblit v1.8.0