From 05fed078888dd5c2624751b6b29c5e16b7f1b2e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 09:29:28 +0800
Subject: [PATCH] 测评接口，bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 97 +++++++++++++++++++++++++++++++++---------------
1 files changed, 67 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index e4893e0..c0da812 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.system;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -12,6 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
+import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.SysUserVO;
@@ -19,8 +24,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -34,7 +38,7 @@
*/
@Api(tags = "用户信息")
@RestController
-@RequestMapping("/system/user")
+@RequestMapping("")
public class SysUserController extends BaseController
{
@Autowired
@@ -47,13 +51,17 @@
private ISysDeptService deptService;
@Autowired
private TokenService tokenService;
+ @Autowired
+ private TProjectTeamService projectTeamService;
+ @Autowired
+ private TProjectTeamStaffService projectTeamStaffService;
/**
* 获取用户列表
*/
@ApiOperation(value = "获取用户列表")
- @PostMapping("/list")
- @PreAuthorize("@ss.hasPermi('system:user')")
+ @PostMapping("/system/user/list")
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult list(@RequestBody SysUserQuery query)
{
PageInfo<SysUserVO> list = userService.pageList(query);
@@ -61,12 +69,36 @@
}
@ApiOperation(value = "获取用户列表-不分页")
- @PostMapping("/listNotPage")
- @PreAuthorize("@ss.hasPermi('system:user')")
-
+ @PostMapping("/system/user/listNotPage")
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult listNotPage()
{
List<SysUser> list = userService.selectList();
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation(value = "获取用户列表-不分页-根据角色筛选")
+ @GetMapping("/system/user/listByRole")
+ public AjaxResult listByRole(@RequestParam(value = "roleId",required = false) Long roleId,
+ @RequestParam(value = "nickName",required = false) String nickName)
+ {
+ // 获取当前用户项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ List<TProjectTeamStaff> staffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if (CollectionUtils.isEmpty(staffs)){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List<String> teamIds = staffs.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+ LambdaQueryWrapper<TProjectTeamStaff> wrapper = new LambdaQueryWrapper<>();
+ if(Objects.nonNull(roleId)){
+ wrapper.eq(TProjectTeamStaff::getRoleType,Integer.parseInt(roleId.toString()));
+ }
+ wrapper.in(TProjectTeamStaff::getTeamId, teamIds);
+ List<TProjectTeamStaff> teamStaffs = projectTeamStaffService.list(wrapper);
+ List<Long> userIds = teamStaffs.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+
+ List<SysUser> list = userService.listByRole(userIds,nickName);
return AjaxResult.success(list);
}
@@ -86,7 +118,7 @@
* 获取用户详情
*/
@ApiOperation(value = "获取用户详情")
- @GetMapping("/getDetail")
+ @GetMapping("/system/user/getDetail")
public AjaxResult getDetail(@RequestParam Long userId)
{
SysUser sysUser = userService.selectUserById(userId);
@@ -100,7 +132,7 @@
* 获取用户详情
*/
@ApiOperation(value = "获取用户详情")
- @GetMapping("/queryDetail")
+ @GetMapping("/system/user/queryDetail")
public AjaxResult queryDetail()
{
Long userId = tokenService.getLoginUser().getUserId();
@@ -116,7 +148,7 @@
* 获取用户数量统计
*/
@ApiOperation(value = "获取用户数量统计")
- @PostMapping("/getUserCount")
+ @PostMapping("/system/user/getUserCount")
public AjaxResult getUserCount()
{
Map<String,Integer> map = new HashMap<>();
@@ -135,7 +167,7 @@
/**
* 移除黑名单
*/
- @GetMapping("/removeBlackList")
+ @GetMapping("/system/user/removeBlackList")
public AjaxResult removeBlackList(@RequestParam String ids)
{
String[] split = ids.split(",");
@@ -151,24 +183,26 @@
* 新增用户
*/
// @PreAuthorize("@ss.hasPermi('system:user:add')")
- @ApiOperation(value = "新增用户管理")
+ @ApiOperation(value = "新增用户管理",response = SysUser.class)
@Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public AjaxResult add(@Validated @RequestBody SysUser user)
+ @PostMapping("/api/system/user/add")
+ public R<String> add(@RequestBody String param)
{
+ SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
- return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+ return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
- return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+ return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword("123456"));
+ user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
userService.insertUser(user);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -177,26 +211,28 @@
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@ApiOperation(value = "修改用户管理")
@Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- public AjaxResult edit(@Validated @RequestBody SysUser user)
+ @PostMapping("/api/system/user/edit")
+ public R edit(@RequestBody String param)
{
+ SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
if (!userService.checkUserNameUnique(user))
{
- return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+ return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
- return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+ return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setUpdateBy(getUsername());
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
- return AjaxResult.success(userService.updateUser(user));
+ user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
+ return R.ok(userService.updateUser(user));
}
/**
@@ -205,7 +241,7 @@
// @PreAuthorize("@ss.hasPermi('system:user:remove')")
@ApiOperation(value = "批量删除用户")
@Log(title = "用户信息-批量删除用户", businessType = BusinessType.DELETE)
- @DeleteMapping("/deleteById/{ids}")
+ @DeleteMapping("/system/user/deleteById/{ids}")
public AjaxResult remove(@PathVariable String ids)
{
String[] split = ids.split(",");
@@ -226,9 +262,10 @@
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@ApiOperation(value = "重置密码")
@Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
- @PostMapping("/resetPwd")
- public AjaxResult resetPwd(@RequestBody SysUser user)
+ @PostMapping("/api/system/user/resetPwd")
+ public AjaxResult resetPwd(@RequestBody String param)
{
+ SysUser user = JSON.parseObject(param,SysUser.class);
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -241,7 +278,7 @@
*/
@ApiOperation(value = "状态修改")
@Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
+ @PutMapping("/system/user/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
{
SysUser loginUser = tokenService.getLoginUser().getUser();
@@ -260,7 +297,7 @@
* 根据用户编号获取授权角色
*/
// @PreAuthorize("@ss.hasPermi('system:user:query')")
- @GetMapping("/authRole/{userId}")
+ @GetMapping("/system/user/authRole/{userId}")
public AjaxResult authRole(@PathVariable("userId") Long userId)
{
AjaxResult ajax = AjaxResult.success();
@@ -276,7 +313,7 @@
*/
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.GRANT)
- @PutMapping("/authRole")
+ @PutMapping("/system/user/authRole")
public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
{
userService.checkUserDataScope(userId);
@@ -288,7 +325,7 @@
* 获取部门树列表
*/
// @PreAuthorize("@ss.hasPermi('system:user:list')")
- @GetMapping("/deptTree")
+ @GetMapping("/system/user/deptTree")
public AjaxResult deptTree(SysDept dept)
{
return AjaxResult.success(deptService.selectDeptTreeList(dept));
--
Gitblit v1.7.1