From bea49667b0a34a17490c4b47f6a14857a737f647 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 17 七月 2024 08:47:31 +0800
Subject: [PATCH] 新增生产日志历史表,每天00:05把生产日志表中的数据移动到历史表中
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 224 +++++++++++++++++++++++++------------------------------
1 files changed, 103 insertions(+), 121 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 73fb711..e11151c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -1,142 +1,124 @@
package com.dy.pmsGlobal.pojoSta;
-import java.io.Serializable;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
import java.util.Date;
-import lombok.Data;
+import java.util.List;
/**
- * 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
- * @TableName sta_assembly_work_last
- */
+* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
+* @TableName sta_assembly_work_last
+*/
+@TableName(value="sta_assembly_work_last", autoResultMap = true)
@Data
-public class StaAssemblyWorkLast implements Serializable {
- /**
- *
- */
- private Long id;
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaAssemblyWorkLast implements BaseEntity {
/**
- * 鐢ㄦ埛瀹炰綋缂栧彿
- */
- private Long userId;
+ *
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id;
+ /**
+ * 鐢ㄦ埛瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢ㄦ埛瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long userId;
+
+ @TableField(exist = false)
+ public String userName;
+ /**
+ * 鐢熶骇绾垮疄浣撶紪鍙�
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long lineId;
+
+ @TableField(exist = false)
+ public String lineName;
+ /**
+ * 宸ョ珯瀹炰綋缂栧彿
+ */
+ @NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long stationId;
+
+ @TableField(exist = false)
+ public String stationName;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long proId;
+
+ @TableField(exist = false)
+ public String proName;
+
+ @TableField(exist = false)
+ public String devicePrefix;
/**
- * 鐢熶骇绾垮疄浣撶紪鍙�
- */
- private Long lineId;
+ * 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
+ */
+ @NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long planId;
+
+ @TableField(exist = false)
+ public String planName;
/**
- * 宸ョ珯瀹炰綋缂栧彿
- */
- private Long stationId;
+ * 鐢熶骇娴佺▼瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long processId;
+
+ @TableField(exist = false)
+ public String processName;
+ /**
+ * 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long nodeId;
+
+ @TableField(exist = false)
+ public String nodeName;
+
+ public Integer workType;
/**
- * 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
- */
- private Long planId;
-
+ * 浠诲姟璁ら鏃堕棿
+ */
+ public Date dt;
/**
- * 鐢熶骇娴佺▼瀹炰綋缂栧彿
- */
- private Long processId;
-
+ * 鐘舵��:姝ｅ父(1)銆佺粨鏉�(0)
+ */
+ public Integer status;
/**
- * 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
- */
- private Long nodeId;
-
+ * 寮�濮嬫椂闂�
+ */
+ public Date startTime;
/**
- * 浠诲姟璁ら鏃堕棿
- */
- private Date dt;
-
+ * 缁撴潫鏃堕棿
+ */
+ public Date endTime;
/**
- * 鐘舵��:姝ｅ父(1)銆佺粨鏉�(0)
- */
- private Integer status;
+ * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
+ */
+ public String assistants;
- /**
- * 寮�濮嬫椂闂�
- */
- private Date startTime;
+ @TableField(exist = false)
+ public List<BaUser> assistantsList;
- /**
- * 缁撴潫鏃堕棿
- */
- private Date endTime;
- /**
- * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
- */
- private String assistants;
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean equals(Object that) {
- if (this == that) {
- return true;
- }
- if (that == null) {
- return false;
- }
- if (getClass() != that.getClass()) {
- return false;
- }
- StaAssemblyWorkLast other = (StaAssemblyWorkLast) that;
- return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
- && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
- && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
- && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
- && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
- && (this.getProcessId() == null ? other.getProcessId() == null : this.getProcessId().equals(other.getProcessId()))
- && (this.getNodeId() == null ? other.getNodeId() == null : this.getNodeId().equals(other.getNodeId()))
- && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
- && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
- && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
- && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
- && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()));
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
- result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
- result = prime * result + ((getLineId() == null) ? 0 : getLineId().hashCode());
- result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
- result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
- result = prime * result + ((getProcessId() == null) ? 0 : getProcessId().hashCode());
- result = prime * result + ((getNodeId() == null) ? 0 : getNodeId().hashCode());
- result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
- result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
- result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
- result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
- result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
- return result;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", id=").append(id);
- sb.append(", userId=").append(userId);
- sb.append(", lineId=").append(lineId);
- sb.append(", stationId=").append(stationId);
- sb.append(", planId=").append(planId);
- sb.append(", processId=").append(processId);
- sb.append(", nodeId=").append(nodeId);
- sb.append(", dt=").append(dt);
- sb.append(", status=").append(status);
- sb.append(", startTime=").append(startTime);
- sb.append(", endTime=").append(endTime);
- sb.append(", assistants=").append(assistants);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0