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/DeviceControlProfile.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DeviceControlProfile.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DeviceControlProfile.java
new file mode 100644
index 0000000..60ee815
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DeviceControlProfile.java
@@ -0,0 +1,69 @@
+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.util.List;
+import java.util.Map;
+
+/**
+ * 璁惧鎺у埗鍙傛暟閰嶇疆
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "DeviceControlProfile", description = "璁惧鎺у埗鍙傛暟閰嶇疆")
+public class DeviceControlProfile implements Serializable {
+
+ @Schema(description = "鑺傛媿/绾块�熷害锛坢m/s锛�")
+ private Integer lineSpeed;
+
+ @Schema(description = "鐜荤拑闀垮害锛坢m锛�")
+ private Integer glassLength;
+
+ @Schema(description = "缂撳瓨鏁伴噺/妲戒綅鏁伴噺")
+ private Integer bufferCount;
+
+ @Schema(description = "鏄惁鑷姩瑙﹀彂PLC璇锋眰")
+ private Boolean autoRequest;
+
+ @Schema(description = "PLC璇锋眰瀛楁鍚�", defaultValue = "plcRequest")
+ private String requestField = "plcRequest";
+
+ @Schema(description = "杩涚墖浣嶇疆瀛楁鍚�", defaultValue = "inPosition")
+ private String positionField = "inPosition";
+
+ @Schema(description = "鐜荤拑鏁伴噺瀛楁鍚�", defaultValue = "plcGlassCount")
+ private String glassCountField = "plcGlassCount";
+
+ @Schema(description = "鐜荤拑ID妲戒綅瀛楁瀹氫箟")
+ private List<GlassSlot> glassSlots;
+
+ @Schema(description = "浣嶇疆鏄犲皠锛屽锛歿 \"station1\":1 }")
+ private Map<String, Integer> positionMappings;
+
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Builder
+ @Schema(name = "GlassSlot", description = "鐜荤拑ID妲戒綅")
+ public static class GlassSlot implements Serializable {
+ @Schema(description = "妲戒綅搴忓彿锛屼粠1寮�濮�")
+ private Integer order;
+
+ @Schema(description = "PLC瀛楁鍚嶏紝渚嬪 plcGlassId1")
+ private String field;
+
+ @Schema(description = "瀛楁闀垮害锛屽瓧绗︿覆闀垮害绛�")
+ private Integer length;
+
+ @Schema(description = "妲戒綅鎻忚堪")
+ private String description;
+ }
+}
+
--
Gitblit v1.8.0