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/DeviceInteractionExecution.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionExecution.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionExecution.java
index 4c61d26..b6265ac 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionExecution.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionExecution.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,110 +16,110 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("device_interaction_execution")
-@Schema(name = "DeviceInteractionExecution", description = "璁惧浜や簰鎵ц璁板綍")
+@ApiModel(value = "DeviceInteractionExecution", description = "璁惧浜や簰鎵ц璁板綍")
public class DeviceInteractionExecution {
- @Schema(description = "鎵ц璁板綍ID", example = "1")
+ @ApiModelProperty(value = "鎵ц璁板綍ID", example = "1")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "鍏宠仈鐨勪氦浜掗�昏緫ID", example = "1")
+ @ApiModelProperty(value = "鍏宠仈鐨勪氦浜掗�昏緫ID", example = "1")
@TableField("logic_id")
private Long logicId;
- @Schema(description = "璁惧缁処D", example = "1")
+ @ApiModelProperty(value = "璁惧缁処D", example = "1")
@TableField("group_id")
private Long groupId;
- @Schema(description = "鎵�灞為」鐩甀D", example = "1")
+ @ApiModelProperty(value = "鎵�灞為」鐩甀D", example = "1")
@TableField("project_id")
private Long projectId;
- @Schema(description = "鎵ц鎵规鍙�", example = "EXEC_20241030_001")
+ @ApiModelProperty(value = "鎵ц鎵规鍙�", example = "EXEC_20241030_001")
@TableField("batch_no")
private String batchNo;
- @Schema(description = "鎵ц鐘舵�侊細0-绛夊緟锛�1-鎵ц涓紝2-鎴愬姛锛�3-澶辫触锛�4-瓒呮椂锛�5-鍙栨秷", example = "0")
+ @ApiModelProperty(value = "鎵ц鐘舵�侊細0-绛夊緟锛�1-鎵ц涓紝2-鎴愬姛锛�3-澶辫触锛�4-瓒呮椂锛�5-鍙栨秷", example = "0")
@TableField("status")
private Integer status;
- @Schema(description = "鎵ц妯″紡锛�1-鎵嬪姩锛�2-鑷姩锛�3-瀹氭椂", example = "2")
+ @ApiModelProperty(value = "鎵ц妯″紡锛�1-鎵嬪姩锛�2-鑷姩锛�3-瀹氭椂", example = "2")
@TableField("execution_mode")
private Integer executionMode;
- @Schema(description = "寮�濮嬫墽琛屾椂闂�")
+ @ApiModelProperty(value = "寮�濮嬫墽琛屾椂闂�")
@TableField("start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
- @Schema(description = "缁撴潫鎵ц鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鎵ц鏃堕棿")
@TableField("end_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- @Schema(description = "鎵ц鑰楁椂(姣)", example = "25000")
+ @ApiModelProperty(value = "鎵ц鑰楁椂(姣)", example = "25000")
@TableField("execution_duration")
private Long executionDuration;
- @Schema(description = "鎵ц杩涘害锛�0-100", example = "80")
+ @ApiModelProperty(value = "鎵ц杩涘害锛�0-100", example = "80")
@TableField("progress")
private Integer progress;
- @Schema(description = "褰撳墠鎵ц鐨勬楠ゅ簭鍙�", example = "3")
+ @ApiModelProperty(value = "褰撳墠鎵ц鐨勬楠ゅ簭鍙�", example = "3")
@TableField("current_step")
private Integer currentStep;
- @Schema(description = "鎬绘楠ゆ暟", example = "10")
+ @ApiModelProperty(value = "鎬绘楠ゆ暟", example = "10")
@TableField("total_steps")
private Integer totalSteps;
- @Schema(description = "鎴愬姛鎵ц鐨勮澶囨暟閲�", example = "3")
+ @ApiModelProperty(value = "鎴愬姛鎵ц鐨勮澶囨暟閲�", example = "3")
@TableField("success_devices")
private Integer successDevices;
- @Schema(description = "澶辫触鐨勮澶囨暟閲�", example = "0")
+ @ApiModelProperty(value = "澶辫触鐨勮澶囨暟閲�", example = "0")
@TableField("failed_devices")
private Integer failedDevices;
- @Schema(description = "瑙﹀彂鎵ц鐨勬搷浣滀汉", example = "admin")
+ @ApiModelProperty(value = "瑙﹀彂鎵ц鐨勬搷浣滀汉", example = "admin")
@TableField("triggered_by")
private String triggeredBy;
- @Schema(description = "鎵ц缁撴灉鎻忚堪", example = "鎵�鏈夎澶囨垚鍔熷畬鎴愯嚜鍔ㄥ寲娴嬭瘯")
+ @ApiModelProperty(value = "鎵ц缁撴灉鎻忚堪", example = "鎵�鏈夎澶囨垚鍔熷畬鎴愯嚜鍔ㄥ寲娴嬭瘯")
@TableField("result_message")
private String resultMessage;
- @Schema(description = "閿欒淇℃伅JSON", example = "{\"deviceId\": 2, \"error\": \"Connection timeout\"}")
+ @ApiModelProperty(value = "閿欒淇℃伅JSON", example = "{\"deviceId\": 2, \"error\": \"Connection timeout\"}")
@TableField("error_details")
private String errorDetails;
- @Schema(description = "鎵ц鏁版嵁缁熻JSON", example = "{\"totalTime\": 25000, \"avgResponseTime\": 120}")
+ @ApiModelProperty(value = "鎵ц鏁版嵁缁熻JSON", example = "{\"totalTime\": 25000, \"avgResponseTime\": 120}")
@TableField("execution_stats")
private String executionStats;
- @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"testDataId\": \"TD_001\", \"environment\": \"prod\"}")
+ @ApiModelProperty(value = "鎵╁睍鍙傛暟JSON", example = "{\"testDataId\": \"TD_001\", \"environment\": \"prod\"}")
@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