From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/UserController.java | 336 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 216 insertions(+), 120 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 7d8a40f..e51dd6f 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -1,10 +1,11 @@
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.helper.Md5Helper;
+import com.lf.server.entity.ctrl.UserUpdateEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.sys.TokenService;
import com.lf.server.service.sys.UserService;
@@ -16,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -35,103 +35,222 @@
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);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁瑙掕壊+鍗曚綅鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鏍规嵁瑙掕壊+鍗曚綅鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@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);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectUser")
+ public ResponseMsg<UserEntity> selectUser(int id) {
+ try {
+ UserEntity userEntity = userService.selectUser(id);
+
+ return success(userEntity);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐢ㄦ埛ID鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "uid", value = "鐢ㄦ埛ID", dataType = "String", paramType = "query", example = "admin")
+ })
+ @GetMapping(value = "/selectByUid")
+ public ResponseMsg<UserEntity> selectByUid(String uid) {
+ try {
+ if (StringHelper.isEmpty(uid)) {
+ fail("鐢ㄦ埛ID涓嶈兘涓虹┖", null);
+ }
+
+ UserEntity userEntity = userService.selectByUid(uid);
+
+ return success(userEntity);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鎵�鏈�")
+ @GetMapping(value = "/selectUserAll")
+ public ResponseMsg<List<UserEntity>> selectUserAll() {
+ try {
+ List<UserEntity> list = userService.selectUserAll();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @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, 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);
}
}
@SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "UserEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertUser", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertUser(@RequestBody UserEntity entity, HttpServletRequest req) {
try {
+ String str = userService.validateNewPwd(entity);
+ if (str != null) {
+ return fail(str, -1);
+ }
+
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
entity.setCreateUser(ue.getId());
@@ -141,7 +260,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -151,11 +270,20 @@
@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()) {
+ return fail("瀹炰綋绫婚泦鍚堜负绌�", -1);
+ }
+
UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- for (UserEntity entity : list) {
+ for (UserEntity entity : list) {
+ /*String str = userService.validateNewPwd(entity);
+ if (str != null) {
+ return fail(str, -1);
+ }*/
+ if (ue != null) {
entity.setCreateUser(ue.getId());
}
}
@@ -164,7 +292,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -180,7 +308,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -200,7 +328,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -211,94 +339,62 @@
})
@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);
+ if (str != null) {
+ return fail(str, -1);
+ }*/
+
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
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);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+ @ApiOperation(value = "鏇存柊澶氫釜鐢ㄦ埛瀵嗙爜")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "adminPwd", value = "绠＄悊鍛樺瘑鐮�", dataType = "String", paramType = "body", example = ""),
+ @ApiImplicitParam(name = "newPwd", value = "鏂板瘑鐮�", dataType = "String", paramType = "body", example = ""),
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛ID闆嗗悎", dataType = "List<Integer>", paramType = "body", example = "")
})
- @GetMapping(value = "/selectUser")
- public ResponseMsg<UserEntity> selectUser(int id) {
+ @PostMapping(value = "/updateUsersPwd", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Boolean> updateUsersPwd(@RequestBody UserUpdateEntity uue, HttpServletRequest req) {
try {
- UserEntity userEntity = userService.selectUser(id);
-
- return success(userEntity);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectUserAll")
- public ResponseMsg<List<UserEntity>> selectUserAll() {
- try {
- List<UserEntity> list = userService.selectUserAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏇存柊鐢ㄦ埛瀵嗙爜")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "user", value = "鐢ㄦ埛瀹炰綋绫�", dataType = "UsersEntity", paramType = "body", example = "")
- })
- @PostMapping(value = "/updateUserPwd")
- public ResponseMsg<Boolean> updateUserPwd(@RequestBody UserEntity user, HttpServletRequest req, HttpServletResponse res) {
- try {
- if (user == null) {
- return fail("璇锋彁浜ょ敤鎴蜂俊鎭紒", false);
- }
- if (StringHelper.isEmpty(user.getPwd())) {
- return fail("璇疯緭鍏ョ敤鎴峰瘑鐮侊紒", false);
- }
- if (StringHelper.isEmpty(user.getSalt())) {
- return fail("璇疯緭鍏ョ鐞嗗憳瀵嗙爜锛�", false);
- }
- if (!StringHelper.checkPwdValid(user.getPwd())) {
- return fail("鏂板瘑鐮佷笉绗﹀悎瑙勫垯瑕佹眰锛�", false);
+ if (uue == null || uue.getIds() == null || uue.getIds().isEmpty()) {
+ return fail("娌℃湁鎵惧埌鏁版嵁", false);
}
UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("娌℃湁鐧诲綍鎴栫櫥褰曡秴鏃讹紒", false);
- }
- if (!Md5Helper.validatePassword(user.getSalt(), ue.getPwd())) {
- return fail("绠＄悊鍛樺瘑鐮佷笉姝ｇ‘锛�", false);
+ String str = userService.validateAdminPwd(ue, uue.getAdminPwd());
+ if (str != null) {
+ return fail(str, false);
}
- UserEntity userEntity = userService.selectUser(user.getId());
- if (userEntity == null) {
- return fail("娌℃湁鎵惧埌瑕佷慨鏀圭殑鐢ㄦ埛锛�", false);
+ Integer rows = userService.selectForIsAdmin(ue.getId());
+ if (rows < 1) {
+ return fail("鍙厑璁哥鐞嗗憳鎿嶄綔", false);
}
- // 璁剧疆鏂板瘑鐮�
- String md5 = Md5Helper.reverse(Md5Helper.generate(user.getPwd()));
- userEntity.setPwd(md5);
- // 璁剧疆鏇存柊淇℃伅
- userEntity.setUpdateUser(ue.getId());
- Integer rows = userService.updateUsers(userEntity);
+ str = userService.validateNewPwd(ue, uue.getNewPwd());
+ if (str != null) {
+ return fail(str, false);
+ }
+
+ rows = userService.updateUsersPwd(ue.getId(), ue.getSalt(), uue.getIds());
return success(rows > 0 ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触", rows > 0);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3