From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java
new file mode 100644
index 0000000..a4099ae
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java
@@ -0,0 +1,57 @@
+package com.mes.device.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * 璁惧 PLC 鎿嶄綔鐩稿叧 VO
+ *
+ * @author mes
+ * @since 2025-11-17
+ */
+public class DevicePlcVO {
+
+ /**
+ * PLC 鎿嶄綔缁撴灉
+ */
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Schema(name = "DevicePlcOperationResult", description = "PLC 鎿嶄綔缁撴灉")
+ public static class OperationResult implements Serializable {
+ private Long deviceId;
+ private String deviceName;
+ private String deviceCode;
+ private String projectId;
+ private String operation;
+ private Boolean success;
+ private String message;
+ private LocalDateTime timestamp;
+ }
+
+ /**
+ * PLC 鐘舵�佷俊鎭�
+ */
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Schema(name = "DevicePlcStatus", description = "PLC 鐘舵�佹暟鎹�")
+ public static class StatusInfo implements Serializable {
+ private Long deviceId;
+ private String deviceName;
+ private String deviceCode;
+ private String projectId;
+ private Map<String, Object> data;
+ private LocalDateTime timestamp;
+ }
+}
+
--
Gitblit v1.8.0