From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:12:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index a3079a2..d7c5674 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -11,11 +11,14 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.sys.SysDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.domain.dto.UserMenuEditDto;
import com.ruoyi.system.service.sys.*;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -24,13 +27,14 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 用户信息
- *
+ *
* @author jqs
*/
@RestController
@@ -54,6 +58,25 @@
@Autowired
private ISysConfigService configService;
+
+
+ /**
+ * 根据部门获取所有员工id
+ * @param deptId
+ * @return
+ */
+ @GetMapping("/dept/{deptId}")
+ public R<List<Long>> getUserIds(@PathVariable("deptId") Long deptId)
+ {
+ SysUser sysUser = new SysUser();
+ sysUser.setDeptId(deptId);
+ List<SysUser> userList = userService.selectUserList(sysUser);
+ List<Long> userIds = new ArrayList<>();
+ for (int i = 0; i < userList.size(); i++) {
+ userIds.add(userList.get(i).getUserId());
+ }
+ return R.ok(userIds);
+ }
/**
* 获取用户列表
@@ -135,12 +158,15 @@
{
return R.fail("保存用户'" + username + "'失败，注册账号已存在");
}
- return R.ok(userService.registerUser(sysUser));
+ return R.ok(userService.registerUser(sysUser)!=null);
}
+
+
+
/**
* 获取用户信息
- *
+ *
* @return 用户信息
*/
@GetMapping("getInfo")
@@ -320,10 +346,29 @@
* @date 2023/4/30 15:36
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/getSysUser")
+ @PostMapping("/getSysUser")
public R<SysUser> getSysUser(@RequestBody Long userId){
+ logger.info("userId"+userId);
SysUser sysUser = userService.selectUserById(userId);
+ logger.info("sysUser"+sysUser.toString());
+ return R.ok(sysUser);
+ }
+
+ /**
+ * @description: 注册新用户
+ * @author jqs34
+ * @date 2023/4/30 15:32
+ * @version 1.0
+ */
+ @PostMapping("/registerUser")
+ public R<SysUser> registerUser(@RequestBody SysUser sysUser){
+ sysUser = userService.registerUser(sysUser);
+ return R.ok(sysUser);
+ }
+
+ @PostMapping("/getSysUserByMobile")
+ public R<SysUser> getSysUserByMobile(@RequestBody String mobile){
+ SysUser sysUser = userService.getSysUserByMobile(mobile);
return R.ok(sysUser);
}
@@ -333,28 +378,42 @@
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/registerUser")
- public R registerUser(@RequestBody SysUser sysUser){
- userService.registerUser(sysUser);
- return R.ok();
- }
-
-
-
- /**
- * @description: 更新用户手机
- * @author jqs34
- * @date 2023/4/30 15:32
- * @version 1.0
- */
- @InnerAuth
- @PostMapping("/user/updateUserMobile")
+ @PostMapping("/updateUserMobile")
public R updateUserMobile(@RequestBody SysUser sysUser){
userService.updateUserMobile(sysUser);
return R.ok();
}
+ /**
+ *
+ * @param appEditUserDto
+ * @return
+ */
+ @PostMapping("/editUserInfo")
+ public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
+ userService.editUserInfo(appEditUserDto);
+ return R.ok();
+ }
+ @ApiOperation(value = "修改用户权限")
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE,operContent = "修改用户权限")
+ @PostMapping("/editUserMenu")
+ public R editUserMenu(@RequestBody UserMenuEditDto userMenuEditDto){
+ userService.editUserMenu(userMenuEditDto);
+ return R.ok();
+ }
+ /**
+ * @description 冻结用户
+ * @author jqs
+ * @date 2023/6/29 17:20
+ * @param userId
+ * @return R<Activeness>
+ */
+ @PostMapping("/frozenUser")
+ public R frozenUser(@RequestBody Long userId)
+ {
+ userService.frozenUser(userId);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1