From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/UserController.java | 168 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 107 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java
index 400b4cd..9b415ca 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -3,6 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.sys.RoleEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.entity.ctrl.UserUpdateEntity;
import com.lf.server.helper.StringHelper;
@@ -34,65 +35,30 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", required = false, example = "瀹�")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String uname) {
- try {
- int count = userService.selectCount(uname);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "uname", value = "鐢ㄦ埗鍚�", dataType = "String", paramType = "query", example = "瀹�"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<UserEntity>> selectByPage(String uname, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, String depcode, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCount(uname);
+
+ int count = userService.selectCount(uname, depcode);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
+
+ List<UserEntity> rs = userService.selectByPage(uname, depcode, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -101,26 +67,26 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
@ApiImplicitParam(name = "roleid", value = "瑙掕壊ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageForRole")
- public ResponseMsg<List<UserEntity>> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<UserEntity>> selectByPageForRole(String uname, Integer roleid, String depcode, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCountForRole(uname, roleid, depid);
+ int count = userService.selectCountForRole(uname, roleid, depcode);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPageForRole(uname, roleid, depid, pageSize, pageSize * (pageIndex - 1));
+ List<UserEntity> rs = userService.selectByPageForRole(uname, roleid, depcode, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -136,7 +102,7 @@
return success(userEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -156,7 +122,7 @@
return success(userEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -169,7 +135,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -187,7 +153,88 @@
return success("鎴愬姛", rows > 0);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏄�/鍚︿负绠＄悊鍛�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐢ㄦ埛ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectIsAdmin")
+ public ResponseMsg<Boolean> selectIsAdmin(Integer id) {
+ try {
+ UserEntity ue = userService.selectUser(id);
+ if (ue == null) {
+ return fail("鐢ㄦ埛涓嶅瓨鍦�", false);
+ }
+
+ Integer rows = userService.selectForIsAdmin(ue.getId());
+
+ return success("鎴愬姛", rows > 0);
+ } catch (Exception ex) {
+ return fail(ex, false);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ绠＄悊鍛樼敤鎴�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "绠＄悊鍛樼被鍒�", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectAdminUsers")
+ public ResponseMsg<Object> selectAdminUsers(Integer type) {
+ try {
+ if (null == type || type < 1) {
+ return fail("绠＄悊鍛樼被鍒笉鑳戒负绌烘垨灏忎簬1", false);
+ }
+
+ List<UserEntity> rs = userService.selectAdminUsers(type);
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, false);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐢ㄦ埛ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectRoleByUserId")
+ public ResponseMsg<Object> selectRoleByUserId(Integer id) {
+ try {
+ if (null == id || id < 1) {
+ return fail("鐢ㄦ埛ID涓嶈兘涓虹┖鎴栧皬浜�1", false);
+ }
+
+ List<RoleEntity> rs = userService.selectRoleByUserId(id);
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, false);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁瑙掕壊鏌ヨ鐢ㄦ埛")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "瑙掕壊ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectUserByRoleId")
+ public ResponseMsg<Object> selectUserByRoleId(Integer id) {
+ try {
+ if (null == id || id < 1) {
+ return fail("鐢ㄦ埛ID涓嶈兘涓虹┖鎴栧皬浜�1", false);
+ }
+
+ List<UserEntity> rs = userService.selectUserByRoleId(id);
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, false);
}
}
@@ -197,13 +244,12 @@
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertUser", produces = "application/json; charset=UTF-8")
- @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> insertUser(@RequestBody UserEntity entity, HttpServletRequest req) {
try {
- /*String str = userService.validateNewPwd(entity);
+ String str = userService.validateNewPwd(entity);
if (str != null) {
return fail(str, -1);
- }*/
+ }
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -214,7 +260,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -246,7 +292,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -262,7 +308,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -282,7 +328,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -306,11 +352,11 @@
entity.setUpdateUser(ue.getId());
}
- int count = userService.updateUsers(entity);
+ int count = userService.updateUser(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -348,7 +394,7 @@
return success(rows > 0 ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触", rows > 0);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
}
--
Gitblit v1.9.3