From 36ed2603adfc5fef6fad1d5941020e2533db9405 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 14:37:03 +0800
Subject: [PATCH] 增加平台规则返回

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java |  118 +++++++++++++++++++++++-----------------------------------
 1 files changed, 47 insertions(+), 71 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java
index 399f4e1..29504d7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java
@@ -2,57 +2,71 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
 
 import com.google.gson.annotations.Expose;
 
 /**
- * 锟�?锟斤拷杩斿洖缁欏鎴风鐨勫弬锟�?
+ * 锟�?锟斤拷杩斿洖缁欏鎴风鐨勫弬锟�?
  * 
  * @author Administrator
  *
  */
-@Entity
-@Table(name = "yeshi_ec_system_clientparams",uniqueConstraints={@UniqueConstraint(columnNames={"`name`","`key`", "systemid"})})
-public class SystemClientParams implements Serializable{
+@Table("yeshi_ec_system_clientparams")
+public class SystemClientParams implements Serializable {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
+
 	@Column(name = "id")
-	private long id;
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "systemid")
+	private Long id;
+
+	@Column(name = "systemid")
 	private BusinessSystem system;
-	@Column(name = "`key`", length = 50)
+
+	@Column(name = "key")
 	@Expose
 	private String key;
-	@Column(name = "`value`", length = 1024)
+
 	@Expose
+	@Column(name = "value")
 	private String value;
-	@Column(name = "`name`", length = 50)
-	@Expose
+
+//	@Expose
+	@Column(name = "name")
 	private String name;
-	@Expose
-	private long updatetime;
+
+//	@Expose
+	@Column(name = "updatetime")
+	private Long updatetime;
+
+	@Column(name = "min_version")
+	private Integer minVersion;
+	
+	
+	private String version;
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public Integer getMinVersion() {
+		return minVersion;
+	}
+
+	public void setMinVersion(Integer minVersion) {
+		this.minVersion = minVersion;
+	}
 
 	public SystemClientParams() {
-		// TODO Auto-generated constructor stub
 	}
-	
+
 	public SystemClientParams(BusinessSystem system, String key, String value) {
 		super();
 		this.system = system;
@@ -60,11 +74,11 @@
 		this.value = value;
 	}
 
-	public long getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
@@ -100,49 +114,11 @@
 		this.name = name;
 	}
 
-	public long getUpdatetime() {
+	public Long getUpdatetime() {
 		return updatetime;
 	}
 
-	public void setUpdatetime(long updatetime) {
+	public void setUpdatetime(Long updatetime) {
 		this.updatetime = updatetime;
 	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((key == null) ? 0 : key.hashCode());
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		SystemClientParams other = (SystemClientParams) obj;
-		if (key == null) {
-			if (other.key != null)
-				return false;
-		} else if (!key.equals(other.key))
-			return false;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
-	}
-
 }

--
Gitblit v1.8.0