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/entity/PlcTestTask.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcTestTask.java b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcTestTask.java
new file mode 100644
index 0000000..1b6833f
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcTestTask.java
@@ -0,0 +1,89 @@
+package com.mes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * PLC娴嬭瘯浠诲姟琛�
+ *
+ * @author huang
+ * @date 2025/10/31
+ */
+@Data
+@TableName("plc_test_task")
+public class PlcTestTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 鍏宠仈鐨勯」鐩甀D锛堝閿級
+ */
+ private String projectId;
+
+ /**
+ * 妯″潡鍚嶇О
+ */
+ private String module;
+
+ /**
+ * 鎿嶄綔妯″紡锛歁ANUAL|AUTOMATIC
+ */
+ private String operationMode;
+
+ /**
+ * 閫変腑鐨勫瓧娈靛垪琛紙JSON鏍煎紡锛�
+ */
+ private String selectedFields;
+
+ /**
+ * 浠诲姟鐘舵�侊細PENDING|RUNNING|SUCCESS|FAILED|STOPPED
+ */
+ private String status;
+
+ /**
+ * 浠诲姟寮�濮嬫椂闂�
+ */
+ private Date startTime;
+
+ /**
+ * 浠诲姟缁撴潫鏃堕棿
+ */
+ private Date endTime;
+
+ /**
+ * 鑰楁椂锛堟绉掞級
+ */
+ private Integer duration;
+
+ /**
+ * 娴嬭瘯缁撴灉鏁版嵁锛圝SON鏍煎紡锛�
+ */
+ private String result;
+
+ /**
+ * 閿欒淇℃伅
+ */
+ private String errorMessage;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createdAt;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updatedAt;
+}
--
Gitblit v1.8.0