同步密码强度

src/main/java/com/uas/platform/b2c/common/account/api/TokenController.java

@@ -11,12 +11,10 @@ import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.sso.SSOHelper;
+import com.uas.sso.entity.UserSpaceView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -112,4 +110,13 @@ public class TokenController {
 		SSOHelper.getToken(request);
 		return new ModelMap("success", true);
 	}
+
+
+	@RequestMapping("/userSpaceViewTest")
+	@ResponseBody
+	public ModelMap test(UserSpaceView userSpaceView) {
+		return new ModelMap("success", true);
+	}
+
+
 }

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -85,6 +85,7 @@ public class EnterpriseController {
 		return enterprise;
 	}
 
+
 	/**
 	 * 根据注册地址返回币别信息
 	 * @return 企业的币别信息 USD/RMB

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -171,7 +171,7 @@ public class User implements Serializable {
 	private String idImgUrl;
 
 	/**
-	 * 是否通过审核  1：通过  0：未认证  2：正在审核
+	 * 是否通过审核  1：正在审核  0：未认证  2.已认证;
 	 */
 	@Column(name = "user_idenable")
 	private Short idEnable;
@@ -206,6 +206,26 @@ public class User implements Serializable {
 	@Column(name = "user_idRemarks")
 	private String idRemarks;
 
+
+	/**
+	 * 用户是否设置密保问题
+	 */
+	@Column(name = "user_has_question")
+	private Integer hasQuestion;
+
+
+	/**
+	 * 手机认证状态
+	 */
+	@Column(name = "user_telstatus")
+	private Integer mobileValidCode;
+
+	/**
+	 * 邮箱认证状态
+	 */
+	@Column(name = "user_emlstatus")
+	private Integer emailValidCode;
+
 	public Long getLastLoginTime() {
 		return lastLoginTime;
 	}
@@ -487,6 +507,30 @@ public class User implements Serializable {
 		return idRemarks;
 	}
 
+	public Integer getHasQuestion() {
+		return hasQuestion;
+	}
+
+	public void setHasQuestion(Integer hasQuestion) {
+		this.hasQuestion = hasQuestion;
+	}
+
+	public Integer getMobileValidCode() {
+		return mobileValidCode;
+	}
+
+	public void setMobileValidCode(Integer mobileValidCode) {
+		this.mobileValidCode = mobileValidCode;
+	}
+
+	public Integer getEmailValidCode() {
+		return emailValidCode;
+	}
+
+	public void setEmailValidCode(Integer emailValidCode) {
+		this.emailValidCode = emailValidCode;
+	}
+
 	public void setIdRemarks(String idRemarks) {
 		this.idRemarks = idRemarks;
 	}

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -157,7 +157,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		UserSpaceView detail = new UserSpaceView();
 		UserView userView = new UserView();
 		userView.setUserUU(user.getUserUU());
-		userView.setName(user.getUserName());
+		userView.setVipName(user.getUserName());
 		userView.setSex(user.getUserSex());
 		userView.setPassword(user.getUserPwd());
 		userView.setMobile(user.getUserTel());

src/main/java/com/uas/platform/b2c/common/account/v2/controller/EnterpriseController.java

@@ -2,7 +2,10 @@ package com.uas.platform.b2c.common.account.v2.controller;
 
 import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
+import com.uas.platform.b2c.common.account.v2.service.UserService;
+import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,15 +19,18 @@ public class EnterpriseController {
 	@Autowired
 	private EnterpriseService enterpriseService;
 
+
     /**
      * 企业信息更新
      * @param userSpaceView
      */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void update(UserSpaceView userSpaceView) {
+	public void update(UserSpaceView userSpaceView, UserView userView) {
 		if (null != userSpaceView) {
-			 enterpriseService.update(userSpaceView);
+			if (userSpaceView.getAdminUU() != null) {
+				enterpriseService.update(userSpaceView);
+			}
 		}
 	}
 

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -36,6 +36,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
     @Override
     public void update(UserSpaceView userSpaceView) {
+        List<User> admins = userDao.findUserByUserUU(userSpaceView.getAdminUU());
+        if (admins.size() != 1) {
+            logger.log("更新企业信息出错，管理员有且仅有一个", "当前管理员数量:" + admins.size());
+            return;
+        }
         Enterprise enterprise = new Enterprise();
         if (null == userSpaceView.getSpaceUU() && "".equals(userSpaceView.getSpaceUU())){
             logger.log("更新企业信息出错，uu为空", "值为null", null,0L);
@@ -52,7 +57,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setEnName(userSpaceView.getSpaceName());
         enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
         enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
-        enterprise.setEnAdminuu(userSpaceView.getAdmin().getUserUU());
+        Long userUU = admins.get(0).getUserUU();
+        enterprise.setEnAdminuu(userUU);
         Enterprise newEn = enterpriseDao.save(enterprise);
        /* List<User> users = userDao.findUserByUserTel(userSpaceDetail.getAdminTel());
         if (!CollectionUtils.isEmpty(users)){

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -63,6 +63,17 @@ public class UserServiceImpl implements UserService {
         if (userUU != null) {
             u.setUserUU(userUU);
         }
+        //是否有密保
+        if (user.isHasQuestion()) {
+            u.setHasQuestion(1);
+        } else {
+            u.setHasQuestion(0);
+        }
+        //设置密码强度;
+        u.setPwdSecLevel( (short)user.getPasswordLevel());
+
+        //安全强度;
+        u.setSecLevel((short)3);
         String name = user.getVipName();
         if (!StringUtils.isEmpty(name)) {
             u.setUserName(name);
@@ -92,20 +103,13 @@ public class UserServiceImpl implements UserService {
             u.setUserIdcode(idCard);
         }
         Short identityValidCode = user.getIdentityValidCode();
+        u.setEnable(identityValidCode);
         String imId = user.getImId();
         if (!StringUtils.isEmpty(imId)) {
             u.setUserIMId(Long.parseLong(imId));
         }
         Short lock = user.getLock();
-        if (lock != null) {
-            if (lock == 1) {
-                u.setEnable((short) 0);
-            } else {
-                u.setEnable((short) 1);
-            }
-        } else {
-            u.setEnable((short)1);
-        }
+
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {