From dca36684d56ab66d6a7ce5172ef9e2b916b17a87 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Wed, 24 Jan 2024 19:12:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/mapper/RoleMapper.java | 2 +- src/main/java/com/jsl/oa/model/voData/UserEditVO.java | 2 ++ src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java | 3 +++ src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java index e4cf57e..5dc299e 100644 --- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java +++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java @@ -12,7 +12,7 @@ public interface RoleMapper { @Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})") void roleAddUser(Long uid, Long rid); - @Select("INSERT INTO organize_oa.oa_role (role_name) VALUES (#{roleName})") + @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName,display_name})") void roleAdd(RoleDO roleDO); @Delete("delete from organize_oa.oa_role_user where uid=#{uid}") diff --git a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java b/src/main/java/com/jsl/oa/model/voData/UserEditVO.java index 0f00012..b04b3d1 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java +++ b/src/main/java/com/jsl/oa/model/voData/UserEditVO.java @@ -10,6 +10,8 @@ import javax.validation.constraints.Pattern; @Data public class UserEditVO { + @NotNull + private Long rid; @NotNull private Long id; diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java index 94e4b3e..fb7edb2 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -74,6 +74,9 @@ public class AuthServiceImpl implements AuthService { // 插入数据 if (userMapper.insertUser(userDO)) { userDO.setPassword(null); + //默认角色为学生 + UserDO userDO1 = userMapper.getUserByUserNum(userDO.getUsername()); + roleDAO.addRoleUser(userDO1.getId(), 2L); return ResultUtil.success("注册成功", userDO); } else { return ResultUtil.error(ErrorCode.DATABASE_INSERT_ERROR); diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index a9c3c75..49af43d 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -249,6 +249,7 @@ public class UserServiceImpl implements UserService { .setAccountNoLocked(userEditVO.getIsLocked()); //向数据库中修改属性 userDAO.userEdit(userDO); + roleDAO.roleChangeUser(userEditVO.getId(),userEditVO.getRid()); return ResultUtil.success("用户信息修改成功"); } From c9dfeabeb4588cb78f90e6b54c25cf577fbba301 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 24 Jan 2024 20:02:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?patch:=20=E4=BF=AE=E8=A1=A5=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 21 +++++++++++++++ src/main/java/com/jsl/oa/dao/UserDAO.java | 26 +++++++++++++------ .../java/com/jsl/oa/mapper/UserMapper.java | 3 +++ .../oa/model/voData/UserCurrentBackVO.java | 13 +++++++--- .../jsl/oa/services/impl/UserServiceImpl.java | 10 +++---- .../java/com/jsl/oa/utils/Processing.java | 8 +++--- 6 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..21efddb --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + environment { + QODANA_TOKEN=credentials('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiJwNTZYRyIsInByb2plY3QiOiIzd1JQNyIsInRva2VuIjoiQWFxVkoifQ.R3TH0E2LgVpBorJ1wyIx3zjIM1p4j-taEEShZKhH2l8') + } + agent { + docker { + args ''' + -v "${WORKSPACE}":/data/project + --entrypoint="" + ''' + image 'jetbrains/qodana-' + } + } + stages { + stage('Qodana') { + steps { + sh '''qodana''' + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/jsl/oa/dao/UserDAO.java b/src/main/java/com/jsl/oa/dao/UserDAO.java index 7829b6d..2a9bd0f 100755 --- a/src/main/java/com/jsl/oa/dao/UserDAO.java +++ b/src/main/java/com/jsl/oa/dao/UserDAO.java @@ -130,23 +130,27 @@ public class UserDAO { userMapper.userEditProfile(userEditProfileVO); } - public List userCurrentAll(UserAllCurrentVO userAllCurrentVO) { + public UserCurrentBackVO userCurrentAll(UserAllCurrentVO userAllCurrentVO) { log.info("\t> 执行 DAO 层 UserDAO.userCurrentAll 方法"); log.info("\t\t> 从 MySQL 获取数据"); List userCurrentDO = userMapper.getAllUser(userAllCurrentVO); - List userCurrentDOList = new ArrayList<>(); - userCurrentDO.forEach(it -> userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO))); - return userCurrentDOList; + UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO(); + userCurrentBackVO.setUsers(new ArrayList<>()) + .setCount(userMapper.getUsersCount()); + userCurrentDO.forEach(it -> userCurrentBackVO.getUsers().add(Processing.returnUserInfo(it, roleDAO, permissionDAO))); + return userCurrentBackVO; } - public List userCurrentAllLike(UserAllCurrentVO userAllCurrentVO) { + public UserCurrentBackVO userCurrentAllLike(UserAllCurrentVO userAllCurrentVO) { log.info("\t> 执行 DAO 层 UserDAO.userCurrentAllLike 方法"); log.info("\t\t> 从 MySQL 获取数据"); List userCurrentDO = userMapper.getAllUserBySearch(userAllCurrentVO); - List userCurrentDOList = new ArrayList<>(); - userCurrentDO.forEach(it -> userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO))); - return userCurrentDOList; + UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO(); + userCurrentBackVO.setUsers(new ArrayList<>()) + .setCount(userMapper.getUsersCount()); + userCurrentDO.forEach(it -> userCurrentBackVO.getUsers().add(Processing.returnUserInfo(it, roleDAO, permissionDAO))); + return userCurrentBackVO; } @@ -250,4 +254,10 @@ public class UserDAO { log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getUserByPhone(phone); } + + public Long getUsersCount() { + log.info("\t> 执行 DAO 层 getUsersCount 方法"); + log.info("\t\t> 从 MySQL 获取数据"); + return userMapper.getUsersCount(); + } } diff --git a/src/main/java/com/jsl/oa/mapper/UserMapper.java b/src/main/java/com/jsl/oa/mapper/UserMapper.java index 890fcad..4de3730 100755 --- a/src/main/java/com/jsl/oa/mapper/UserMapper.java +++ b/src/main/java/com/jsl/oa/mapper/UserMapper.java @@ -91,4 +91,7 @@ public interface UserMapper { @Select("SELECT is_delete FROM organize_oa.oa_user WHERE id = #{id}") boolean userGetDelete(Long id); + + @Select("SELECT COUNT(*) FROM organize_oa.oa_user") + Long getUsersCount(); } diff --git a/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java b/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java index b7e1a50..66b94a5 100755 --- a/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java +++ b/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java @@ -18,9 +18,16 @@ import java.util.List; @Data @Accessors(chain = true) public class UserCurrentBackVO { - private ReturnUser user; - private ReturnUserRole role; - private List permission; + private Long count; + private List users; + + @Data + @Accessors(chain = true) + public static class UserCurrent { + private ReturnUser user; + private ReturnUserRole role; + private List permission; + } @Data @Accessors(chain = true) diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 49af43d..a60f852 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -110,23 +110,23 @@ public class UserServiceImpl implements UserService { userAllCurrentVO.setPage((userAllCurrentVO.getPage() - 1) * userAllCurrentVO.getLimit()); } // 检查是否处于模糊查询 - List userAllCurrentVOList; + UserCurrentBackVO userCurrentBackVO; if (userAllCurrentVO.getSearch() != null && !userAllCurrentVO.getSearch().isEmpty()) { if (Pattern.matches("^[0-9A-Za-z_@]+$", userAllCurrentVO.getSearch())) { - userAllCurrentVOList = userDAO.userCurrentAllLike(userAllCurrentVO); + userCurrentBackVO = userDAO.userCurrentAllLike(userAllCurrentVO); } else { ArrayList arrayList = new ArrayList<>(); arrayList.add("只允许 0-9、A-Z、a-z、_和@进行查询"); return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, arrayList); } } else { - userAllCurrentVOList = userDAO.userCurrentAll(userAllCurrentVO); + userCurrentBackVO = userDAO.userCurrentAll(userAllCurrentVO); } // 检查是否存在 Role 筛选 if (userAllCurrentVO.getRole() != null) { - userAllCurrentVOList.removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid())); + userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid())); } - return ResultUtil.success(userAllCurrentVOList); + return ResultUtil.success(userCurrentBackVO); } @Override diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java index a416f22..10e1e28 100755 --- a/src/main/java/com/jsl/oa/utils/Processing.java +++ b/src/main/java/com/jsl/oa/utils/Processing.java @@ -259,8 +259,8 @@ public class Processing { * @param userDO 用户信息 * @return {@link BaseResponse} */ - public static @NotNull UserCurrentBackVO returnUserInfo(@NotNull UserDO userDO, RoleDAO roleDAO, PermissionDAO permissionDAO) { - UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO(); + public static @NotNull UserCurrentBackVO.UserCurrent returnUserInfo(@NotNull UserDO userDO, RoleDAO roleDAO, PermissionDAO permissionDAO) { + UserCurrentBackVO.UserCurrent userCurrent = new UserCurrentBackVO.UserCurrent(); // 获取用户角色 RoleUserDO getUserRole = roleDAO.getRoleUserByUid(userDO.getId()); if (getUserRole == null) { @@ -280,7 +280,7 @@ public class Processing { // 获取权限列表信息 getPermissionForString = permissionDAO.getPermission(userDO.getId()); } - userCurrentBackVO.setUser(new UserCurrentBackVO.ReturnUser() + userCurrent.setUser(new UserCurrentBackVO.ReturnUser() .setId(userDO.getId()) .setJobId(userDO.getJobId()) .setUsername(userDO.getUsername()) @@ -304,7 +304,7 @@ public class Processing { .setRole(new UserCurrentBackVO.ReturnUserRole() .setRid(getUserRole.getRid())) .setPermission(getPermissionForString); - return userCurrentBackVO; + return userCurrent; } public static List orderUser(List userDOS,String order,String orderBy){ From 93dbfb62f4b04a189c8cfcff741d0d052abbffbb Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 24 Jan 2024 20:42:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20176yunxuan=20=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/mapper/RoleMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java index 5dc299e..48df3bc 100644 --- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java +++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java @@ -12,7 +12,7 @@ public interface RoleMapper { @Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})") void roleAddUser(Long uid, Long rid); - @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName,display_name})") + @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName}, ${display_name})") void roleAdd(RoleDO roleDO); @Delete("delete from organize_oa.oa_role_user where uid=#{uid}")