|
|
@@ -134,6 +134,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/list")
|
|
|
@ApiOperation(value = "用户列表(不分页)")
|
|
|
+ @SaCheckPermission("user:list")
|
|
|
@XjrLog(value = "用户列表(不分页)")
|
|
|
public R list(String keyword) {
|
|
|
List<User> list = userService.list(Wrappers.lambdaQuery(User.class)
|
|
|
@@ -148,6 +149,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/page")
|
|
|
@ApiOperation(value = "用户列表(分页)")
|
|
|
+ @SaCheckPermission("user:page")
|
|
|
@XjrLog(value = "用户列表(分页)")
|
|
|
public R page(UserPageDto dto) {
|
|
|
List<Long> deptIds = new ArrayList<>();
|
|
|
@@ -290,6 +292,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/person-page")
|
|
|
@ApiOperation(value = "人员选择组件(分页)")
|
|
|
+ @SaCheckPermission("user:personpage")
|
|
|
@XjrLog(value = "人员选择组件(分页)")
|
|
|
public R personPage(PersonPageDto dto) {
|
|
|
Page<PersonPageVo> voPage = userService.personPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
|
|
|
@@ -299,6 +302,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/info")
|
|
|
@ApiOperation(value = "根据id查询用户信息")
|
|
|
+ @SaCheckPermission("user:info")
|
|
|
@XjrLog(value = "根据id查询用户信息", saveResponseData = true)
|
|
|
public R info(@RequestParam Long id) {
|
|
|
User user = userService.getById(id);
|
|
|
@@ -323,6 +327,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/detail")
|
|
|
@ApiOperation(value = "根据id查询用户信息")
|
|
|
+ @SaCheckPermission("user:detail")
|
|
|
@XjrLog(value = "根据id查询用户信息", saveResponseData = true)
|
|
|
public RT<UserDetailVo> detail(@RequestParam Long id) {
|
|
|
User user = userService.getById(id);
|
|
|
@@ -341,6 +346,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping
|
|
|
@ApiOperation(value = "新增用户")
|
|
|
+ @SaCheckPermission("user:add")
|
|
|
@XjrLog(value = "新增用户", saveRequestData = false, saveResponseData = true)
|
|
|
public R add(@Valid @RequestBody AddUserDto dto) {
|
|
|
if (!OrganizationUtil.validatePassword(dto.getPassword())) {
|
|
|
@@ -351,6 +357,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping
|
|
|
@ApiOperation(value = "修改用户 不能修改用户名")
|
|
|
+ @SaCheckPermission("user:edit")
|
|
|
@XjrLog(value = "修改用户 不能修改用户名", saveRequestData = false, saveResponseData = true)
|
|
|
public R update(@Valid @RequestBody UpdateUserDto dto) {
|
|
|
return R.ok(userService.update(dto));
|
|
|
@@ -358,6 +365,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/current/info")
|
|
|
@ApiOperation(value = "当前登录用户信息")
|
|
|
+ @SaCheckPermission("user:currentinfo")
|
|
|
@XjrLog(value = "当前登录用户信息", saveResponseData = true)
|
|
|
public R info() {
|
|
|
SaSession tokenSession = StpUtil.getTokenSession();
|
|
|
@@ -425,6 +433,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/pending/count")
|
|
|
@ApiOperation(value = "当前待办数量统计")
|
|
|
+ @SaCheckPermission("user:pendingcount")
|
|
|
@XjrLog(value = "当前待办数量统计", saveResponseData = true)
|
|
|
public RT<PendingCountDto> pendingCount() {
|
|
|
PendingCountDto pendingCountDto = new PendingCountDto();
|
|
|
@@ -482,6 +491,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/reset-user-page")
|
|
|
@ApiOperation(value = "移动端用户列表")
|
|
|
+ @SaCheckPermission("user:resetuserpage")
|
|
|
@XjrLog(value = "移动端用户列表")
|
|
|
public RT<PageOutput<ResetUserPageVo>> resetUserPage(UserPageDto dto) {
|
|
|
PageOutput<ResetUserPageVo> userPage = userService.getResetUserPage(dto);
|
|
|
@@ -491,6 +501,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/reset-page-role-list")
|
|
|
@ApiOperation(value = "移动端用户列表分类")
|
|
|
+ @SaCheckPermission("user:resetpagerolelist")
|
|
|
@XjrLog(value = "移动端用户列表分类")
|
|
|
public RT<List<ResetUserRoleVo>> resetUserTree() {
|
|
|
List<ResetUserRoleVo> roleList = new ArrayList<>();
|
|
|
@@ -516,6 +527,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping(value = "/pc-role-tree")
|
|
|
@ApiOperation(value = "pc端用户列表分类")
|
|
|
+ @SaCheckPermission("user:pcroletree")
|
|
|
@XjrLog(value = "pc端用户列表分类")
|
|
|
public RT<List<ResetUserRoleVo>> pcRoleTree() {
|
|
|
List<Department> departmentList = departmentService.list(
|
|
|
@@ -579,6 +591,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping("/update/info")
|
|
|
@ApiOperation(value = "登陆人修改自己得用户信息")
|
|
|
+ @SaCheckPermission("user:updateinfo")
|
|
|
@XjrLog(value = "登陆人修改自己得用户信息", saveResponseData = true)
|
|
|
public R updateInfo(@RequestBody @Valid UpdateInfoDto dto) {
|
|
|
User updateUserInfo = BeanUtil.toBean(dto, User.class);
|
|
|
@@ -593,6 +606,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping("/update/password")
|
|
|
@ApiOperation(value = "当前登录用户修改本人密码")
|
|
|
+ @SaCheckPermission("user:updatepassword")
|
|
|
@XjrLog(value = "当前登录用户修改本人密码", saveRequestData = false, saveResponseData = true)
|
|
|
public RT<Boolean> updatePassword(@RequestBody @Valid UpdatePasswordDto dto) {
|
|
|
if (!OrganizationUtil.validatePassword(dto.getNewPassword())) {
|
|
|
@@ -618,6 +632,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping("/login/reset-password")
|
|
|
@ApiOperation(value = "登录后修改密码")
|
|
|
+ @SaCheckPermission("user:resetpassword")
|
|
|
@XjrLog(value = "登录后修改密码", saveRequestData = false, saveResponseData = true)
|
|
|
public RT<Boolean> loginResetPassword(@RequestBody @Valid LoginResetPasswordDto dto) {
|
|
|
if (!OrganizationUtil.validatePassword(dto.getNewPassword())) {
|
|
|
@@ -641,6 +656,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/update/avatar")
|
|
|
@ApiOperation(value = "当前登录用户修改头像")
|
|
|
+ @SaCheckPermission("user:updateavatar")
|
|
|
@XjrLog(value = "当前登录用户修改头像", saveRequestData = false, saveResponseData = true)
|
|
|
public R uploadAvatar(@RequestParam("file") MultipartFile file) throws Exception {
|
|
|
if (file.isEmpty()) {
|
|
|
@@ -671,6 +687,7 @@ public class UserController {
|
|
|
|
|
|
@DeleteMapping
|
|
|
@ApiOperation(value = "删除用户(可批量)")
|
|
|
+ @SaCheckPermission("user:delete")
|
|
|
@XjrLog(value = "删除用户(可批量)", saveResponseData = true)
|
|
|
public R delete(@RequestBody List<Long> ids) {
|
|
|
if (ids.contains(GlobalConstant.SUPER_ADMIN_USER_ID)) {
|
|
|
@@ -689,7 +706,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping(value = "/change-status")
|
|
|
@ApiOperation(value = "修改状态")
|
|
|
- @SaCheckPermission("classroom:detail")
|
|
|
+ @SaCheckPermission("classroom:changestatus")
|
|
|
@XjrLog(value = "修改状态", saveResponseData = true)
|
|
|
public RT<Boolean> changeStatus(@Valid @RequestBody UserChangeStatusDto dto) throws Exception {
|
|
|
List<User> list = userService.list(new QueryWrapper<User>().lambda()
|
|
|
@@ -705,6 +722,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/info/multi")
|
|
|
@ApiOperation(value = "批量获取用户信息")
|
|
|
+ @SaCheckPermission("user:infomulti")
|
|
|
@XjrLog(value = "批量获取用户信息")
|
|
|
public R usersInfo(@RequestParam String ids) {
|
|
|
return R.ok(userService.getUsersInfo(ids));
|
|
|
@@ -712,6 +730,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/enabled")
|
|
|
@ApiOperation(value = "启用/禁用用户")
|
|
|
+ @SaCheckPermission("user:enabled")
|
|
|
@XjrLog(value = "启用/禁用用户", saveResponseData = true)
|
|
|
public R enabled(@RequestParam Long id) {
|
|
|
User user = userService.getOne(Wrappers.<User>query().lambda().select(User::getEnabledMark).eq(User::getId, id), false);
|
|
|
@@ -730,6 +749,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping("/reset-password")
|
|
|
@ApiOperation(value = "重置密码")
|
|
|
+ @SaCheckPermission("user:resetpassword")
|
|
|
@XjrLog(value = "重置密码", saveResponseData = true)
|
|
|
public RT<Boolean> resetPassword(@RequestBody ResetPasswordDto dto) {
|
|
|
return RT.ok(userService.resetPassword(dto));
|
|
|
@@ -737,6 +757,7 @@ public class UserController {
|
|
|
|
|
|
@PutMapping("/batch-reset-password")
|
|
|
@ApiOperation(value = "批量重置密码")
|
|
|
+ @SaCheckPermission("user:batchresetpassword")
|
|
|
@XjrLog(value = "批量重置密码", saveResponseData = true)
|
|
|
public RT<Boolean> batchResetPassword(@RequestBody List<Long> ids) {
|
|
|
return RT.ok(userService.batchResetPassword(ids));
|
|
|
@@ -744,6 +765,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/bind-unionid")
|
|
|
@ApiOperation(value = "绑定微信 UnionId")
|
|
|
+ @SaCheckPermission("user:bindunionid")
|
|
|
@XjrLog(value = "绑定微信 UnionId", saveResponseData = true)
|
|
|
public R bindUnionId(@RequestBody BindOpenidDto dto) {
|
|
|
User user = userService.getOne(Wrappers.<User>query().lambda().select(User::getId, User::getOpenId, User::getUnionId).eq(User::getId, dto.getId()), false);
|
|
|
@@ -780,6 +802,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/bind-openid")
|
|
|
@ApiOperation(value = "绑定微信 Openid")
|
|
|
+ @SaCheckPermission("user:bindopenid")
|
|
|
@XjrLog(value = "绑定微信 Openid", saveResponseData = true)
|
|
|
public RT<BindOpenidVo> bindOpenid(@RequestBody BindOpenidDto dto) {
|
|
|
return RT.ok(userService.bindOpenid(dto));
|
|
|
@@ -787,6 +810,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/unbind-openid")
|
|
|
@ApiOperation(value = "取消绑定微信 UnionId")
|
|
|
+ @SaCheckPermission("user:unbindopenid")
|
|
|
@XjrLog(value = "取消绑定微信 UnionId", saveResponseData = true)
|
|
|
public R unbindOpenid(@RequestBody UnbindOpenidDto dto) {
|
|
|
return R.ok(userService.unbindOpenid(dto));
|
|
|
@@ -794,6 +818,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/register")
|
|
|
@ApiOperation(value = "家长注册")
|
|
|
+ @SaCheckPermission("user:register")
|
|
|
@XjrLog(value = "家长注册", saveResponseData = true)
|
|
|
public R register(@Valid @RequestBody RegisterDto dto) {
|
|
|
//验证家长手机号是否已经注册
|
|
|
@@ -833,6 +858,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/bind-student")
|
|
|
@ApiOperation(value = "绑定学生")
|
|
|
+ @SaCheckPermission("user:bindstudent")
|
|
|
@XjrLog(value = "绑定学生", saveResponseData = true)
|
|
|
public R bindStudent(@Valid @RequestBody UserStudentBindDto dto) {
|
|
|
User user = userService.getOne(Wrappers.<User>query().lambda()
|
|
|
@@ -851,7 +877,9 @@ public class UserController {
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "/validate-student")
|
|
|
- @XjrLog(value = "未知", saveResponseData = true)
|
|
|
+ @ApiOperation(value = "认证学生")
|
|
|
+ @SaCheckPermission("user:validatestudent")
|
|
|
+ @XjrLog(value = "认证学生", saveResponseData = true)
|
|
|
public RT<UserStudentInfoVo> getValidateStudent(UserStudentBindDto dto) {
|
|
|
|
|
|
UserStudentInfoVo userStudentInfoVo = baseStudentSchoolRollService.selectJoinOne(UserStudentInfoVo.class,
|
|
|
@@ -885,6 +913,7 @@ public class UserController {
|
|
|
|
|
|
@DeleteMapping("/unbind-student")
|
|
|
@ApiOperation(value = "解绑学生")
|
|
|
+ @SaCheckPermission("user:unbindstudent")
|
|
|
@XjrLog(value = "解绑学生", saveResponseData = true)
|
|
|
public R unBindStudent(@Valid @RequestBody UserStudentDeleteDto dto) {
|
|
|
return R.ok(userStudentService.delete(dto));
|
|
|
@@ -892,6 +921,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/student")
|
|
|
@ApiOperation(value = "获取绑定学生")
|
|
|
+ @SaCheckPermission("user:student")
|
|
|
@XjrLog(value = "获取绑定学生")
|
|
|
public R unBindStudent(@Valid @RequestParam Long id) {
|
|
|
return R.ok(baseClassService.getStudents(id));
|
|
|
@@ -899,6 +929,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/user-student")
|
|
|
@ApiOperation(value = "获取绑定学生")
|
|
|
+ @SaCheckPermission("user:userstudent")
|
|
|
@XjrLog(value = "获取绑定学生")
|
|
|
public RT<List<UserStudentVo>> getBindStudent(@Valid @RequestParam Long id) {
|
|
|
|
|
|
@@ -924,6 +955,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/upload-sign")
|
|
|
@ApiOperation(value = "上传签名")
|
|
|
+ @SaCheckPermission("user:uploadsign")
|
|
|
@XjrLog(value = "上传签名", saveResponseData = true)
|
|
|
public RT<Boolean> uploadSign(@Valid @RequestBody UploadSignDto dto) {
|
|
|
long loginIdAsLong = StpUtil.getLoginIdAsLong();
|
|
|
@@ -936,6 +968,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/getSign")
|
|
|
@ApiOperation(value = "获取登录者的签名url")
|
|
|
+ @SaCheckPermission("user:getsign")
|
|
|
@XjrLog(value = "获取登录者的签名url", saveResponseData = true)
|
|
|
public RT<String> getSign() {
|
|
|
long loginIdAsLong = StpUtil.getLoginIdAsLong();
|
|
|
@@ -952,6 +985,7 @@ public class UserController {
|
|
|
|
|
|
@GetMapping("/check-password")
|
|
|
@ApiOperation(value = "验证登录者的密码")
|
|
|
+ @SaCheckPermission("user:checkpassword")
|
|
|
@XjrLog(value = "验证登录者的密码", saveRequestData = false, saveResponseData = true)
|
|
|
public RT<Boolean> checkSignpassword(@RequestParam String password) {
|
|
|
long loginIdAsLong = StpUtil.getLoginIdAsLong();
|
|
|
@@ -964,6 +998,7 @@ public class UserController {
|
|
|
|
|
|
@PostMapping("/upload-mobile")
|
|
|
@ApiOperation(value = "修改手机号")
|
|
|
+ @SaCheckPermission("user:uploadmobile")
|
|
|
@XjrLog(value = "修改手机号", saveResponseData = true)
|
|
|
public R uploadMobile(@Valid @RequestBody UploadMobileDto dto) {
|
|
|
// 验证验证码
|