فهرست منبع

实时更新已经不对数据进行比较,所以删除equals方法

sunyj 9 سال پیش
والد
کامیت
a96470af7a

+ 0 - 14
search-console/src/main/java/com/uas/search/console/model/BrandSimpleInfo.java

@@ -1,7 +1,6 @@
 package com.uas.search.console.model;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -80,19 +79,6 @@ public class BrandSimpleInfo implements Serializable {
 		this.nameEn = nameEn;
 	}
 
-	@Override
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass() || !(otherObject instanceof BrandSimpleInfo)) {
-			return false;
-		}
-		BrandSimpleInfo other = (BrandSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(uuid, other.getUuid())
-				&& Objects.equals(nameCn, other.getNameCn()) && Objects.equals(nameEn, other.getNameEn());
-	}
-
 	@Override
 	public String toString() {
 		return "BrandSimpleInfo [id=" + id + ", uuid=" + uuid + ", nameCn=" + nameCn + ", nameEn=" + nameEn + "]";

+ 0 - 18
search-console/src/main/java/com/uas/search/console/model/ComponentSimpleInfo.java

@@ -1,7 +1,6 @@
 package com.uas.search.console.model;
 
 import java.io.Serializable;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -176,23 +175,6 @@ public class ComponentSimpleInfo implements Serializable {
 		this.properties = properties;
 	}
 
-	@Override
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof ComponentSimpleInfo)) {
-			return false;
-		}
-		ComponentSimpleInfo other = (ComponentSimpleInfo) otherObject;
-		// 不比较属性值
-		// code写入索引时转为了小写
-		return Objects.equals(id, other.getId()) && Objects.equals(uuid, other.getUuid())
-				&& Objects.equals(code, other.getCode().toLowerCase()) && Objects.equals(kindid, other.getKindid())
-				&& Objects.equals(brandid, other.getBrandid());
-	}
-
 	@Override
 	public String toString() {
 		return "ComponentSimpleInfo [id=" + id + ", uuid=" + uuid + ", code=" + code + ", kindid=" + kindid

+ 0 - 10
search-console/src/main/java/com/uas/search/console/model/EnterpriseSimpleInfo.java

@@ -3,7 +3,6 @@
 package com.uas.search.console.model;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -51,15 +50,6 @@ public class EnterpriseSimpleInfo implements Serializable {
 		this.enName = enName;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject || otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof EnterpriseSimpleInfo)) {
-			return true;
-		}
-		EnterpriseSimpleInfo other = (EnterpriseSimpleInfo) otherObject;
-		return Objects.equals(uu, other.getUu()) && Objects.equals(enName, other.getEnName());
-	}
-
 	@Override
 	public String toString() {
 		return "EnterpriseSimpleInfo [uu=" + uu + ", enName=" + enName + "]";

+ 0 - 15
search-console/src/main/java/com/uas/search/console/model/KindSimpleInfo.java

@@ -1,7 +1,6 @@
 package com.uas.search.console.model;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -80,20 +79,6 @@ public class KindSimpleInfo implements Serializable {
 		this.isLeaf = isLeaf;
 	}
 
-	// TODO 实时更新不对数据进行比较,equals方法需要删除
-	@Override
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass() || !(otherObject instanceof KindSimpleInfo)) {
-			return false;
-		}
-		KindSimpleInfo other = (KindSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(nameCn, other.getNameCn())
-				&& Objects.equals(level, other.getLevel()) && Objects.equals(isLeaf, other.getIsLeaf());
-	}
-
 	@Override
 	public String toString() {
 		return "KindSimpleInfo [id=" + id + ", nameCn=" + nameCn + ", level=" + level + ", isLeaf=" + isLeaf + "]";

+ 0 - 17
search-console/src/main/java/com/uas/search/console/model/OrderDetailSimpleInfo.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.model;
 
-import java.util.Objects;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -113,21 +111,6 @@ public class OrderDetailSimpleInfo {
 		this.status = status;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof OrderDetailSimpleInfo)) {
-			return false;
-		}
-		OrderDetailSimpleInfo other = (OrderDetailSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(detno, other.getDetno()) && Objects.equals(cmpCode, other.getCmpCode())
-				&& Objects.equals(kiName, other.getKiName()) && Objects.equals(brName, other.getBrName())
-				&& Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "OrderDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode

+ 0 - 17
search-console/src/main/java/com/uas/search/console/model/OrderInvoiceDetailSimpleInfo.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.model;
 
-import java.util.Objects;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -113,21 +111,6 @@ public class OrderInvoiceDetailSimpleInfo {
 		this.status = status;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof OrderInvoiceDetailSimpleInfo)) {
-			return false;
-		}
-		OrderInvoiceDetailSimpleInfo other = (OrderInvoiceDetailSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(detno, other.getDetno()) && Objects.equals(cmpCode, other.getCmpCode())
-				&& Objects.equals(kiName, other.getKiName()) && Objects.equals(brName, other.getBrName())
-				&& Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "OrderInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode

+ 0 - 16
search-console/src/main/java/com/uas/search/console/model/OrderInvoiceSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -147,21 +146,6 @@ public class OrderInvoiceSimpleInfo implements Serializable {
 		this.details = details;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof OrderInvoiceSimpleInfo)) {
-			return false;
-		}
-		OrderInvoiceSimpleInfo other = (OrderInvoiceSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(buyeruu, other.getBuyeruu()) && Objects.equals(buyername, other.getBuyername())
-				&& Objects.equals(buyerEnterprise, other.getBuyerEnterprise())
-				&& Objects.equals(createtime, other.getCreatetime()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "OrderInvoiceSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername="

+ 0 - 16
search-console/src/main/java/com/uas/search/console/model/OrderSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -167,21 +166,6 @@ public class OrderSimpleInfo implements Serializable {
 		this.details = details;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass() || !(otherObject instanceof OrderSimpleInfo)) {
-			return false;
-		}
-		OrderSimpleInfo other = (OrderSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(buyeruu, other.getBuyeruu()) && Objects.equals(buyername, other.getBuyername())
-				&& Objects.equals(buyerEnterprise, other.getBuyerEnterprise())
-				&& Objects.equals(sellerEnterprise, other.getSellerEnterprise())
-				&& Objects.equals(createtime, other.getCreatetime()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "OrderSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername=" + buyername

+ 0 - 17
search-console/src/main/java/com/uas/search/console/model/PurchaseDetailSimpleInfo.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.model;
 
-import java.util.Objects;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -113,21 +111,6 @@ public class PurchaseDetailSimpleInfo {
 		this.status = status;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseDetailSimpleInfo)) {
-			return false;
-		}
-		PurchaseDetailSimpleInfo other = (PurchaseDetailSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(detno, other.getDetno()) && Objects.equals(cmpCode, other.getCmpCode())
-				&& Objects.equals(kiName, other.getKiName()) && Objects.equals(brName, other.getBrName())
-				&& Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode

+ 0 - 17
search-console/src/main/java/com/uas/search/console/model/PurchaseInvoiceDetailSimpleInfo.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.model;
 
-import java.util.Objects;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -113,21 +111,6 @@ public class PurchaseInvoiceDetailSimpleInfo {
 		this.status = status;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseInvoiceDetailSimpleInfo)) {
-			return false;
-		}
-		PurchaseInvoiceDetailSimpleInfo other = (PurchaseInvoiceDetailSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(detno, other.getDetno()) && Objects.equals(cmpCode, other.getCmpCode())
-				&& Objects.equals(kiName, other.getKiName()) && Objects.equals(brName, other.getBrName())
-				&& Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode="

+ 0 - 16
search-console/src/main/java/com/uas/search/console/model/PurchaseInvoiceSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -131,21 +130,6 @@ public class PurchaseInvoiceSimpleInfo implements Serializable {
 		this.details = details;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseInvoiceSimpleInfo)) {
-			return false;
-		}
-		PurchaseInvoiceSimpleInfo other = (PurchaseInvoiceSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sellerenuu, other.getSellerenuu())
-				&& Objects.equals(sellerenname, other.getSellerenname())
-				&& Objects.equals(createtime, other.getCreatetime()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseInvoiceSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu

+ 1 - 16
search-console/src/main/java/com/uas/search/console/model/PurchaseSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -28,6 +27,7 @@ public class PurchaseSimpleInfo implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
+	@Column(name = "id")
 	private Long id;
 
 	/**
@@ -129,21 +129,6 @@ public class PurchaseSimpleInfo implements Serializable {
 		this.details = details;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseSimpleInfo)) {
-			return false;
-		}
-		PurchaseSimpleInfo other = (PurchaseSimpleInfo) otherObject;
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sellerenuu, other.getSellerenuu())
-				&& Objects.equals(sellerenname, other.getSellerenname())
-				&& Objects.equals(createtime, other.getCreatetime()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu + ", sellerenname="