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/entity/DeviceInteractionExecution.java | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 insertions(+), 0 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
new file mode 100644
index 0000000..4c61d26
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionExecution.java
@@ -0,0 +1,142 @@
+package com.mes.device.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 璁惧浜や簰鎵ц璁板綍瀹炰綋绫�
+ * 瀵瑰簲鏁版嵁搴撹〃锛歞evice_interaction_execution
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("device_interaction_execution")
+@Schema(name = "DeviceInteractionExecution", description = "璁惧浜や簰鎵ц璁板綍")
+public class DeviceInteractionExecution {
+
+ @Schema(description = "鎵ц璁板綍ID", example = "1")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @Schema(description = "鍏宠仈鐨勪氦浜掗�昏緫ID", example = "1")
+ @TableField("logic_id")
+ private Long logicId;
+
+ @Schema(description = "璁惧缁処D", example = "1")
+ @TableField("group_id")
+ private Long groupId;
+
+ @Schema(description = "鎵�灞為」鐩甀D", example = "1")
+ @TableField("project_id")
+ private Long projectId;
+
+ @Schema(description = "鎵ц鎵规鍙�", example = "EXEC_20241030_001")
+ @TableField("batch_no")
+ private String batchNo;
+
+ @Schema(description = "鎵ц鐘舵�侊細0-绛夊緟锛�1-鎵ц涓紝2-鎴愬姛锛�3-澶辫触锛�4-瓒呮椂锛�5-鍙栨秷", example = "0")
+ @TableField("status")
+ private Integer status;
+
+ @Schema(description = "鎵ц妯″紡锛�1-鎵嬪姩锛�2-鑷姩锛�3-瀹氭椂", example = "2")
+ @TableField("execution_mode")
+ private Integer executionMode;
+
+ @Schema(description = "寮�濮嬫墽琛屾椂闂�")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @Schema(description = "缁撴潫鎵ц鏃堕棿")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ @Schema(description = "鎵ц鑰楁椂(姣)", example = "25000")
+ @TableField("execution_duration")
+ private Long executionDuration;
+
+ @Schema(description = "鎵ц杩涘害锛�0-100", example = "80")
+ @TableField("progress")
+ private Integer progress;
+
+ @Schema(description = "褰撳墠鎵ц鐨勬楠ゅ簭鍙�", example = "3")
+ @TableField("current_step")
+ private Integer currentStep;
+
+ @Schema(description = "鎬绘楠ゆ暟", example = "10")
+ @TableField("total_steps")
+ private Integer totalSteps;
+
+ @Schema(description = "鎴愬姛鎵ц鐨勮澶囨暟閲�", example = "3")
+ @TableField("success_devices")
+ private Integer successDevices;
+
+ @Schema(description = "澶辫触鐨勮澶囨暟閲�", example = "0")
+ @TableField("failed_devices")
+ private Integer failedDevices;
+
+ @Schema(description = "瑙﹀彂鎵ц鐨勬搷浣滀汉", example = "admin")
+ @TableField("triggered_by")
+ private String triggeredBy;
+
+ @Schema(description = "鎵ц缁撴灉鎻忚堪", example = "鎵�鏈夎澶囨垚鍔熷畬鎴愯嚜鍔ㄥ寲娴嬭瘯")
+ @TableField("result_message")
+ private String resultMessage;
+
+ @Schema(description = "閿欒淇℃伅JSON", example = "{\"deviceId\": 2, \"error\": \"Connection timeout\"}")
+ @TableField("error_details")
+ private String errorDetails;
+
+ @Schema(description = "鎵ц鏁版嵁缁熻JSON", example = "{\"totalTime\": 25000, \"avgResponseTime\": 120}")
+ @TableField("execution_stats")
+ private String executionStats;
+
+ @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"testDataId\": \"TD_001\", \"environment\": \"prod\"}")
+ @TableField("extra_params")
+ private String extraParams;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ @TableField(value = "created_time", fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createdTime;
+
+ @Schema(description = "鏇存柊鏃堕棿")
+ @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updatedTime;
+
+ @Schema(description = "鍒涘缓浜�", example = "system")
+ @TableField(value = "created_by", fill = FieldFill.INSERT)
+ private String createdBy;
+
+ @Schema(description = "鏇存柊浜�", example = "system")
+ @TableField(value = "updated_by", fill = FieldFill.INSERT_UPDATE)
+ private String updatedBy;
+
+ @Schema(description = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
+ @TableField("is_deleted")
+ @TableLogic
+ private Integer isDeleted;
+
+ // 鎵ц鐘舵�佹灇涓�
+ public static final class Status {
+ public static final int WAITING = 0; // 绛夊緟
+ public static final int RUNNING = 1; // 鎵ц涓�
+ public static final int SUCCESS = 2; // 鎴愬姛
+ public static final int FAILED = 3; // 澶辫触
+ public static final int TIMEOUT = 4; // 瓒呮椂
+ public static final int CANCELLED = 5; // 鍙栨秷
+ }
+
+ // 鎵ц妯″紡鏋氫妇
+ public static final class ExecutionMode {
+ public static final int MANUAL = 1; // 鎵嬪姩
+ public static final int AUTOMATIC = 2; // 鑷姩
+ public static final int SCHEDULED = 3; // 瀹氭椂
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0