From 4837d8e606a630945a8150cd8dff3fb0e48f0784 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 20 六月 2024 14:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 216 ++++++++++++++++++-----------------------------------
1 files changed, 73 insertions(+), 143 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index b4ba4e4..c2c7ab5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -1,166 +1,96 @@
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.TableName;
+import com.dy.common.po.BaseEntity;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+
+
import java.util.Date;
-import lombok.Data;
/**
- * 璁惧鏈�鏂扮姸鎬佽〃
- * @TableName sta_device_last
- */
+* 璁惧鏈�鏂扮姸鎬佽〃
+* @TableName sta_device_last
+*/
+@TableName(value="sta_device_last", autoResultMap = true)
@Data
-public class StaDeviceLast implements Serializable {
- /**
- *
- */
- private Long id;
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaDeviceLast implements BaseEntity {
/**
- * 璁惧鐮�
- */
- private String equipNo;
-
+ *
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id;
/**
- * 璁″垝id
- */
- private String planId;
-
+ * 璁惧鐮�
+ */
+ @NotBlank(message="[璁惧鐮乚涓嶈兘涓虹┖")
+ public String equipNo;
/**
- * 宸ョ珯id
- */
- private String stationId;
-
+ * 璁″垝id
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long planId;
/**
- * 褰撳墠鑺傜偣
- */
- private String currNode;
-
+ * 宸ョ珯id
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long stationId;
/**
- * 涓嬩竴鑺傜偣
- */
- private String nextNode;
-
+ * 褰撳墠鑺傜偣
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long currNode;
/**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
- */
- private Integer status;
-
+ * 涓嬩竴鑺傜偣
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long nextNode;
/**
- * 1:鎴愬姛,2:澶辫触
- */
- private Integer result;
-
+ * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
+ */
+ public Integer status;
/**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
- */
- private String errorCode;
-
+ * 1:鎴愬姛,2:澶辫触
+ */
+ public Integer result;
/**
- * 澶囨敞
- */
- private String memo;
-
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
+ */
+ public String errorCode;
/**
- * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
- */
- private String assistants;
-
+ * 澶囨敞
+ */
+ public String memo;
/**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
+ * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
+ */
+ public String assistants;
/**
- *
- */
- private Date updatedDate;
-
+ * 鍒涘缓鏃堕棿
+ */
+ public Date createTime;
/**
- * 鎿嶄綔鍛榠d
- */
- private String updatedBy;
-
+ *
+ */
+ public Date updatedDate;
/**
- * 鍏ョ珯鏃堕棿(涓婁竴鑺傜偣鐨勫嚭绔欐椂闂�)
- */
- private Date inStationTime;
+ * 鎿嶄綔鍛榠d
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long updatedBy;
+ /**
+ * 鍏ョ珯鏃堕棿(涓婁竴鑺傜偣鐨勫嚭绔欐椂闂�)
+ */
+ public Date inStationTime;
- 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;
- }
- StaDeviceLast other = (StaDeviceLast) that;
- return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
- && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
- && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
- && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
- && (this.getCurrNode() == null ? other.getCurrNode() == null : this.getCurrNode().equals(other.getCurrNode()))
- && (this.getNextNode() == null ? other.getNextNode() == null : this.getNextNode().equals(other.getNextNode()))
- && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
- && (this.getResult() == null ? other.getResult() == null : this.getResult().equals(other.getResult()))
- && (this.getErrorCode() == null ? other.getErrorCode() == null : this.getErrorCode().equals(other.getErrorCode()))
- && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
- && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()))
- && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
- && (this.getUpdatedDate() == null ? other.getUpdatedDate() == null : this.getUpdatedDate().equals(other.getUpdatedDate()))
- && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()))
- && (this.getInStationTime() == null ? other.getInStationTime() == null : this.getInStationTime().equals(other.getInStationTime()));
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
- result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
- result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
- result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
- result = prime * result + ((getCurrNode() == null) ? 0 : getCurrNode().hashCode());
- result = prime * result + ((getNextNode() == null) ? 0 : getNextNode().hashCode());
- result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
- result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());
- result = prime * result + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
- result = prime * result + ((getMemo() == null) ? 0 : getMemo().hashCode());
- result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
- result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
- result = prime * result + ((getUpdatedDate() == null) ? 0 : getUpdatedDate().hashCode());
- result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
- result = prime * result + ((getInStationTime() == null) ? 0 : getInStationTime().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(", equipNo=").append(equipNo);
- sb.append(", planId=").append(planId);
- sb.append(", stationId=").append(stationId);
- sb.append(", currNode=").append(currNode);
- sb.append(", nextNode=").append(nextNode);
- sb.append(", status=").append(status);
- sb.append(", result=").append(result);
- sb.append(", errorCode=").append(errorCode);
- sb.append(", memo=").append(memo);
- sb.append(", assistants=").append(assistants);
- sb.append(", createTime=").append(createTime);
- sb.append(", updatedDate=").append(updatedDate);
- sb.append(", updatedBy=").append(updatedBy);
- sb.append(", inStationTime=").append(inStationTime);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0