Merge branch 'feature/用户注册可填写邮箱' into 'wrdp'

[人员组织]用户注册可填写邮箱

See merge request o2oa/o2oa!3483

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java

@@ -36,6 +36,7 @@ class ActionCreate extends BaseAction {
 			String codeAnswer = wi.getCodeAnswer();
 			String captcha = wi.getCaptcha();
 			String captchaAnswer = wi.getCaptchaAnswer();
+			String mail = wi.getMail();
 			if (StringUtils.equals(com.x.base.core.project.config.Person.REGISTER_TYPE_DISABLE,
 					Config.person().getRegister())) {
 				throw new ExceptionDisableRegist();
@@ -52,6 +53,14 @@ class ActionCreate extends BaseAction {
 			if (this.mobileExisted(emc, mobile)) {
 				throw new ExceptionMobileExist(mobile);
 			}
+			if(StringUtils.isNotBlank(mail)){
+				if (!StringTools.isMail(mail)) {
+					throw new ExceptionInvalidMail(mail);
+				}
+				if(this.mailExisted(emc, mail)){
+					throw new ExceptionMailExist(mail);
+				}
+			}
 			if (!password.matches(Config.person().getPasswordRegex())) {
 				throw new ExceptionInvalidPassword(Config.person().getPasswordRegexHint());
 			}
@@ -73,7 +82,7 @@ class ActionCreate extends BaseAction {
 					throw new ExceptionInvalidCaptcha();
 				}
 			}
-			this.register(business, name, password, genderType, mobile);
+			this.register(business, name, password, genderType, mobile, mail);
 			Wo wo = new Wo();
 			wo.setValue(true);
 			result.setData(wo);
@@ -81,13 +90,14 @@ class ActionCreate extends BaseAction {
 		}
 	}
 
-	private void register(Business business, String name, String password, GenderType genderType, String mobile)
+	private void register(Business business, String name, String password, GenderType genderType, String mobile, String mail)
 			throws Exception {
 		Person o = new Person();
 		o.setName(name);
 		business.person().setPassword(o, password);
 		o.setGenderType(genderType);
 		o.setMobile(mobile);
+		o.setMail(mail);
 		business.entityManagerContainer().beginTransaction(Person.class);
 		business.entityManagerContainer().persist(o, CheckPersistType.all);
 		business.entityManagerContainer().commit();
@@ -97,25 +107,28 @@ class ActionCreate extends BaseAction {
 
 		@FieldDescribe("用户名称.")
 		private String name;
-		
+
 		@FieldDescribe("性别.男:m,女:f,未知:d")
 		private GenderType genderType;
-		
+
 		@FieldDescribe("密码.")
 		private String password;
-		
+
 		@FieldDescribe("必填,手机号.")
 		private String mobile;
-		
+
 		@FieldDescribe("手机认证码")
 		private String codeAnswer;
-		
+
 		@FieldDescribe("图片认证码")
 		private String captchaAnswer;
-		
+
 		@FieldDescribe("图片认证编号")
 		private String captcha;
 
+		@FieldDescribe("邮件地址(非必填).")
+		private String mail;
+
 		public String getName() {
 			return name;
 		}
@@ -172,9 +185,16 @@ class ActionCreate extends BaseAction {
 			this.captcha = captcha;
 		}
 
+		public String getMail() {
+			return mail;
+		}
+
+		public void setMail(String mail) {
+			this.mail = mail;
+		}
 	}
 
 	public static class Wo extends WrapBoolean {
 	}
 
-}
+}
\ No newline at end of file

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/BaseAction.java

@@ -49,4 +49,18 @@ abstract class BaseAction extends StandardJaxrsAction {
 			return false;
 		}
 	}
-}
+
\ No newline at end of file
+	Boolean mailExisted(EntityManagerContainer emc, String mail) throws Exception {
+		EntityManager em = emc.get(Person.class);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
+		Root<Person> root = cq.from(Person.class);
+		Predicate p = cb.equal(root.get(Person_.mail), mail);
+		cq.select(cb.count(root.get(Person_.id))).where(p);
+		if (em.createQuery(cq).getSingleResult() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ExceptionInvalidMail.java

+package com.x.organization.assemble.personal.jaxrs.regist;
+
+import com.x.base.core.project.exception.PromptException;
+
+import java.util.Objects;
+
+class ExceptionInvalidMail extends PromptException {
+
+   private static final long serialVersionUID = 4622760821556680073L;
+
+    ExceptionInvalidMail(String mail) {
+       super("邮件地址错误:不符合格式要求:" + Objects.toString(mail) + ".");
+   }
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ExceptionMailExist.java

+package com.x.organization.assemble.personal.jaxrs.regist;
+
+import com.x.base.core.project.exception.PromptException;
+
+import java.util.Objects;
+
+class ExceptionMailExist extends PromptException {
+
+	private static final long serialVersionUID = -2489020682959861835L;
+
+	ExceptionMailExist(String mail) {
+		super("邮件:" + Objects.toString(mail) + "已注册.");
+	}
+}