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/request/DeviceConfigRequest.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceConfigRequest.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceConfigRequest.java
new file mode 100644
index 0000000..ca837d1
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceConfigRequest.java
@@ -0,0 +1,64 @@
+package com.mes.device.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璁惧閰嶇疆鎿嶄綔璇锋眰浣�
+ *
+ * @author mes
+ * @since 2025-07-12
+ */
+@Data
+@Schema(description = "璁惧閰嶇疆鎿嶄綔璇锋眰浣�")
+public class DeviceConfigRequest {
+
+ @Schema(description = "璁惧ID", example = "1")
+ private Long deviceId;
+
+ @Schema(description = "璁惧閰嶇疆淇℃伅")
+ private Object deviceConfig;
+
+ @Schema(description = "璁惧ID鍒楄〃")
+ private List<Long> deviceIds;
+
+ @Schema(description = "椤圭洰ID", example = "1")
+ private Long projectId;
+
+ @Schema(description = "璁惧绫诲瀷", example = "1")
+ private String deviceType;
+
+ @Schema(description = "璁惧鐘舵��", example = "1")
+ private String deviceStatus;
+
+ @Schema(description = "鎼滅储鍏抽敭璇�", example = "璁惧1")
+ private String keyword;
+
+ @Schema(description = "璁惧缂栫爜", example = "DEVICE001")
+ private String deviceCode;
+
+ @Schema(description = "椤电爜", example = "1")
+ private Integer page;
+
+ @Schema(description = "姣忛〉澶у皬", example = "10")
+ private Integer size;
+
+ // 鏋勯�犲嚱鏁�
+ public DeviceConfigRequest() {
+ }
+
+ public DeviceConfigRequest(Long deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public DeviceConfigRequest(Long deviceId, Object deviceConfig) {
+ this.deviceId = deviceId;
+ this.deviceConfig = deviceConfig;
+ }
+
+ public DeviceConfigRequest(List<Long> deviceIds) {
+ this.deviceIds = deviceIds;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0