From 883f5e73fbe7458fd760dbe8560dd5d8757e04cd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 13:56:29 +0800
Subject: [PATCH] refactor: 按需求表收敛范围，撤销非需求模块，补齐售后回访闭环
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index 820c132..22479fa 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.controller.admin.user;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -10,9 +11,13 @@
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
import cn.iocoder.yudao.module.system.convert.user.UserConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import cn.iocoder.yudao.module.system.service.permission.PermissionService;
+import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -29,8 +34,11 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -47,6 +55,10 @@
private AdminUserService userService;
@Resource
private DeptService deptService;
+ @Resource
+ private RoleService roleService;
+ @Resource
+ private PermissionService permissionService;
@PostMapping("/create")
@Operation(summary = "鏂板鐢ㄦ埛")
@@ -100,7 +112,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢ㄦ埛鍒嗛〉鍒楄〃")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<PageResult<UserRespVO>> getUserPage(@Valid UserPageReqVO pageReqVO) {
// 鑾峰緱鐢ㄦ埛鍒嗛〉鍒楄〃
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
@@ -117,7 +128,6 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鐢ㄦ埛璇︽儏鍒楄〃")
@Parameter(name = "ids", description = "缂栧彿鍒楄〃", required = true, example = "[1024]")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<List<UserRespVO>> getUserList(@RequestParam("ids") List<Long> ids) {
List<AdminUserDO> list = userService.getUserList(ids);
if (CollUtil.isEmpty(list)) {
@@ -130,18 +140,51 @@
@GetMapping({"/list-all-simple", "/simple-list"})
@Operation(summary = "鑾峰彇鐢ㄦ埛绮剧畝淇℃伅鍒楄〃", description = "鍙寘鍚寮�鍚殑鐢ㄦ埛锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
- public CommonResult<List<UserSimpleRespVO>> getSimpleUserList() {
- List<AdminUserDO> list = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus());
+ public CommonResult<List<UserSimpleRespVO>> getSimpleUserList(
+ @RequestParam(value = "deptId", required = false) Long deptId) {
+ List<AdminUserDO> list;
+ if (deptId != null) {
+ List<Long> deptIds = Collections.singletonList(deptId);
+ list = userService.getDeptUsers(deptIds);
+ } else {
+ list = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus());
+ }
+
// 鎷兼帴鏁版嵁
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
convertList(list, AdminUserDO::getDeptId));
return success(UserConvert.INSTANCE.convertSimpleList(list, deptMap));
}
+ @GetMapping("/list-by-role-code")
+ @Operation(summary = "鑾峰緱鎸囧畾瑙掕壊缂栫爜鐨勭敤鎴风簿绠�淇℃伅鍒楄〃", description = "鍙寘鍚寮�鍚殑鐢ㄦ埛锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
+ @Parameter(name = "code", description = "瑙掕壊缂栫爜", required = true, example = "production_submit_work")
+ public CommonResult<List<UserSimpleRespVO>> getUserListByRoleCode(@RequestParam("code") String code) {
+ // 1. 鏌ヨ瑙掕壊
+ RoleDO role = roleService.getRoleByCode(code);
+ if (role == null) {
+ return success(Collections.emptyList());
+ }
+ // 2. 鏌ヨ鎷ユ湁璇ヨ鑹茬殑鐢ㄦ埛缂栧彿
+ Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(Collections.singletonList(role.getId()));
+ if (CollUtil.isEmpty(userIds)) {
+ return success(Collections.emptyList());
+ }
+ // 3. 鏌ヨ鐢ㄦ埛锛屽彧淇濈暀寮�鍚姸鎬�
+ List<AdminUserDO> list = userService.getUserList(userIds).stream()
+ .filter(user -> CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus()))
+ .collect(Collectors.toList());
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+ // 4. 鎷兼帴閮ㄩ棬鏁版嵁
+ Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(list, AdminUserDO::getDeptId));
+ return success(UserConvert.INSTANCE.convertSimpleList(list, deptMap));
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢ㄦ埛璇︽儏")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) {
AdminUserDO user = userService.getUser(id);
if (user == null) {
@@ -168,17 +211,23 @@
}
@GetMapping("/get-import-template")
- @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
+ @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘", description = "閮ㄩ棬鎸夐儴闂ㄥ悕绉板～鍐欙紝绀轰緥鍙栬嚜褰撳墠绯荤粺鐪熷疄閮ㄩ棬")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 绀轰緥鍙栧綋鍓嶇湡瀹為儴闂ㄥ悕绉帮紝閬垮厤浣跨敤鑰呯収鎶勫畼鏂� demo 瀵艰嚧銆岄儴闂ㄤ笉瀛樺湪銆�
+ List<DeptDO> depts = deptService.getDeptList(new DeptListReqVO());
+ String sampleDept1 = CollUtil.isNotEmpty(depts) ? depts.get(0).getName() : "璇峰～鍐欓儴闂ㄥ悕绉�";
+ String sampleDept2 = depts.size() > 1 ? depts.get(1).getName() : sampleDept1;
+
List<UserImportExcelVO> list = Arrays.asList(
- UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
- .nickname("鑺嬮亾").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
- UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
- .nickname("婧愮爜").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
+ UserImportExcelVO.builder().username("zhangsan").deptName(sampleDept1).email("zhangsan@example.com")
+ .mobile("13800000001").nickname("寮犱笁")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+ UserImportExcelVO.builder().username("lisi").deptName(sampleDept2).email("lisi@example.com")
+ .mobile("13800000002").nickname("鏉庡洓")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
- // 杈撳嚭
- ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
+ // 鏃ユ湡鍒楁寜鏂囨湰杈撳嚭锛岄伩鍏嶆樉绀烘垚 Excel 搴忓垪鍙�
+ ExcelUtils.writeTemplate(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -190,8 +239,39 @@
@PreAuthorize("@ss.hasPermission('system:user:import')")
public CommonResult<UserImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ // 绌烘枃浠� / 鍧忔枃浠� / 妯℃澘涓嶅尮閰嶇瓑锛孍xcelUtils.read 宸茬粺涓�杞崲涓哄彲璇荤殑涓枃鎻愮ず
List<UserImportExcelVO> list = ExcelUtils.read(file, UserImportExcelVO.class);
return success(userService.importUserList(list, updateSupport));
}
+ // ==================== 鍏嶉壌鏉冩帴鍙ｏ紙鐢ㄤ簬 IM 鐐瑰ご鍍忓脊鍚嶇墖銆佸姞濂藉弸鎼滅储绛夊満鏅級 ====================
+
+ @GetMapping("/get-simple")
+ @Operation(summary = "鑾峰緱鐢ㄦ埛绮剧畝淇℃伅", description = "鐢ㄤ簬鐐瑰ご鍍忓脊鍚嶇墖绛夊満鏅紱鍏嶉壌鏉�")
+ @Parameter(name = "id", description = "鐢ㄦ埛缂栧彿", required = true, example = "1024")
+ public CommonResult<UserSimpleRespVO> getSimpleUser(@RequestParam("id") Long id) {
+ AdminUserDO user = userService.getUser(id);
+ if (user == null) {
+ return success(null);
+ }
+ // 鎷兼帴鏁版嵁
+ DeptDO dept = user.getDeptId() != null ? deptService.getDept(user.getDeptId()) : null;
+ Map<Long, DeptDO> deptMap = dept != null ? Collections.singletonMap(dept.getId(), dept) : Collections.emptyMap();
+ return success(CollUtil.getFirst(UserConvert.INSTANCE.convertSimpleList(
+ Collections.singletonList(user), deptMap)));
+ }
+
+ @GetMapping("/list-by-nickname")
+ @Operation(summary = "鎸夋樀绉版ā绯婃悳绱㈢敤鎴风簿绠�淇℃伅", description = "鐢ㄤ簬鍔犲ソ鍙嬬瓑鍦烘櫙锛涘厤閴存潈锛涘綋鍓嶄粎鎸夋樀绉板尮閰�")
+ @Parameter(name = "nickname", description = "鏄电О鍏抽敭璇�", required = true, example = "瓒呯骇绠＄悊鍛�")
+ public CommonResult<List<UserSimpleRespVO>> getSimpleUserListByNickname(@RequestParam("nickname") String nickname) {
+ if (StrUtil.isBlank(nickname)) {
+ return success(Collections.emptyList());
+ }
+ // 鎷兼帴鏁版嵁
+ List<AdminUserDO> list = userService.getUserListByNickname(nickname.trim());
+ Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(list, AdminUserDO::getDeptId));
+ return success(UserConvert.INSTANCE.convertSimpleList(list, deptMap));
+ }
+
}
--
Gitblit v1.9.3