From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceConfigRequest.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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
index ca837d1..1c7940e 100644
--- 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
@@ -1,6 +1,7 @@
package com.mes.device.request;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -12,49 +13,49 @@
* @since 2025-07-12
*/
@Data
-@Schema(description = "璁惧閰嶇疆鎿嶄綔璇锋眰浣�")
+@ApiModel(description = "璁惧閰嶇疆鎿嶄綔璇锋眰浣�")
public class DeviceConfigRequest {
- @Schema(description = "璁惧ID", example = "1")
- private Long deviceId;
+ @ApiModelProperty(value = "璁惧ID", example = "1")
+ private Long id;
- @Schema(description = "璁惧閰嶇疆淇℃伅")
+ @ApiModelProperty(value = "璁惧閰嶇疆淇℃伅")
private Object deviceConfig;
- @Schema(description = "璁惧ID鍒楄〃")
+ @ApiModelProperty(value = "璁惧ID鍒楄〃")
private List<Long> deviceIds;
- @Schema(description = "椤圭洰ID", example = "1")
+ @ApiModelProperty(value = "椤圭洰ID", example = "1")
private Long projectId;
- @Schema(description = "璁惧绫诲瀷", example = "1")
+ @ApiModelProperty(value = "璁惧绫诲瀷", example = "1")
private String deviceType;
- @Schema(description = "璁惧鐘舵��", example = "1")
+ @ApiModelProperty(value = "璁惧鐘舵��", example = "1")
private String deviceStatus;
- @Schema(description = "鎼滅储鍏抽敭璇�", example = "璁惧1")
+ @ApiModelProperty(value = "鎼滅储鍏抽敭璇�", example = "璁惧1")
private String keyword;
- @Schema(description = "璁惧缂栫爜", example = "DEVICE001")
+ @ApiModelProperty(value = "璁惧缂栫爜", example = "DEVICE001")
private String deviceCode;
- @Schema(description = "椤电爜", example = "1")
+ @ApiModelProperty(value = "椤电爜", example = "1")
private Integer page;
- @Schema(description = "姣忛〉澶у皬", example = "10")
+ @ApiModelProperty(value = "姣忛〉澶у皬", example = "10")
private Integer size;
// 鏋勯�犲嚱鏁�
public DeviceConfigRequest() {
}
- public DeviceConfigRequest(Long deviceId) {
- this.deviceId = deviceId;
+ public DeviceConfigRequest(Long id) {
+ this.id = id;
}
- public DeviceConfigRequest(Long deviceId, Object deviceConfig) {
- this.deviceId = deviceId;
+ public DeviceConfigRequest(Long id, Object deviceConfig) {
+ this.id = id;
this.deviceConfig = deviceConfig;
}
--
Gitblit v1.8.0