From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/UserController.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 6 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 415abd2..fadba3a 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -1,8 +1,9 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+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;
@@ -174,6 +175,105 @@
}
@SysLog()
+ @ApiOperation(value = "鏌ヨ鏄�/鍚︿负绠＄悊鍛�")
+ @GetMapping(value = "/selectForIsAdmin")
+ public ResponseMsg<Boolean> selectForIsAdmin(HttpServletRequest req) {
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", false);
+ }
+
+ Integer rows = userService.selectForIsAdmin(ue.getId());
+
+ return success("鎴愬姛", rows > 0);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), 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.getMessage(), 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.getMessage(), 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.getMessage(), 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.getMessage(), false);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "")
@@ -205,6 +305,7 @@
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<UserEntity>", paramType = "body", example = "")
})
@PostMapping(value = "/insertUsers", produces = "application/json; charset=UTF-8")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> insertUsers(@RequestBody List<UserEntity> list, HttpServletRequest req) {
try {
if (list == null || list.isEmpty()) {
@@ -213,10 +314,10 @@
UserEntity ue = tokenService.getCurrentUser(req);
for (UserEntity entity : list) {
- String str = userService.validateNewPwd(entity);
+ /*String str = userService.validateNewPwd(entity);
if (str != null) {
return fail(str, -1);
- }
+ }*/
if (ue != null) {
entity.setCreateUser(ue.getId());
}
@@ -273,12 +374,13 @@
})
@ResponseBody
@PostMapping(value = "/updateUser", produces = "application/json; charset=UTF-8")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> updateUser(@RequestBody UserEntity entity, HttpServletRequest req) {
try {
- String str = userService.validateOldPwd(entity);
+ /*String str = userService.validateOldPwd(entity);
if (str != null) {
return fail(str, -1);
- }
+ }*/
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -313,12 +415,17 @@
return fail(str, false);
}
+ Integer rows = userService.selectForIsAdmin(ue.getId());
+ if (rows < 1) {
+ return fail("鍙厑璁哥鐞嗗憳鎿嶄綔", false);
+ }
+
str = userService.validateNewPwd(ue, uue.getNewPwd());
if (str != null) {
return fail(str, false);
}
- Integer rows = userService.updateUsersPwd(ue.getId(), ue.getSalt(), uue.getIds());
+ rows = userService.updateUsersPwd(ue.getId(), ue.getSalt(), uue.getIds());
return success(rows > 0 ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触", rows > 0);
} catch (Exception ex) {
--
Gitblit v1.9.3