注册相关请求操作

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@307 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -9,9 +9,12 @@ import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
@@ -39,7 +42,9 @@ public class Enterprise implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@Column(name = "en_uu", unique = true)
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "enterprises_gen")
+	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
+	@Column(name = "en_uu")
 	private Long uu;
 	/**
 	 * 公司名称
@@ -96,13 +101,13 @@ public class Enterprise implements Serializable {
 	 * 商业登记证号
 	 */
 	@Column(name = "en_businesscode")
-	private String enBusinesscode;
+	private String enBussinessCode;
 	/**
 	 * 营业执照图片路径id
 	 */
 	@OneToOne(cascade = { CascadeType.ALL })
 	@JoinColumn(name = "en_bussinesscodeattach")
-	private Attach enBussinesscodeAttach;
+	private Attach enBussinessCodeAttach;
 	/**
 	 * 纳税人识别号
 	 */
@@ -132,6 +137,12 @@ public class Enterprise implements Serializable {
 
 	@Transient
 	private User admin;
+	
+	@Transient
+	private String enAdminTel;
+	
+	@Transient
+	private String enAdminEmail;
 
 	public Long getEnAdminuu() {
 		return enAdminuu;
@@ -223,12 +234,12 @@ public class Enterprise implements Serializable {
 		this.enCorporation = enCorporation;
 	}
 
-	public String getEnBusinesscode() {
-		return enBusinesscode;
+	public String getEnBussinessCode() {
+		return enBussinessCode;
 	}
 
-	public void setEnBusinesscode(String enBusinesscode) {
-		this.enBusinesscode = enBusinesscode;
+	public void setEnBussinessCode(String enBussinessCode) {
+		this.enBussinessCode = enBussinessCode;
 	}
 
 	public String getEnTaxcode() {
@@ -287,12 +298,28 @@ public class Enterprise implements Serializable {
 		this.enEmail = enEmail;
 	}
 
-	public Attach getEnBussinesscodeAttach() {
-		return enBussinesscodeAttach;
+	public Attach getEnBussinessCodeAttach() {
+		return enBussinessCodeAttach;
+	}
+
+	public void setEnBussinessCodeAttach(Attach enBussinessCodeAttach) {
+		this.enBussinessCodeAttach = enBussinessCodeAttach;
+	}
+
+	public String getEnAdminTel() {
+		return enAdminTel;
+	}
+
+	public void setEnAdminTel(String enAdminTel) {
+		this.enAdminTel = enAdminTel;
+	}
+
+	public String getEnAdminEmail() {
+		return enAdminEmail;
 	}
 
-	public void setEnBussinesscodeAttach(Attach enBussinesscodeAttach) {
-		this.enBussinesscodeAttach = enBussinesscodeAttach;
+	public void setEnAdminEmail(String enAdminEmail) {
+		this.enAdminEmail = enAdminEmail;
 	}
 
 	@JsonIgnore

src/main/java/com/uas/platform/b2b/model/User.java

@@ -7,11 +7,14 @@ import javax.persistence.CascadeType;
 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.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OrderBy;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -41,7 +44,9 @@ public class User implements Serializable {
 	}
 
 	@Id
-	@Column(unique = true, name = "user_uu")
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
+	@SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)
+	@Column(name = "user_uu")
 	private Long userUU;
 
 	@Column(name = "user_name", length = 50)
@@ -75,7 +80,7 @@ public class User implements Serializable {
 	/**
 	 * 所属公司
 	 */
-	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@ManyToMany(cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
 	@JoinTable(name = "sec$userenterprise", joinColumns = @JoinColumn(name = "user_uu", referencedColumnName = "user_uu"), inverseJoinColumns = @JoinColumn(name = "en_uu", referencedColumnName = "en_uu"))
 	@OrderBy("uu")
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@@ -216,5 +221,17 @@ public class User implements Serializable {
 	public void setRoles(Set<Role> roles) {
 		this.roles = roles;
 	}
+	
+	public void addEnterprise(Enterprise enterprise){
+		if(!this.enterprises.contains(enterprise)) {
+			this.enterprises.add(enterprise);
+		}
+	}
+	
+	public void removeEnterprise(Enterprise enterprise) {
+		if(this.enterprises.contains(enterprise)) {
+			this.enterprises.remove(enterprise);
+		}
+	}
 
 }