From 19f59c243e8df97c8b9fd9dba4e758be8235d68b Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 25 十一月 2025 17:02:54 +0800
Subject: [PATCH] 添加卧转立扫码、卧转立、大车、大理片笼基础任务流转逻辑
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DevicePlcOperationServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 dc65a65..ebac164 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
@@ -40,15 +40,27 @@
private final PlcTestWriteService plcTestWriteService;
private final ObjectMapper objectMapper;
- public enum PlcOperationType {
+ public static enum PlcOperationType {
+ /** PLC璇锋眰鎿嶄綔 */
REQUEST("PLC璇锋眰", "PLC 璇锋眰鍙戦�佹垚鍔�", "PLC 璇锋眰鍙戦�佸け璐�"),
+ /** PLC姹囨姤鎿嶄綔 */
REPORT("PLC姹囨姤", "PLC 姹囨姤妯℃嫙鎴愬姛", "PLC 姹囨姤妯℃嫙澶辫触"),
+ /** PLC閲嶇疆鎿嶄綔 */
RESET("PLC閲嶇疆", "PLC 鐘舵�佸凡閲嶇疆", "PLC 鐘舵�侀噸缃け璐�");
+ /** 鎿嶄綔鏄剧ず鍚嶇О */
private final String display;
+ /** 鎿嶄綔鎴愬姛鎻愮ず淇℃伅 */
private final String successMsg;
+ /** 鎿嶄綔澶辫触鎻愮ず淇℃伅 */
private final String failedMsg;
+ /**
+ * 鏋勯�犳柟娉�
+ * @param display 鎿嶄綔鏄剧ず鍚嶇О
+ * @param successMsg 鎴愬姛鎻愮ず淇℃伅
+ * @param failedMsg 澶辫触鎻愮ず淇℃伅
+ */
PlcOperationType(String display, String successMsg, String failedMsg) {
this.display = display;
this.successMsg = successMsg;
@@ -103,7 +115,7 @@
return DevicePlcVO.StatusInfo.builder()
.deviceId(deviceId)
.deviceName("鏈煡璁惧")
- .data(Collections.emptyMap())
+ .fieldValues(Collections.emptyMap())
.timestamp(LocalDateTime.now())
.build();
}
@@ -115,7 +127,7 @@
.deviceName(device.getDeviceName())
.deviceCode(device.getDeviceCode())
.projectId(String.valueOf(device.getProjectId()))
- .data(data)
+ .fieldValues(data)
.timestamp(LocalDateTime.now())
.build();
} catch (Exception e) {
@@ -125,7 +137,7 @@
.deviceName(device.getDeviceName())
.deviceCode(device.getDeviceCode())
.projectId(null)
- .data(Collections.emptyMap())
+ .fieldValues(Collections.emptyMap())
.timestamp(LocalDateTime.now())
.build();
}
--
Gitblit v1.8.0