企业注册优化

sso-server/src/main/java/com/uas/sso/controller/UserspaceRegisterController.java

@@ -105,12 +105,12 @@ public class UserspaceRegisterController extends BaseController {
             if (StringUtils.isEmpty(password)) {
                 return error("请填写正确的密码");
             }
-        }
 
-        // 校验密码强度
-        PasswordStrength strength = checkPasswordLevel(password);
-        if (PasswordStrength.WEAK.getValue() == strength.getValue()) {
-            return error("密码须为8-20字符的英文、数字混合");
+            // 新用户要校验密码强度
+            PasswordStrength strength = checkPasswordLevel(password);
+            if (PasswordStrength.WEAK.getValue() == strength.getValue()) {
+                return error("密码须为8-20字符的英文、数字混合");
+            }
         }
 
         // 设置企业管理员信息
@@ -121,21 +121,16 @@ public class UserspaceRegisterController extends BaseController {
             admin.setVipName(adminName);
             admin.setPassword(password);
             admin.setEmail(adminEmail);
-            userService.register(admin);
         } else if (StringUtils.isEmpty(admin.getEmail())) {
             // 老用户校验密码
             userService.checkPassword(admin.getUserUU(), user.getPassword(), false);
 
             // 老用户邮箱为空的话设置邮箱
             admin.setEmail(adminEmail);
-            userService.save(admin);
         }
 
-        // 给企业设置企业管理员
-        userspace.setAdmin(admin);
-
         // 企业注册
-        userspaceService.register(userspace);
+        userspaceService.register(userspace, admin);
 
         // 添加日志
         registerLogger.info(Type.REGISTER_USERSPACE.getValue(), Step.SECOND.getValue(), "企业注册", userspace, appId);

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -258,12 +258,12 @@ public class User implements Serializable {
         this.emailIsValid = emailIsValid;
     }
 
-    public String getName() {
+    public String getRealName() {
         return realName;
     }
 
-    public void setName(String name) {
-        this.realName = name;
+    public void setRealName(String realName) {
+        this.realName = realName;
     }
 
     public String getIdCard() {

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -3,6 +3,7 @@ package com.uas.sso.entity;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * 企业实体
@@ -53,7 +54,7 @@ public class Userspace implements Serializable {
     /**
      * 管理员
      */
-    @ManyToOne
+    @ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH})
     @JoinColumn(name = "adminuu", insertable=false, updatable=false)
     private User admin;
 
@@ -153,6 +154,15 @@ public class Userspace implements Serializable {
     @Column(name = "domain")
     private String domain;
 
+    /**
+     * 企业下的用户
+     */
+    @ManyToMany
+    @JoinTable(name = "sso$user_userspace",
+            joinColumns = {@JoinColumn(name="space_uu", referencedColumnName="spaceuu")},
+            inverseJoinColumns = {@JoinColumn(name="user_uu", referencedColumnName="useruu")})
+    private List<User> users;
+
     public Userspace() {
     }
 
@@ -331,4 +341,12 @@ public class Userspace implements Serializable {
     public void setDomain(String domain) {
         this.domain = domain;
     }
+
+    public List<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<User> users) {
+        this.users = users;
+    }
 }

sso-server/src/main/java/com/uas/sso/service/UserspaceService.java

@@ -1,5 +1,6 @@
 package com.uas.sso.service;
 
+import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
 
 /**
@@ -13,8 +14,9 @@ public interface UserspaceService {
     /**
      * 企业注册
      * @param userspace 企业信息
+     * @param admin 管理员信息
      */
-    void register(Userspace userspace);
+    void register(Userspace userspace, User admin);
 
     /**
      * 校验企业名称

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -1,8 +1,10 @@
 package com.uas.sso.service.impl;
 
 import com.uas.sso.dao.UserspaceDao;
+import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.exception.VisibleError;
+import com.uas.sso.service.UserService;
 import com.uas.sso.service.UserspaceService;
 import com.uas.sso.util.ChineseUtils;
 import com.uas.sso.util.StringUtil;
@@ -10,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 企业信息service层
  *
@@ -22,13 +27,16 @@ public class UserspaceServiceImpl implements UserspaceService {
     @Autowired
     private UserspaceDao userspaceDao;
 
+    @Autowired
+    private UserService userService;
+
     /**
      * 企业初始uu号
      */
     public static final Long SPACE_INIT_UU = 10000000L;
 
     @Override
-    public void register(Userspace userspace) {
+    public void register(Userspace userspace, User admin) {
         // 校验企业名是否重复
         checkSpaceName(userspace.getSpaceName());
 
@@ -44,6 +52,22 @@ public class UserspaceServiceImpl implements UserspaceService {
         Long maxUU = userspaceDao.findMaxUU();
         userspace.setSpaceUU(StringUtils.isEmpty(maxUU) ? SPACE_INIT_UU : (maxUU + 1));
 
+        // 设置管理员信息
+        User oldUser = userService.findByMobile(admin.getMobile());
+        if (oldUser == null) {
+            userService.register(admin);
+        } else {
+            userService.save(admin);
+        }
+
+        // 给企业设置管理员
+        userspace.setAdmin(admin);
+
+        // 将管理员设置在企业下
+        List<User> users = new ArrayList<>();
+        users.add(admin);
+        userspace.setUsers(users);
+
         // 注册企业
         userspaceDao.save(userspace);
     }