From 77c393ca83c6081e61e5497a33cc8a4dbc5228f2 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Mon, 22 Jan 2024 11:15:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=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/dao/InfoDAO.java | 2 + src/main/java/com/jsl/oa/dao/ProjectDAO.java | 39 ++++++++++++-------- src/main/java/com/jsl/oa/dao/RoleDAO.java | 10 +++++ src/main/java/com/jsl/oa/dao/UserDAO.java | 37 ++++++++++++++++--- 4 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/jsl/oa/dao/InfoDAO.java b/src/main/java/com/jsl/oa/dao/InfoDAO.java index 4660e44..451ddab 100644 --- a/src/main/java/com/jsl/oa/dao/InfoDAO.java +++ b/src/main/java/com/jsl/oa/dao/InfoDAO.java @@ -36,6 +36,7 @@ public class InfoDAO { */ public CarouselDO getCarousel() { log.info("\t> 执行 DAO 层 InfoDAO.getCarousel 方法"); + log.info("\t\t> 从 MySQL 获取数据"); String getCarouselSql = infoMapper.getCarousel(); CarouselDO getCarousel = null; if (getCarouselSql != null && !getCarouselSql.equals("{}")) { @@ -84,6 +85,7 @@ public class InfoDAO { log.info("\t> 执行 DAO 层 InfoDAO.setCarousel 方法"); sortCarousel(carouselDO); String setCarouselSql = gson.toJson(carouselDO); + log.info("\t\t> 从 MySQL 获取数据"); return infoMapper.setCarousel(setCarouselSql); } } diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 6a3558a..0ec8691 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -6,13 +6,10 @@ import com.jsl.oa.model.doData.ProjectCuttingDO; import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.ProjectUserDO; import com.jsl.oa.model.doData.info.ProjectShowDO; -import com.jsl.oa.model.voData.ProjectCuttingAddVO; import com.jsl.oa.model.voData.ProjectInfoVO; -import com.jsl.oa.utils.BaseResponse; -import com.jsl.oa.utils.ErrorCode; -import com.jsl.oa.utils.ResultUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Component; @@ -30,35 +27,41 @@ public class ProjectDAO { public void projectAdd(ProjectInfoVO projectAdd) { log.info("\t> 执行 DAO 层 ProjectDAO.projectAdd 方法"); + log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectAdd(projectAdd); } public void projectEdit(ProjectInfoVO projectEdit) { log.info("\t> 执行 DAO 层 ProjectDAO.projectEdit 方法"); + log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectEdit(projectEdit); } public boolean isExistProject(Long id) { log.info("\t> 执行 DAO 层 ProjectDAO.isExistProject 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getProjectById(id) != null; } public List projectGetUserInCutting(Long uid) { log.info("\t> 执行 DAO 层 ProjectDAO.projectGetUserInCutting 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.projectGetUserInCutting(uid); } public void projectAddUserForCutting(Long uid, Long pid) { log.info("\t> 执行 DAO 层 ProjectDAO.projectAddUserForCutting 方法"); + log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectAddUserInCutting(uid, pid); } public ProjectShowDO getHeader() { log.info("\t> 执行 DAO 层 ProjectDAO.getHeader 方法"); + log.info("\t\t> 从 MySQL 获取数据"); String getProjectShowSql = projectMapper.getHeader(); ProjectShowDO getProjectShow = null; - if (getProjectShowSql != null && !getProjectShowSql.equals("{}")) { + if (getProjectShowSql != null && !"{}".equals(getProjectShowSql)) { getProjectShow = gson.fromJson(getProjectShowSql, ProjectShowDO.class); } if (getProjectShow == null) { @@ -67,6 +70,7 @@ public class ProjectDAO { getProjectShow.setOrder("desc"); getProjectShow.setData(new ArrayList<>()); try { + log.info("\t\t> 从 MySQL 插入数据"); projectMapper.insertProjectShow(); } catch (DuplicateKeyException ignored) { } @@ -76,7 +80,7 @@ public class ProjectDAO { return getProjectShow; } - private void sortProject(ProjectShowDO projectShowDO) { + private void sortProject(@NotNull ProjectShowDO projectShowDO) { log.info("\t> 执行 DAO 层 ProjectDAO.sortProject 方法"); for (int i = 0; i < projectShowDO.getData().size(); i++) { for (int j = 0; j < projectShowDO.getData().size(); j++) { @@ -97,61 +101,66 @@ public class ProjectDAO { log.info("\t> 执行 DAO 层 ProjectDAO.setProjectShow 方法"); sortProject(projectShowDO); String setProjectShow = gson.toJson(projectShowDO); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.setProjectShow(setProjectShow); } public List get() { log.info("\t> 执行 DAO 层 ProjectDAO.get 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.get(); } public ProjectDO getByName(String name) { log.info("\t> 执行 DAO 层 ProjectDAO.getByName 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getByName(name); } public boolean projectDelete(Long id){ log.info("\t> 执行 DAO 层 ProjectDAO.projectDelete 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.deleteProject(id); } public void projectCuttingAdd(ProjectCuttingDO projectCuttingDO){ log.info("\t> 执行 DAO 层 ProjectDAO.projectCuttingAdd 方法"); + log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectCuttingAdd(projectCuttingDO); } public boolean isExistProjectById(Long id){ log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectById 方法"); - if(projectMapper.getProjectById(id) == null){ - return false; - }else {return true;} + log.info("\t\t> 从 MySQL 获取数据"); + return projectMapper.getProjectById(id) != null; } public boolean updateProjectCutting(ProjectCuttingDO projectCuttingDO){ log.info("\t> 执行 DAO 层 ProjectDAO.updateProjectCutting 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.projectCuttingUpdate(projectCuttingDO); } public boolean isExistProjectCutting(Long id){ log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectCutting 方法"); - if(projectMapper.getProjectCuttingById(id) == null){ - return false; - }else {return true;} + log.info("\t\t> 从 MySQL 获取数据"); + return projectMapper.getProjectCuttingById(id) != null; } public boolean isExistProjectUser(Long pid,Long uid){ log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectUse 方法"); - if(projectMapper.getProjectUserByPidAndUid(pid,uid) == null){ - return false; - }else {return true;} + log.info("\t\t> 从 MySQL 获取数据"); + return projectMapper.getProjectUserByPidAndUid(pid, uid) != null; } public boolean updateUserForProjectUserByPidAndUid(Long pid,Long oldUid,Long newUid){ log.info("\t> 执行 DAO 层 ProjectDAO.updateUserForProjectUserByPidAndUid 方法"); + log.info("\t\t> 从 MySQL 获取数据"); ProjectUserDO projectUserDO = projectMapper.getProjectUserByPidAndUid(pid,oldUid); if(projectUserDO == null){ return false; } + log.info("\t\t> 从 MySQL 更新数据"); return projectMapper.updateUserForProjectUser(newUid,projectUserDO.getId()); } diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index 16e7115..a526c73 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -17,54 +17,64 @@ public class RoleDAO { public void roleAddUser(Long uid, Long rid) { log.info("\t> 执行 DAO 层 RoleDAO.roleAddUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); roleMapper.roleAddUser(uid, rid); } public void roleRemoveUser(Long uid) { log.info("\t> 执行 DAO 层 RoleDAO.roleRemoveUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); roleMapper.roleRemoveUser(uid); } public List getRolesById(String id) { log.info("\t> 执行 DAO 层 RoleDAO.getRolesById 方法"); ArrayList getRoleList = new ArrayList<>(); + log.info("\t\t> 从 MySQL 获取数据"); getRoleList.add(roleMapper.getRoleById(Long.valueOf(id))); return getRoleList; } public RoleDO getRoleById(Long id) { log.info("\t> 执行 DAO 层 RoleDAO.getRoleById 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return roleMapper.getRoleById(id); } public List getRole() { log.info("\t> 执行 DAO 层 RoleDAO.getRole 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return roleMapper.getRole(); } public void roleAdd(RoleDO roleDO) { log.info("\t> 执行 DAO 层 RoleDAO.roleAdd 方法"); + log.info("\t\t> 从 MySQL 获取数据"); roleMapper.roleAdd(roleDO); } public boolean roleEdit(RoleDO getRole) { log.info("\t> 执行 DAO 层 RoleDAO.roleEdit 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return roleMapper.roleEdit(getRole); } public boolean roleDelete(Long id) { log.info("\t> 执行 DAO 层 RoleDAO.roleDelete 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return roleMapper.roleDelete(id); } public boolean isExistRoleByRoleName(String roleName) { log.info("\t> 执行 DAO 层 RoleDAO.isExistRoleByRoleName 方法"); + log.info("\t\t> 从 MySQL 获取数据"); RoleDO roleDO = roleMapper.getRoleByRoleName(roleName); return roleDO != null; } public boolean roleChangeUser(Long uid, Long rid) { log.info("\t> 执行 DAO 层 RoleDAO.roleChangeUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return roleMapper.roleChangeUser(uid, rid); } } diff --git a/src/main/java/com/jsl/oa/dao/UserDAO.java b/src/main/java/com/jsl/oa/dao/UserDAO.java index 55bbb27..9dea3e2 100755 --- a/src/main/java/com/jsl/oa/dao/UserDAO.java +++ b/src/main/java/com/jsl/oa/dao/UserDAO.java @@ -79,17 +79,27 @@ public class UserDAO { } /** + *

用户账号删除

+ *
* 用户账号删除 * - * @param id + * @param id 用户id */ - public void userDelete(Long id) { + public void userDelete(@NotNull Long id) { log.info("\t> 执行 DAO 层 UserDAO.userDelete 方法"); + // Redis 获取数据 + String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString()); + if (redisData != null) { + log.info("\t\t> 从 Redis 删除数据"); + userRedisUtil.delData(BusinessConstants.NONE, id.toString()); + } + log.info("\t\t> 从 MySQL 删除数据"); userMapper.userDelete(id); } public boolean userGetDelete(Long id) { log.info("\t> 执行 DAO 层 UserDAO.userGetDelete 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.userGetDelete(id); } @@ -100,16 +110,19 @@ public class UserDAO { */ public void userLock(Long id,Long isLock) { log.info("\t> 执行 DAO 层 UserDAO.userLock 方法"); + log.info("\t\t> 从 MySQL 获取数据"); userMapper.userLock(id,isLock); } public void userEditProfile(UserEditProfileVO userEditProfileVO) { log.info("\t> 执行 DAO 层 UserDAO.userEditProfile 方法"); + log.info("\t\t> 从 MySQL 获取数据"); userMapper.userEditProfile(userEditProfileVO); } public List 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 -> { @@ -121,6 +134,7 @@ public class UserDAO { public List 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 -> { @@ -138,11 +152,13 @@ public class UserDAO { */ public boolean userAdd(UserDO userDO) { log.info("\t> 执行 DAO 层 userAdd 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.insertUser(userDO); } public void userEdit(UserDO userDO) { log.info("\t> 执行 DAO 层 userEdit 方法"); + log.info("\t\t> 从 MySQL 获取数据"); userMapper.updateUser(userDO); } @@ -154,6 +170,7 @@ public class UserDAO { **/ public Boolean isRepeatUser(String username) { log.info("\t> 执行 DAO 层 isRepeatUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getUserInfoByUsername(username) != null; } @@ -177,6 +194,7 @@ public class UserDAO { **/ public UserDO getUserById(Long userId) { log.info("\t> 执行 DAO 层 getUserById 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getUserById(userId); } @@ -187,6 +205,8 @@ public class UserDAO { * @Param uid:用户id **/ public RoleUserDO getRoleFromUser(Long uid) { + log.info("\t> 执行 DAO 层 getRoleFromUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getRoleIdByUserId(uid); } @@ -197,26 +217,31 @@ public class UserDAO { * @Param null:用户id **/ public Boolean isManagerByRoleId(Long roleId) { + log.info("\t> 执行 DAO 层 isManagerByRoleId 方法"); + log.info("\t\t> 从 MySQL 获取数据"); RoleDO role = userMapper.getRoleById(roleId); if (role == null) { return false; } - if (role.getRoleName().equals("admin")) { - return true; - } - return false; + return "admin".equals(role.getRoleName()); } public List getRecommendUser(){ + log.info("\t> 执行 DAO 层 getRecommendUser 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getRecommendUser(); } public UserDO getUserByEmail(String email) { + log.info("\t> 执行 DAO 层 getUserByEmail 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getUserByEmail(email); } public UserDO getUserByPhone(String phone) { + log.info("\t> 执行 DAO 层 getUserByPhone 方法"); + log.info("\t\t> 从 MySQL 获取数据"); return userMapper.getUserByPhone(phone); } }