From ee3e95cf4bd4b85a1a0f5d9a10f98d9e5a41ba66 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 14:32:23 +0800
Subject: [PATCH] 11.6
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index c26b62a..9e91884 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.api.feignClient.AdminClient;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -26,8 +27,8 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Set;
@@ -46,16 +47,13 @@
@Autowired
private ISysRoleService roleService;
-
-
@Autowired
private ISysPostService postService;
-
@Autowired
private ISysPermissionService permissionService;
- @Autowired
- private ISysConfigService configService;
+ @Resource
+ private AdminClient adminClient;
@GetMapping("/page")
@ApiImplicitParams({
@@ -110,17 +108,6 @@
util.exportExcel(response, list, "用户数据");
}
- @Log(title = "用户管理", businessType = BusinessType.IMPORT)
- @RequiresPermissions("system:user:import")
- @PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
- List<SysUser> userList = util.importExcel(file.getInputStream());
- String operName = SecurityUtils.getUsername();
- String message = userService.importUser(userList, updateSupport, operName);
- return success(message);
- }
-
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -138,30 +125,19 @@
return R.fail("用户名或密码错误");
}
// 角色集合
- String roles = permissionService.getRolePermission(sysUser);
+ SysRole roles = permissionService.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
- sysUserVo.setRole(roles);
+ sysUserVo.setRole(roles.getRoleName());
+ sysUserVo.setRoleId(roles.getRoleId());
sysUserVo.setPermissions(permissions);
+ if (null != sysUser.getFranchiseeId()) {
+ List<String> data = adminClient.cityDetail(sysUser.getFranchiseeId()).getData();
+ sysUserVo.setCityList(data);
+ }
return R.ok(sysUserVo);
- }
-
- /**
- * 注册用户信息
- */
- @InnerAuth
- @PostMapping("/register")
- public R<Boolean> register(@RequestBody SysUser sysUser) {
- String username = sysUser.getNickName();
- if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
- return R.fail("当前系统没有开启注册功能！");
- }
- if (!userService.checkUserNameUnique(sysUser)) {
- return R.fail("保存用户'" + username + "'失败，注册账号已存在");
- }
- return R.ok(userService.registerUser(sysUser));
}
/**
@@ -173,7 +149,7 @@
public AjaxResult getInfo() {
SysUser user = userService.selectUserById(SecurityUtils.getUserId());
// 角色集合
- String roles = permissionService.getRolePermission(user);
+ SysRole roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
--
Gitblit v1.7.1