Antiloveg 8 years ago
parent
commit
52b69faff6

+ 16 - 8
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -80,6 +80,7 @@ import com.goafanti.common.enums.OrgTechCenterFields;
 import com.goafanti.common.enums.OrgTechProductFields;
 import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.UserAbilityFields;
+import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrgActivity;
@@ -107,6 +108,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.InputOrganizationIdentity;
+import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.OrgListBo;
@@ -434,20 +436,26 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addNewUser", method = RequestMethod.POST)
-	public Result addNewUser(String mobile, Integer type, String unitName) {
+	public Result addNewUser(@Valid InputUser inputUser, BindingResult bindingResult) {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
 
-		if (StringUtils.isBlank(mobile)) {
+		if (StringUtils.isBlank(inputUser.getMobile())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "mobile", "mobile"));
 			return res;
 		}
 
-		if (null == type) {
+		if (null == inputUser.getType()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "type", "type"));
 			return res;
 		}
 
-		User user = userService.selectByMobieAndType(mobile.trim(), type);
+		User user = userService.selectByMobieAndType(inputUser.getMobile().trim(), inputUser.getType());
 		if (null != user) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;
@@ -455,16 +463,16 @@ public class AdminApiController extends CertifyApiController {
 
 		User u = new User();
 		u.setId(UUID.randomUUID().toString());
-		u.setMobile(mobile.trim());
-		u.setPassword(mobile.trim());
-		u.setType(type);
+		u.setMobile(inputUser.getMobile().trim());
+		u.setPassword(inputUser.getMobile().trim());
+		u.setType(inputUser.getType());
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		u.setCreateTime(now.getTime());
 		u.setPassword(passwordUtil.getEncryptPwd(u));
 		u.setLvl(0);
 		u.setAid(TokenManager.getAdminId());
-		userService.insertRegister(u, "", unitName);
+		userService.insertRegister(u, "", inputUser.getUnitName());
 		return res;
 	}
 

+ 52 - 0
src/main/java/com/goafanti/common/enums/UserFields.java

@@ -0,0 +1,52 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum UserFields {
+	MOBILE("mobile", "手机号"),
+	TYPE("type", "用户类别"),
+	UNITNAME("unitName", "公司名称"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, UserFields> status = new HashMap<String, UserFields>();
+	
+	private UserFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (UserFields value : UserFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static UserFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 63 - 0
src/main/java/com/goafanti/user/bo/InputUser.java

@@ -0,0 +1,63 @@
+package com.goafanti.user.bo;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputUser {
+	
+	@Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
+	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
+	private String mobile;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer type;
+	
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String unitName;
+	
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String password;
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	
+	
+	
+	
+
+}

+ 13 - 14
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -813,10 +813,6 @@ public class UserApiController extends BaseApiController {
 			if (!StringUtils.isBlank(listedDateFormattedDate)) {
 				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD));
 			}
-			/*
-			 * res.setData(organizationIdentityService.saveLastYearTaxReprotUrl(
-			 * orgIdentity, TokenManager.getUserId())); return res;
-			 */
 		}
 		if (3 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
@@ -877,16 +873,19 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/adminConfirmIdent", method = RequestMethod.POST)
 	public Result adminConfirmIdent(Integer auditStatus, BigDecimal money, String uid) {
 		Result res = new Result();
-		if (0 == userService.selectByPrimaryKey(uid).getType()) {
-			UserIdentity u = userIdentityService.selectUserIdentityByUserId(uid);
-			u.setAuditStatus(auditStatus);
-			u.setAmountMoney(money);
-			res.setData(userIdentityService.updateByPrimaryKeySelective(u));
-		} else {
-			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
-			o.setAuditStatus(auditStatus);
-			o.setValidationAmount(money);
-			res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
+		User user = userService.selectByPrimaryKey(uid);
+		if (null != user) {
+			if (0 == user.getType()) {
+				UserIdentity u = userIdentityService.selectUserIdentityByUserId(uid);
+				u.setAuditStatus(auditStatus);
+				u.setAmountMoney(money);
+				res.setData(userIdentityService.updateByPrimaryKeySelective(u));
+			} else {
+				OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
+				o.setAuditStatus(auditStatus);
+				o.setValidationAmount(money);
+				res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
+			}
 		}
 		return res;
 	}

+ 18 - 13
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -4,6 +4,7 @@ import java.util.Calendar;
 import java.util.UUID;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -17,11 +18,13 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.service.UserService;
 
 @Controller
@@ -44,15 +47,14 @@ public class UserRegisterController extends BaseController {
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	@ResponseBody
-	public Result register(User user, String companyName, String contacts, String mobileCode,
+	public Result register(@Valid InputUser user, String companyName, String contacts, String mobileCode,
 			BindingResult bindingResult) {
 		Result res = new Result();
-		/*String sessVCode = (String) TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE);
-		if (sessVCode == null || !sessVCode.equalsIgnoreCase(verificationCode)) {
-			logger.info("input vcode:" + verificationCode + "| sess vcode:" + sessVCode);
-			res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
-		}*/
+		}
 		// 验证码15分钟有效
 		if (TimeUtils.checkOverTime("register")) {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
@@ -78,13 +80,16 @@ public class UserRegisterController extends BaseController {
 			}
 		}
 		if (res.getError().isEmpty()) {
-			user.setId(UUID.randomUUID().toString());
-			user.setMobile(user.getMobile().trim());
+			User us = new User();
+			us.setId(UUID.randomUUID().toString());
+			us.setMobile(user.getMobile().trim());
+			us.setType(user.getType());
+			us.setPassword(user.getPassword());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
-			user.setCreateTime(now.getTime());
-			user.setPassword(passwordUtil.getEncryptPwd(user));
-			user.setLvl(0);
+			us.setCreateTime(now.getTime());
+			us.setPassword(passwordUtil.getEncryptPwd(us));
+			us.setLvl(0);
 			/*
 			List<Admin> admins = adminService.selectAllAdmin();
 			if (!admins.isEmpty()) {
@@ -92,8 +97,8 @@ public class UserRegisterController extends BaseController {
 				user.setAid(admins.get(0).getId());// 随机分配管理员
 			}
 			*/
-			user.setAid("2");//ID为"2"的管理员
-			userService.insertRegister(user, contacts, companyName);
+			us.setAid("2");//ID为"2"的管理员
+			userService.insertRegister(us, contacts, companyName);
 		}
 
 		return res;