From 1566e4c7604d85737ea67fe6757e71b8185fa48e Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 18 十一月 2025 16:52:42 +0800
Subject: [PATCH] 添加设备管理页面,添加测试设备任务监控页面

---
 mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java
index b7dedd3..4b9cb7f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java
@@ -2,7 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,64 +16,64 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("device_group_relation")
-@Schema(name = "DeviceGroupRelation", description = "璁惧缁勪笌璁惧鍏宠仈鍏崇郴")
+@ApiModel(value = "DeviceGroupRelation", description = "璁惧缁勪笌璁惧鍏宠仈鍏崇郴")
 public class DeviceGroupRelation {
 
-    @Schema(description = "鍏宠仈ID", example = "1")
+    @ApiModelProperty(value = "鍏宠仈ID", example = "1")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @Schema(description = "璁惧缁処D", example = "1")
+    @ApiModelProperty(value = "璁惧缁処D", example = "1")
     @TableField("group_id")
     private Long groupId;
 
-    @Schema(description = "璁惧ID", example = "1")
+    @ApiModelProperty(value = "璁惧ID", example = "1")
     @TableField("device_id")
     private Long deviceId;
 
-    @Schema(description = "璁惧鍦ㄧ粍鍐呯殑浼樺厛绾э細1-鏈�楂橈紝10-鏈�浣�", example = "1")
+    @ApiModelProperty(value = "璁惧鍦ㄧ粍鍐呯殑浼樺厛绾э細1-鏈�楂橈紝10-鏈�浣�", example = "1")
     @TableField("priority")
     private Integer priority;
 
-    @Schema(description = "璁惧鍦ㄧ粍鍐呯殑瑙掕壊锛�1-涓绘帶锛�2-鍗忎綔锛�3-鐩戞帶", example = "1")
+    @ApiModelProperty(value = "璁惧鍦ㄧ粍鍐呯殑瑙掕壊锛�1-涓绘帶锛�2-鍗忎綔锛�3-鐩戞帶", example = "1")
     @TableField("role")
     private Integer role;
 
-    @Schema(description = "璁惧鍦ㄨ缁勪腑鐨勭姸鎬侊細0-鏈厤缃紝1-姝e父锛�2-鏁呴殰锛�3-缁存姢", example = "1")
+    @ApiModelProperty(value = "璁惧鍦ㄨ缁勪腑鐨勭姸鎬侊細0-鏈厤缃紝1-姝e父锛�2-鏁呴殰锛�3-缁存姢", example = "1")
     @TableField("status")
     private Integer status;
 
-    @Schema(description = "杩炴帴椤哄簭锛氭暟鍊艰秺灏忚秺鍏堣繛鎺�", example = "1")
+    @ApiModelProperty(value = "杩炴帴椤哄簭锛氭暟鍊艰秺灏忚秺鍏堣繛鎺�", example = "1")
     @TableField("connection_order")
     private Integer connectionOrder;
 
-    @Schema(description = "鍏宠仈鎻忚堪", example = "涓绘帶璁惧锛岃礋璐f暣浣撳崗璋�")
+    @ApiModelProperty(value = "鍏宠仈鎻忚堪", example = "涓绘帶璁惧锛岃礋璐f暣浣撳崗璋�")
     @TableField("relation_desc")
     private String relationDesc;
 
-    @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"timeout\": 5000, \"retryPolicy\": \"exponential\"}")
+    @ApiModelProperty(value = "鎵╁睍鍙傛暟JSON", example = "{\"timeout\": 5000, \"retryPolicy\": \"exponential\"}")
     @TableField("extra_params")
     private String extraParams;
 
-    @Schema(description = "鍒涘缓鏃堕棿")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(value = "created_time", fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    @Schema(description = "鏇存柊鏃堕棿")
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
-    @Schema(description = "鍒涘缓浜�", example = "system")
+    @ApiModelProperty(value = "鍒涘缓浜�", example = "system")
     @TableField(value = "created_by", fill = FieldFill.INSERT)
     private String createdBy;
 
-    @Schema(description = "鏇存柊浜�", example = "system")
+    @ApiModelProperty(value = "鏇存柊浜�", example = "system")
     @TableField(value = "updated_by", fill = FieldFill.INSERT_UPDATE)
     private String updatedBy;
 
-    @Schema(description = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
+    @ApiModelProperty(value = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
     @TableField("is_deleted")
     @TableLogic
     private Integer isDeleted;

--
Gitblit v1.8.0