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/DeviceGroupRequest.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceGroupRequest.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceGroupRequest.java
index 187aa9e..92d1526 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceGroupRequest.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/request/DeviceGroupRequest.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,25 +13,25 @@
* @since 2025-07-12
*/
@Data
-@Schema(description = "璁惧缁勬搷浣滆姹備綋")
+@ApiModel(description = "璁惧缁勬搷浣滆姹備綋")
public class DeviceGroupRequest {
- @Schema(description = "璁惧缁処D", example = "1")
+ @ApiModelProperty(value = "璁惧缁処D", example = "1")
private Long groupId;
- @Schema(description = "璁惧ID", example = "1")
- private Long deviceId;
+ @ApiModelProperty(value = "璁惧ID", example = "1")
+ private Long id;
- @Schema(description = "璁惧ID鍒楄〃")
+ @ApiModelProperty(value = "璁惧ID鍒楄〃")
private List<Long> deviceIds;
- @Schema(description = "璁惧缁処D鍒楄〃")
+ @ApiModelProperty(value = "璁惧缁処D鍒楄〃")
private List<Long> groupIds;
- @Schema(description = "璁惧缁勯厤缃俊鎭�")
+ @ApiModelProperty(value = "璁惧缁勯厤缃俊鎭�")
private Object groupConfig;
- @Schema(description = "璁惧瑙掕壊", example = "MEMBER")
+ @ApiModelProperty(value = "璁惧瑙掕壊", example = "MEMBER")
private String deviceRole;
// 鏋勯�犲嚱鏁�
@@ -41,14 +42,14 @@
this.groupId = groupId;
}
- public DeviceGroupRequest(Long groupId, Long deviceId) {
+ public DeviceGroupRequest(Long groupId, Long id) {
this.groupId = groupId;
- this.deviceId = deviceId;
+ this.id = id;
}
- public DeviceGroupRequest(Long groupId, Long deviceId, String deviceRole) {
+ public DeviceGroupRequest(Long groupId, Long id, String deviceRole) {
this.groupId = groupId;
- this.deviceId = deviceId;
+ this.id = id;
this.deviceRole = deviceRole;
}
--
Gitblit v1.8.0