diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index dbb4aca..8ed71a8 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,5 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "ruoyi-file"; + } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index db1f884..afeb7d4 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -141,6 +141,7 @@ public class SysUser extends BaseEntity { */ private Long roleId; + public SysUser (Long userId) { this.userId = userId; } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/vo/AuthUserRequest.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/vo/AuthUserRequest.java new file mode 100644 index 0000000..e4a4902 --- /dev/null +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/vo/AuthUserRequest.java @@ -0,0 +1,16 @@ +package com.muyu.common.system.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class AuthUserRequest { + private Long roleId; + private Long[] userIds; + +} diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index cb968e0..9195598 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -4,6 +4,7 @@ import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.domain.vo.AuthUserRequest; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; @@ -37,4 +38,10 @@ public interface RemoteUserService { */ @PostMapping("/user/register") public Result registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PostMapping("/user/add") + public Result add (@RequestBody SysUser user); + + @PutMapping("/role/authUser/selectAllAdd") + public Result selectAuthUserAllAdd (@RequestBody AuthUserRequest authUserRequest); } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..5a789c2 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,6 +1,7 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.vo.AuthUserRequest; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; @@ -31,6 +32,16 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserInfo (SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } + + @Override + public Result add(SysUser user) { + return Result.error("注册用户失败:" + throwable.getMessage()); + } + + @Override + public Result selectAuthUserAllAdd(AuthUserRequest authUserRequest) { + return Result.error("用户授权失败失败:" + throwable.getMessage()); + } }; } } diff --git a/muyu-modules/muyu-company/muyu-company-remove/pom.xml b/muyu-modules/muyu-company/muyu-company-remove/pom.xml deleted file mode 100644 index 90cd6a3..0000000 --- a/muyu-modules/muyu-company/muyu-company-remove/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu-company - 3.6.3 - - - muyu-company-remove - - - 17 - 17 - UTF-8 - - - diff --git a/muyu-modules/muyu-company/muyu-company-server/pom.xml b/muyu-modules/muyu-company/muyu-company-server/pom.xml index b75ee59..06d277c 100644 --- a/muyu-modules/muyu-company/muyu-company-server/pom.xml +++ b/muyu-modules/muyu-company/muyu-company-server/pom.xml @@ -103,6 +103,15 @@ compile + + com.muyu + muyu-common-system + + + com.muyu + muyu-modules-system + 3.6.3 + diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java index 7a1602c..f2be3f3 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java @@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.authentication.mapper.EnterpriseMapper; import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; +import com.muyu.system.mapper.SysUserMapper; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.domain.Enterprise; @@ -18,6 +22,7 @@ import com.muyu.authentication.service.IEnterpriseService; * @date 2024-05-31 */ @Service +@Log4j2 public class EnterpriseServiceImpl extends ServiceImpl implements IEnterpriseService { @Autowired @@ -51,6 +56,8 @@ public class EnterpriseServiceImpl extends ServiceImpl0) { + SysUser build = SysUser.builder() + .userName(enterprise.getEnterpriseName()) + .nickName(enterprise.getLegalPerson()) + .email(enterprise.getEmail()) + .phonenumber(enterprise.getContactPhone()) + .password(enterprise.getContactPhone().substring(enterprise.getContactPhone().length()-6)) + .companyId(enterprise.getId()) + .status("0") + .roleId(9L) + .build(); + log.info(build.getPassword()); + remoteUserService.add(build); + } + return insert; } /** diff --git a/muyu-modules/muyu-company/pom.xml b/muyu-modules/muyu-company/pom.xml index 1b3c99b..ee3dd2e 100644 --- a/muyu-modules/muyu-company/pom.xml +++ b/muyu-modules/muyu-company/pom.xml @@ -13,7 +13,6 @@ pom muyu-company-common - muyu-company-remove muyu-company-server diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 63df7a9..3299f3f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -11,6 +11,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.domain.vo.AuthUserRequest; import com.muyu.system.domain.SysUserRole; import com.muyu.system.domain.resp.DeptTreeResp; import com.muyu.system.service.SysDeptService; @@ -199,6 +200,13 @@ public class SysRoleController extends BaseController { return toAjax(roleService.insertAuthUsers(roleId, userIds)); } + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/selectAllAdd") + public Result selectAuthUserAllAdd (@RequestBody AuthUserRequest authUserRequest) { + roleService.checkRoleDataScope(authUserRequest.getRoleId()); + return toAjax(roleService.insertAuthUsers(authUserRequest.getRoleId(), authUserRequest.getUserIds())); + } /** * 获取对应角色部门树列表 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index 9811a0e..ed4a2bb 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -180,7 +180,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public Result add (@Validated @RequestBody SysUser user) { if (!userService.checkUserNameUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在"); diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index ab88e1c..bf6d74b 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -10,6 +10,8 @@ import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.domain.vo.AuthUserRequest; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; @@ -226,6 +228,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } } + @Autowired + private RemoteUserService remoteUserService; /** * 新增保存用户信息 * @@ -236,8 +240,22 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public int insertUser (SysUser user) { + // 新增用户信息 int rows = userMapper.insertUser(user); + List arrayList = new ArrayList<>(); + arrayList.add(user.getUserId()); + + // 将 ArrayList 转换为 long[] 数组 + Long[] userIdArray = arrayList.stream().toArray(Long[]::new); + + + remoteUserService.selectAuthUserAllAdd( + AuthUserRequest.builder() + .userIds(userIdArray) + .roleId(user.getRoleId()) + .build() + ); // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 0b32067..d97589a 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -17,6 +17,7 @@ + @@ -198,6 +199,7 @@ status, create_by, remark, + company_id, create_time )values( #{userId}, @@ -212,6 +214,7 @@ #{status}, #{createBy}, #{remark}, + #{companyId}, sysdate() )