shayu/dk-sass-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-05-20 01:18:08 +08:00
parent 74f0f074c1
commit 5bfdde942c
23 changed files with 249 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java
View File

@@ -149,6 +149,13 @@ public class SysLoginController {
return R.ok(menuService.buildMenus(menus));
}
@GetMapping("auth/tenant/get")
public R<SysTenantVo> getCurrentTenant(HttpServletRequest request){
String tenantId = TenantHelper.getTenantId();
SysTenantVo vo = tenantService.queryByTenantId(tenantId);
return R.ok(vo);
}
@GetMapping("auth/tenant/list")
public R<List<SysTenantVo>> tenantList(HttpServletRequest request){
Long userId = LoginHelper.getUserId();

22
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
View File

@@ -8,12 +8,14 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.component.core.constant.UserConstants;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.core.exception.ServiceException;
import com.ruoyi.component.excel.core.ExcelResult;
import com.ruoyi.component.excel.utils.ExcelUtil;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.component.tenant.helper.TenantHelper;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
@@ -22,13 +24,11 @@ import com.ruoyi.component.satoken.utils.LoginHelper;
import com.ruoyi.component.core.util.StreamUtils;
import com.ruoyi.component.core.util.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.domain.vo.SysUserExportVo;
import com.ruoyi.system.domain.vo.SysUserImportVo;
import com.ruoyi.system.listener.SysUserImportListener;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.*;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
@@ -40,6 +40,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* 用户信息
@@ -56,6 +57,7 @@ public class SysUserController extends BaseController {
private final ISysRoleService roleService;
private final ISysPostService postService;
private final ISysDeptService deptService;
private final ISysTenantService sysTenantService;
/**
* 获取用户列表
@@ -141,8 +143,18 @@ public class SysUserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody SysUser user) {
SysTenantVo vo = sysTenantService.queryByTenantId(TenantHelper.getTenantId());
if(vo == null){
throw new ServiceException("未找到对应的平台");
}
user.setUserName(vo.getPrefix()+"-"+user.getUserName());
user.setPrefix(vo.getPrefix());
deptService.checkDeptDataScope(user.getDeptId());
if (!userService.checkUserNameUnique(user)) {
AtomicBoolean checkUserName = new AtomicBoolean(false);
TenantHelper.ignore(() -> {
checkUserName.set(userService.checkUserNameUnique(user));
});
if (!checkUserName.get()) {
return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -56,7 +56,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
private final SysPostMapper postMapper;
private final SysUserRoleMapper userRoleMapper;
private final SysUserPostMapper userPostMapper;
private final ISysTenantService sysTenantService;
@Override
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
@@ -274,11 +273,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
@Transactional(rollbackFor = Exception.class)
public int insertUser(SysUser user) {
SysTenantVo vo = sysTenantService.queryByTenantId(TenantHelper.getTenantId());
if(vo == null){
throw new ServiceException("未找到对应的平台");
}
user.setUserName(vo.getPrefix()+"-"+user.getUserName());
// 新增用户信息
int rows = baseMapper.insert(user);
// 新增用户岗位关联