From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/controller/UserController.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/UserController.java b/src/main/java/com/qxueyou/scc/controller/UserController.java
index 290d4d0..5302df6 100644
--- a/src/main/java/com/qxueyou/scc/controller/UserController.java
+++ b/src/main/java/com/qxueyou/scc/controller/UserController.java
@@ -21,7 +21,7 @@
import java.util.Map;
/**
- * 角色管理前端控制器
+ * 瑙掕壊绠＄悊鍓嶇鎺у埗鍣�
*
* @author chenjunliang
*
@@ -39,7 +39,7 @@
ITeacherService teacherService;
/**
- * 获取角色列表
+ * 鑾峰彇瑙掕壊鍒楄〃
*
* @return
*/
@@ -51,7 +51,7 @@
}
/**
- * 获取人员列表
+ * 鑾峰彇浜哄憳鍒楄〃
*/
@GetMapping(value = "getUserLst")
public Result getUserLstByRoleId(String roleId, Integer pageSize, Integer pageNum, String keyword) {
@@ -60,10 +60,10 @@
}
/**
- * 删除人员
+ * 鍒犻櫎浜哄憳
*
* @param userid
- * 用户id可以多个 ,分隔
+ * 鐢ㄦ埛id鍙互澶氫釜 ,鍒嗛殧
*/
@PostMapping(value = "delete")
public Result delete(String userId) {
@@ -72,7 +72,7 @@
}
/**
- * 新增人员
+ * 鏂板浜哄憳
*/
@PostMapping(value = "add")
public Result insertUser(String roleId, String name, String account, String password, String mobilePhone) {
@@ -81,14 +81,14 @@
User user = userService.getUserByAccount(account, ClientUtils.getOrgId());
if (null != user) {
- return new Result(false,"重复的用户，不允许添加！");
+ return new Result(false,"閲嶅鐨勭敤鎴凤紝涓嶅厑璁告坊鍔狅紒");
}
- //如果角色是老师，添加老师信息
+ //濡傛灉瑙掕壊鏄�佸笀锛屾坊鍔犺�佸笀淇℃伅
if(roleId.equals(UserRole.ROLE_TEACHER_ID)){
result= teacherService.add(name, password, mobilePhone, account);
}else{
- user = userService.insertUser(name, account, mobilePhone, password, true, ClientUtils.getOrgId());
+ user = userService.insertUser(null,name, account, mobilePhone, password, true, ClientUtils.getOrgId());
result= userService.addRole(user.getUserId(), roleId);
}
@@ -96,7 +96,7 @@
}
/**
- * 新增教师
+ * 鏂板鏁欏笀
*/
@PostMapping(value = "addTeachers")
public Result addTeachers(String teacherIds, String roleId) {
@@ -104,7 +104,7 @@
}
/**
- * 更新
+ * 鏇存柊
*/
@PostMapping(value = "update")
public Result updateUser(String userId, String name, String account, String password, String mobilePhone) {
@@ -112,7 +112,7 @@
UserTeacher teacher = ClientUtils.isAdmin() ? null : teacherService.getTeacherByUserId(ClientUtils.getUserId());
- //如果用户是老师，更新老师信息
+ //濡傛灉鐢ㄦ埛鏄�佸笀锛屾洿鏂拌�佸笀淇℃伅
if(teacher!=null){
result = teacherService.update(teacher.getTeacherId(), name, account, password, mobilePhone, account);
}else{
@@ -123,7 +123,7 @@
}
/**
- * 角色管理 显示角色信息
+ * 瑙掕壊绠＄悊 鏄剧ず瑙掕壊淇℃伅
*/
@GetMapping(value = "queryRoleDetail")
public Result queryRoleDetail(String roleId) {
@@ -131,7 +131,7 @@
}
/**
- * 显示教师列表
+ * 鏄剧ず鏁欏笀鍒楄〃
*/
@GetMapping(value = "findTeacherLst")
public Result findTeacherLst(String keyword, Integer pageSize, Integer pageNum, String roleId) {
@@ -143,7 +143,7 @@
}
/**
- * 修改角色信息
+ * 淇敼瑙掕壊淇℃伅
*/
@PostMapping(value = "updateRole")
public Result updateRole(String roleId, String menuIds, String name) {
@@ -151,7 +151,7 @@
}
/**
- * 删除角色
+ * 鍒犻櫎瑙掕壊
*/
@PostMapping(value = "deleteRole")
public Result deleteRole(String roleId) {
@@ -159,7 +159,7 @@
}
/**
- * 获取所有菜单列表
+ * 鑾峰彇鎵�鏈夎彍鍗曞垪琛�
*/
@GetMapping(value = "findAllMenuLst")
public Result findMenuLst() {
@@ -168,11 +168,19 @@
}
/**
- * 新增角色
+ * 鏂板瑙掕壊
*/
@PostMapping(value = "addRole")
public Result addRole(String name,Integer roleType) {
return userRoleService.addRole(name,String.valueOf(roleType));
}
+
+ /**
+ * 缁熻浜烘暟
+ */
+ @GetMapping(value = "countUser")
+ public Result countUser() {
+ return new Result(true,"cg", CollectionUtils.newObjectMap("sex",userService.countUsersex(),"sex2",userService.countUser()));
+ }
}
--
Gitblit v1.8.0