修改注册功能

2019-04-26 11:13:38 +08:00
parent 5eee36e516
commit 9f6902f53d
7 changed files with 252 additions and 57 deletions
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -47,7 +47,7 @@ public class UserController {
    private Integer managePort;

    @Value("${manage.roleId}")
-    private Integer manageRoleId;
+    private Long manageRoleId;

    @Resource
    private UserService userService;
--- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
@@ -36,4 +36,8 @@ public interface UserMapperEx {

    List<TreeNodeEx> getNodeTree();
    List<TreeNodeEx> getNextNodeTree(Map<String, Object> parameterMap);
+
+    List<User> getUserListByUserNameAndTenantId(@Param("userName")String userName, @Param("tenantId")Long tenantId);
+
+    String addRegisterUserNotInclueUser(@Param("userId") Long userId,@Param("tenantId") Long tenantId,@Param("roleId") Long roleId);
 }
--- a/src/main/java/com/jsh/erp/service/app/AppService.java
+++ b/src/main/java/com/jsh/erp/service/app/AppService.java
@@ -3,10 +3,7 @@ package com.jsh.erp.service.app;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.constants.ExceptionConstants;
-import com.jsh.erp.datasource.entities.App;
-import com.jsh.erp.datasource.entities.AppExample;
-import com.jsh.erp.datasource.entities.User;
-import com.jsh.erp.datasource.entities.UserBusiness;
+import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.AppMapper;
 import com.jsh.erp.datasource.mappers.AppMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
@@ -292,4 +289,6 @@ public class AppService {
        }
        return list;
    }
+
+
 }
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -20,6 +20,7 @@ import com.jsh.erp.utils.ExceptionCodeConstants;
 import com.jsh.erp.utils.JshException;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;
+import org.apache.ibatis.annotations.DeleteProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -354,7 +355,8 @@ public class UserService {
                    BusinessConstants.LOG_OPERATION_TYPE_ADD,
                    ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
            //检查用户名和登录名
-            checkUserNameAndLoginName(ue);
+            checkLoginName(ue);
+            checkUserName(ue);
            //新增用户信息
            ue= this.addUser(ue);
            if(ue==null){
@@ -394,7 +396,11 @@ public class UserService {
         * 3是否管理者默认为员工
         * 4默认用户状态为正常
         * */
-        ue.setPassword(Tools.md5Encryp(BusinessConstants.USER_DEFAULT_PASSWORD));
+
+        //用户没有设置密码时，使用默认密码
+        if(StringUtil.isEmpty(ue.getPassword())){
+            ue.setPassword(Tools.md5Encryp(BusinessConstants.USER_DEFAULT_PASSWORD));
+        }
        ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
        if(ue.getIsmanager()==null){
            ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
@@ -416,7 +422,7 @@ public class UserService {
    }

    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public UserEx registerUser(UserEx ue, Integer manageRoleId) throws Exception{
+    public UserEx registerUser(UserEx ue, Long manageRoleId) throws Exception{
        /**
         * create by: qiankunpingtai
         * create time: 2019/4/9 18:00
@@ -428,38 +434,46 @@ public class UserService {
            throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
                    ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
        } else {
-            ue.setPassword(Tools.md5Encryp(ue.getPassword()));
-            ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
-            if (ue.getIsmanager() == null) {
-                ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
-            }
-            ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
-            int result=0;
-            try{
-                result= userMapperEx.addUser(ue);
-            }catch(Exception e){
-                logger.error("异常码[{}],异常提示[{}],异常[{}]",
-                        ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
-                throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
-                        ExceptionConstants.DATA_WRITE_FAIL_MSG);
-            }
+            /**
+             * create by: qiankunpingtai
+             * create time: 2019/4/24 10:57
+             * website：https://qiankunpingtai.cn
+             * description:
+             * 检查登录名是否已存在
+             *
+             */
+            checkLoginName(ue);
+            /**
+             * create by: qiankunpingtai
+             * create time: 2019/4/24 14:47
+             * website：https://qiankunpingtai.cn
+             * description:
+             * 注册一个新用户需要做如下操作
+             * 1、分配应用
+             * 2、分配功能模块
+             * 3、分配产品扩展字段
+             * 4、分配角色（默认添加超级管理员角色，不可修改）
+             * 5、写入用户信息
+             * 6、写入用户角色应用功能关系
+             */
+
+            ue=this.addUser(ue);
+
            //更新租户id
            User user = new User();
            user.setId(ue.getId());
            user.setTenantId(ue.getId());
            userService.updateUserTenant(user);
-            //新增用户与角色的关系
-            JSONObject ubObj = new JSONObject();
-            ubObj.put("type", "UserRole");
-            ubObj.put("keyid", ue.getId());
-            JSONArray ubArr = new JSONArray();
-            ubArr.add(manageRoleId);
-            ubObj.put("value", ubArr.toString());
-            userBusinessService.insertUserBusiness(ubObj.toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-            if (result > 0) {
-                return ue;
-            }
-            return null;
+            addRegisterUserNotInclueUser(user.getId(),user.getTenantId(),manageRoleId);
+//            //新增用户与角色的关系
+//            JSONObject ubObj = new JSONObject();
+//            ubObj.put("type", "UserRole");
+//            ubObj.put("keyid", ue.getId());
+//            JSONArray ubArr = new JSONArray();
+//            ubArr.add(manageRoleId);
+//            ubObj.put("value", ubArr.toString());
+//            userBusinessService.insertUserBusiness(ubObj.toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+            return ue;
        }
    }

@@ -487,7 +501,8 @@ public class UserService {
                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(),
                    ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
            //检查用户名和登录名
-            checkUserNameAndLoginName(ue);
+            checkLoginName(ue);
+            checkUserName(ue);
            //更新用户信息
            ue = this.updateUser(ue);
            if (ue == null) {
@@ -542,14 +557,13 @@ public class UserService {
        return null;
    }
    /**
-     * create by: cjl
+     * create by: qiankunpingtai
+     * create time: 2019/4/24 11:02
+     * website：https://qiankunpingtai.cn
     * description:
-     *  检查用户名称和登录名不能重复
-     * create time: 2019/3/12 11:36
-     * @Param: userEx
-     * @return void
+     * 检查登录名全局唯一
     */
-    public void checkUserNameAndLoginName(UserEx userEx)throws Exception{
+    public void checkLoginName(UserEx userEx)throws Exception{
        List<User> list=null;
        if(userEx==null){
            return;
@@ -579,10 +593,25 @@ public class UserService {

            }
        }
+    }
+    /**
+     * create by: qiankunpingtai
+     * create time: 2019/4/24 11:02
+     * website：https://qiankunpingtai.cn
+     * description:
+     * 检查用户名同一个租户范围内内唯一
+     *
+     */
+    public void checkUserName(UserEx userEx)throws Exception{
+        List<User> list=null;
+        if(userEx==null){
+            return;
+        }
+        Long userId=userEx.getId();
        //检查用户名
        if(!StringUtils.isEmpty(userEx.getUsername())){
            String userName=userEx.getUsername();
-            list=this.getUserListByUserName(userName);
+            list=this.getUserListByUserNameAndTenantId(userName,userEx.getTenantId());
            if(list!=null&&list.size()>0){
                if(list.size()>1){
                    //超过一条数据存在，该用户名已存在
@@ -603,8 +632,31 @@ public class UserService {

            }
        }
-
    }
+    /**
+     * create by: qiankunpingtai
+     * website：https://qiankunpingtai.cn
+     * description:
+     *  通过用户名和租户id获取用户信息
+     * create time: 2019/4/24 11:18
+     * @Param: userName
+     * @Param: tenantId
+     * @return java.util.List<com.jsh.erp.datasource.entities.User>
+     */
+    private List<User> getUserListByUserNameAndTenantId(String userName, Long tenantId) {
+
+        List<User> list =null;
+        try{
+            list=userMapperEx.getUserListByUserNameAndTenantId(userName,tenantId);
+        }catch(Exception e){
+            logger.error("异常码[{}],异常提示[{}],异常[{}]",
+                    ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
+            throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
+                    ExceptionConstants.DATA_READ_FAIL_MSG);
+        }
+        return list;
+    }
+
    /**
     * 通过用户名获取用户列表
     * */
@@ -673,4 +725,34 @@ public class UserService {
        }
        return list;
    }
+    /**
+     * create by: qiankunpingtai
+     * website：https://qiankunpingtai.cn
+     * description:
+     * 1、分配应用
+     * 2、分配功能模块
+     * 3、分配产品扩展字段
+     * 4、分配角色（默认添加超级管理员角色，不可修改）
+     * 5、写入用户角色应用功能关系
+     * create time: 2019/4/26 9:37
+     * @Param: userId 用户id
+     * @Param: tenantId 租户id
+     * @Param: roleId 模板角色id
+     * @return java.lang.String
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public String addRegisterUserNotInclueUser(Long userId,Long tenantId,Long roleId)throws Exception {
+
+        String result =null;
+        try{
+            result=userMapperEx.addRegisterUserNotInclueUser(userId,tenantId,roleId);
+        }catch(Exception e){
+            logger.error("异常码[{}],异常提示[{}],异常[{}]",
+                    ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
+            throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
+                    ExceptionConstants.DATA_WRITE_FAIL_MSG);
+        }
+        return result;
+    }
+
 }
--- a/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.UserMapperEx">
-    <resultMap extends="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.UserEx">
-        <result column="orgaId" jdbcType="BIGINT" property="orgaId" />
-        <result column="org_abr" jdbcType="VARCHAR" property="orgAbr" />
-        <result column="user_blng_orga_dspl_seq" jdbcType="VARCHAR" property="userBlngOrgaDsplSeq" />
-        <result column="orgaUserRelId" jdbcType="BIGINT" property="orgaUserRelId" />
+    <resultMap extends="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap" id="ResultMapEx"
+               type="com.jsh.erp.datasource.entities.UserEx">
+        <result column="orgaId" jdbcType="BIGINT" property="orgaId"/>
+        <result column="org_abr" jdbcType="VARCHAR" property="orgAbr"/>
+        <result column="user_blng_orga_dspl_seq" jdbcType="VARCHAR" property="userBlngOrgaDsplSeq"/>
+        <result column="orgaUserRelId" jdbcType="BIGINT" property="orgaUserRelId"/>
    </resultMap>
-    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
+    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample"
+            resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
        select *
        FROM jsh_user
        where 1=1
@@ -37,25 +39,26 @@
    </select>
    <select id="getUserList" parameterType="java.util.Map" resultMap="ResultMapEx">
        select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
-         user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq,
+        user.description, user.remark,user.isystem,org.id as
+        orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq,
        rel.id as orgaUserRelId
        FROM jsh_user user
        left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
-        left join jsh_organization org on rel.orga_id=org.id and  ifnull(org.org_stcd,'0') !='5'
+        left join jsh_organization org on rel.orga_id=org.id and ifnull(org.org_stcd,'0') !='5'
        where 1=1
        and ifnull(user.status,'0') not in('1','2')
        <if test="userName != null and userName != ''">
-            <bind name="userName" value="'%' + _parameter.userName + '%'" />
+            <bind name="userName" value="'%' + _parameter.userName + '%'"/>
            and user.userName like #{userName}
        </if>
        <if test="loginName != null and loginName != ''">
-            <bind name="loginName" value="'%' + _parameter.loginName + '%'" />
+            <bind name="loginName" value="'%' + _parameter.loginName + '%'"/>
            and user.loginName like #{loginName}
        </if>
        order by user.id desc
    </select>
    <insert id="addUser" parameterType="com.jsh.erp.datasource.entities.UserEx"
-        useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+            useGeneratedKeys="true" keyProperty="id" keyColumn="id">
        insert into jsh_user (username, loginame,
        password, position,
        email, phonenum, ismanager,
@@ -184,4 +187,28 @@
        and ifnull(org_stcd,'0') !='5'
        order by sort asc
    </select>
+    <select id="getUserListByUserNameAndTenantId" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
+        select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
+        user.description, user.remark,user.isystem
+        FROM jsh_user user
+        where 1=1
+        and ifnull(user.status,'0') not in('1','2')
+        <if test="userName != null and userName != ''">
+            and user.userName = #{userName}
+        </if>
+        <choose>
+            <when test="tenantId != null">
+                and user.tenant_id = #{tenantId}
+            </when>
+            <otherwise>
+                AND user.tenant_id is null
+            </otherwise>
+        </choose>
+        order by user.id desc
+    </select>
+    <select id="addRegisterUserNotInclueUser" resultType="String">
+      select registerUserTemplate(#{userId},#{tenantId},#{roleId}) from dual;
+    </select>
+
+
 </mapper>