This commit is contained in:
张良(004796)
2024-03-13 14:56:59 +08:00
parent 9559658dda
commit e79d7d8c5c
18 changed files with 494 additions and 41 deletions

View File

@@ -13,6 +13,11 @@ import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.app.common.IdReq;
import com.ruoyi.xq.service.UserInviteService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@@ -38,14 +43,15 @@ import java.util.stream.Collectors;
public class UserController extends BaseController {
private final UserService userService;
private final UserInviteService userInviteService;
/**
* 查询用户管理列表
*/
@SaCheckPermission("xq:user:list")
@GetMapping("/list")
public TableDataInfo<User> list(User bo, PageQuery pageQuery) {
Page<User> page = userService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserAdminVo> list(UserAdminVo bo, PageQuery pageQuery) {
Page<UserAdminVo> page = userService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -66,6 +72,57 @@ public class UserController extends BaseController {
return R.ok(users.stream().map(User::getUsercode).collect(Collectors.toList()));
}
@PostMapping("/resetPwd")
@SaCheckPermission("xq:user:restPwd")
@Log(title = "重置用户密码", businessType = BusinessType.UPDATE)
public R<Void> resetPwd(@RequestBody ResetPasswordAdminReq req) {
User user = userService.getById(req.getUserId());
userService.resetPassword(req.getUserId(),user.getPassword());
return R.ok();
}
@SaCheckPermission("xq:user:updateMobile")
@Log(title = "修改用户手机", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/updateMobile")
public R<Void> updateMobile(@RequestBody UpdateMobileAdminReq bo) {
userService.updateMobileUser(bo);
return R.ok();
}
@SaCheckPermission("xq:user:unBindInvite")
@Log(title = "解绑用户邀请人", businessType = BusinessType.OTHER)
@GetMapping("/unBindInvite")
public R<Void> unBindInvite(Long userId) {
userInviteService.unBindInviteUser(userId);
return R.ok();
}
@SaCheckPermission("xq:user:bindInvite")
@Log(title = "绑定用户邀请人", businessType = BusinessType.OTHER)
@GetMapping("/bindInvite")
public R<Void> bindInvite(Long userId,String inviteUsercode) {
userInviteService.bindInvite(userId,inviteUsercode);
return R.ok();
}
@PostMapping("/resetAvatar")
@SaCheckPermission("xq:user:resetAvatar")
@Log(title = "重置用户头像", businessType = BusinessType.UPDATE)
public R<Void> resetAvatar(@RequestBody IdReq res){
userService.resetAvatar(res.getId());
return R.ok();
}
@PostMapping("/resetNickname")
@SaCheckPermission("xq:user:resetNickname")
@Log(title = "重置用户昵称", businessType = BusinessType.UPDATE)
public R<Void> resetNickname(@RequestBody IdReq res){
userService.resetNickname(res.getId());
return R.ok();
}
/**
* 获取用户管理详细信息
*

View File

@@ -0,0 +1,95 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserInvite;
import com.ruoyi.xq.service.UserInviteService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* 用户邀请
*
* @author 77
* @date 2024-03-13
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/xq/userInvite")
public class UserInviteController extends BaseController {
private final UserInviteService userInviteService;
/**
* 查询用户邀请列表
*/
@SaCheckPermission("xq:userInvite:list")
@GetMapping("/list")
public TableDataInfo<UserInvite> list(UserInvite bo, PageQuery pageQuery) {
Page<UserInvite> page = userInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
/**
* 获取用户邀请详细信息
*
* @param id 主键
*/
@SaCheckPermission("xq:userInvite:query")
@GetMapping("/{id}")
public R<UserInvite> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(userInviteService.getById(id));
}
/**
* 新增用户邀请
*/
@SaCheckPermission("xq:userInvite:add")
@Log(title = "用户邀请", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserInvite bo) {
return toAjax(userInviteService.save(bo));
}
/**
* 修改用户邀请
*/
@SaCheckPermission("xq:userInvite:edit")
@Log(title = "用户邀请", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) {
return toAjax(userInviteService.updateById(bo));
}
/**
* 删除用户邀请
*
* @param ids 主键串
*/
@SaCheckPermission("xq:userInvite:remove")
@Log(title = "用户邀请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(userInviteService.removeBatchByIds(Arrays.asList(ids)));
}
}