From c2739134422937f0be8a135fbf89b26bf6f29ccd Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 09:37:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/linters/alibaba-checkstyle.xml | 7 +- ...slOrganizeInternalOaRunnerApplication.java | 4 +- .../com/jsl/oa/aspect/AnnotationsAspect.java | 32 ++++---- .../jsl/oa/aspect/AuthControllerAspect.java | 35 ++++---- .../com/jsl/oa/config/filter/CorsFilter.java | 45 +++++----- .../com/jsl/oa/config/filter/JwtFilter.java | 6 +- .../jsl/oa/config/redis/RedisOperating.java | 2 +- .../jsl/oa/controllers/AuthController.java | 30 +++++-- .../jsl/oa/controllers/InfoController.java | 41 ++++++---- .../jsl/oa/controllers/MessageController.java | 32 +++++--- .../jsl/oa/controllers/NewsController.java | 14 ++-- .../oa/controllers/PermissionController.java | 2 +- .../jsl/oa/controllers/ProjectController.java | 10 +-- .../jsl/oa/controllers/RoleController.java | 20 ++--- .../jsl/oa/controllers/UserController.java | 8 +- src/main/java/com/jsl/oa/dao/InfoDAO.java | 7 +- src/main/java/com/jsl/oa/dao/NewsDAO.java | 2 +- .../java/com/jsl/oa/dao/PermissionDAO.java | 2 +- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 82 +++++++++---------- src/main/java/com/jsl/oa/dao/RoleDAO.java | 12 +-- src/main/java/com/jsl/oa/dao/TagDAO.java | 2 +- src/main/java/com/jsl/oa/dao/UserDAO.java | 12 +-- .../jsl/oa/exception/ProcessException.java | 5 +- .../java/com/jsl/oa/mapper/InfoMapper.java | 4 +- .../java/com/jsl/oa/mapper/MessageMapper.java | 8 +- .../java/com/jsl/oa/mapper/ModuleMapper.java | 8 +- .../java/com/jsl/oa/mapper/NewsMapper.java | 24 +++--- .../com/jsl/oa/mapper/PermissionMapper.java | 6 +- .../java/com/jsl/oa/mapper/ProjectMapper.java | 14 ++-- .../java/com/jsl/oa/mapper/RoleMapper.java | 4 +- .../java/com/jsl/oa/mapper/TagMapper.java | 2 +- .../java/com/jsl/oa/mapper/UserMapper.java | 12 +-- .../oa/model/{doData => dodata}/ConfigDO.java | 2 +- .../model/{doData => dodata}/MessageDO.java | 2 +- .../oa/model/{doData => dodata}/NewsDO.java | 2 +- .../model/{doData => dodata}/PageBeanDO.java | 2 +- .../{doData => dodata}/PermissionDO.java | 2 +- .../{doData => dodata}/ProjectCuttingDO.java | 4 +- .../model/{doData => dodata}/ProjectDO.java | 2 +- .../{doData => dodata}/ProjectTypeDO.java | 2 +- .../{doData => dodata}/ProjectUserDO.java | 2 +- .../{doData => dodata}/ProjectWorkDO.java | 5 +- .../oa/model/{doData => dodata}/RoleDO.java | 2 +- .../{doData => dodata}/RolePermissionDO.java | 2 +- .../model/{doData => dodata}/RoleUserDO.java | 2 +- .../{doData => dodata}/TagProjectDO.java | 2 +- .../oa/model/{doData => dodata}/UserDO.java | 2 +- .../{doData => dodata}/info/CarouselDO.java | 2 +- .../info/ProjectShowDO.java | 6 +- .../model/{voData => vodata}/NewsAddVO.java | 2 +- .../PermissionContentVo.java | 2 +- .../{voData => vodata}/PermissionEditVO.java | 2 +- .../{voData => vodata}/PrincipalSelectVO.java | 2 +- .../ProjectCuttingAddVO.java | 2 +- .../ProjectCuttingEditVO.java | 2 +- .../{voData => vodata}/ProjectEditVO.java | 7 +- .../{voData => vodata}/ProjectFileVO.java | 2 +- .../{voData => vodata}/ProjectInfoVO.java | 3 +- .../{voData => vodata}/ProjectSimpleVO.java | 2 +- .../ProjectWorkAndNameVO.java | 2 +- .../ProjectWorkSimpleVO.java | 2 +- .../{voData => vodata}/ProjectWorkVO.java | 2 +- .../{voData => vodata}/RoleAddUserVO.java | 2 +- .../model/{voData => vodata}/RoleAddVo.java | 2 +- .../model/{voData => vodata}/RoleEditVO.java | 2 +- .../{voData => vodata}/RoleRemoveUserVO.java | 2 +- .../model/{voData => vodata}/UserAddVO.java | 2 +- .../{voData => vodata}/UserAllCurrentVO.java | 2 +- .../UserChangePasswordVO.java | 2 +- .../{voData => vodata}/UserCurrentBackVO.java | 2 +- .../{voData => vodata}/UserEditProfileVO.java | 2 +- .../model/{voData => vodata}/UserEditVO.java | 2 +- .../UserForgetPasswordVO.java | 2 +- .../model/{voData => vodata}/UserLoginVO.java | 2 +- .../{voData => vodata}/UserProfileVo.java | 2 +- .../{voData => vodata}/UserRegisterVO.java | 2 +- .../{voData => vodata}/UserReturnBackVO.java | 2 +- .../business/InfoAboutSecurityKey.java | 2 +- .../business/info/CarouselVO.java | 2 +- .../business/info/ProjectShowVO.java | 2 +- .../com/jsl/oa/schedule/SafeSchedule.java | 4 +- .../java/com/jsl/oa/services/AuthService.java | 10 +-- .../java/com/jsl/oa/services/InfoService.java | 2 +- .../com/jsl/oa/services/MessageService.java | 14 +++- .../com/jsl/oa/services/ModuleService.java | 2 - .../java/com/jsl/oa/services/NewsService.java | 2 +- .../jsl/oa/services/PermissionService.java | 2 +- .../com/jsl/oa/services/ProjectService.java | 6 +- .../java/com/jsl/oa/services/RoleService.java | 4 +- .../java/com/jsl/oa/services/UserService.java | 14 ++-- .../jsl/oa/services/impl/AuthServiceImpl.java | 26 ++++-- .../jsl/oa/services/impl/InfoServiceImpl.java | 18 ++-- .../oa/services/impl/MessageServiceImpl.java | 14 +++- .../oa/services/impl/ModuleServiceImpl.java | 11 +-- .../jsl/oa/services/impl/NewsServiceImpl.java | 4 +- .../services/impl/PermissionServiceImpl.java | 8 +- .../oa/services/impl/ProjectServiceImpl.java | 12 +-- .../jsl/oa/services/impl/RoleServiceImpl.java | 6 +- .../jsl/oa/services/impl/TagServiceImpl.java | 2 +- .../jsl/oa/services/impl/UserServiceImpl.java | 12 +-- src/main/java/com/jsl/oa/utils/ErrorCode.java | 8 +- .../java/com/jsl/oa/utils/Processing.java | 68 +++++---------- .../jsl/oa/utils/redis/EmailRedisUtil.java | 1 + .../com/jsl/oa/mapper/ModuleMapper.xml | 4 +- .../com/jsl/oa/mapper/ProjectMapper.xml | 18 ++-- 105 files changed, 456 insertions(+), 421 deletions(-) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ConfigDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/MessageDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/NewsDO.java (95%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/PageBeanDO.java (92%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/PermissionDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ProjectCuttingDO.java (96%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ProjectDO.java (97%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ProjectTypeDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ProjectUserDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/ProjectWorkDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/RoleDO.java (93%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/RolePermissionDO.java (93%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/RoleUserDO.java (93%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/TagProjectDO.java (93%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/UserDO.java (96%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/info/CarouselDO.java (94%) rename src/main/java/com/jsl/oa/model/{doData => dodata}/info/ProjectShowDO.java (82%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/NewsAddVO.java (93%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/PermissionContentVo.java (87%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/PermissionEditVO.java (88%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/PrincipalSelectVO.java (81%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectCuttingAddVO.java (91%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectCuttingEditVO.java (94%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectEditVO.java (64%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectFileVO.java (77%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectInfoVO.java (92%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectSimpleVO.java (92%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectWorkAndNameVO.java (95%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectWorkSimpleVO.java (94%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/ProjectWorkVO.java (95%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/RoleAddUserVO.java (88%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/RoleAddVo.java (91%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/RoleEditVO.java (94%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/RoleRemoveUserVO.java (84%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserAddVO.java (97%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserAllCurrentVO.java (85%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserChangePasswordVO.java (91%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserCurrentBackVO.java (97%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserEditProfileVO.java (94%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserEditVO.java (97%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserForgetPasswordVO.java (92%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserLoginVO.java (94%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserProfileVo.java (92%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserRegisterVO.java (97%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/UserReturnBackVO.java (96%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/business/InfoAboutSecurityKey.java (87%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/business/info/CarouselVO.java (91%) rename src/main/java/com/jsl/oa/model/{voData => vodata}/business/info/ProjectShowVO.java (80%) diff --git a/.github/linters/alibaba-checkstyle.xml b/.github/linters/alibaba-checkstyle.xml index 762d502..8596338 100644 --- a/.github/linters/alibaba-checkstyle.xml +++ b/.github/linters/alibaba-checkstyle.xml @@ -69,14 +69,9 @@ - - - - - - + diff --git a/src/main/java/com/jsl/oa/JslOrganizeInternalOaRunnerApplication.java b/src/main/java/com/jsl/oa/JslOrganizeInternalOaRunnerApplication.java index a9dbd44..8028d1c 100644 --- a/src/main/java/com/jsl/oa/JslOrganizeInternalOaRunnerApplication.java +++ b/src/main/java/com/jsl/oa/JslOrganizeInternalOaRunnerApplication.java @@ -3,8 +3,8 @@ package com.jsl.oa; import com.google.gson.Gson; import com.jsl.oa.common.constant.SafeConstants; import com.jsl.oa.mapper.InfoMapper; -import com.jsl.oa.model.doData.ConfigDO; -import com.jsl.oa.model.voData.business.InfoAboutSecurityKey; +import com.jsl.oa.model.dodata.ConfigDO; +import com.jsl.oa.model.vodata.business.InfoAboutSecurityKey; import com.jsl.oa.utils.Processing; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.SmartInitializingSingleton; diff --git a/src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java b/src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java index faadbc5..8cbbae6 100644 --- a/src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java +++ b/src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java @@ -6,9 +6,9 @@ import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.UserMapper; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.doData.UserDO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; import com.jsl.oa.utils.Processing; @@ -61,7 +61,9 @@ public class AnnotationsAspect { public Object checkUserHasPermission(@NotNull ProceedingJoinPoint pjp) throws Throwable { log.info("用户权限检查"); // 获取 HttpServletRequest 对象 - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + HttpServletRequest request = + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())) + .getRequest(); // 获取注解方法 CheckUserHasPermission checkUserHasPermission = getCheckUserHasPermission(pjp); @@ -90,17 +92,17 @@ public class AnnotationsAspect { } else { log.info("\t> 用户权限不足，检查是否是管理员"); // 检查用户是管理员 - RoleUserDO roleUserDO = roleDAO.roleMapper.getRoleUserByUid(Processing.getAuthHeaderToUserId(request)); - if (roleUserDO != null) { - RoleDO roleDO = roleDAO.roleMapper.getRoleByRoleName("admin"); - if (roleUserDO.getRid().equals(roleDO.getId())) { - return pjp.proceed(); - } else { - return ResultUtil.error(ErrorCode.NOT_PERMISSION); - } - } else { + RoleUserDO roleUserDO = roleDAO.roleMapper + .getRoleUserByUid(Processing.getAuthHeaderToUserId(request)); + if (roleUserDO == null) { return ResultUtil.error(ErrorCode.NOT_ADMIN); } + RoleDO roleDO = roleDAO.roleMapper.getRoleByRoleName("admin"); + if (roleUserDO.getRid().equals(roleDO.getId())) { + return pjp.proceed(); + } else { + return ResultUtil.error(ErrorCode.NOT_PERMISSION); + } } } else { return pjp.proceed(); @@ -115,7 +117,9 @@ public class AnnotationsAspect { public Object checkUserAbleToUse(ProceedingJoinPoint pjp) throws Throwable { log.info("检查用户是否有权限继续"); // 获取 HttpServletRequest 对象 - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + HttpServletRequest request = + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())) + .getRequest(); // 获取注解方法 CheckUserAbleToUse check = getCheckUserAbleToUse(pjp); diff --git a/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java b/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java index 898fb49..c1d9fac 100755 --- a/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java +++ b/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java @@ -46,7 +46,9 @@ public class AuthControllerAspect { @Around("execution(* com.jsl.oa.controllers.*.*(..)) && !execution(* com.jsl.oa.controllers.IndexController.*(..))") public Object controllerAround(ProceedingJoinPoint pjp) throws Throwable { // 获取HttpServletRequest对象 - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + HttpServletRequest request = + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())) + .getRequest(); // 时间戳检查 if (checkTimestamp(request)) { @@ -66,21 +68,23 @@ public class AuthControllerAspect { * @return {@link Object} * @throws Throwable 异常 */ - @Around("execution(* com.jsl.oa.controllers.*.*(..)) " + - "&& !execution(* com.jsl.oa.controllers.AuthController.authSendEmailCode(..))" + - "&& !execution(* com.jsl.oa.controllers.AuthController.authLoginByEmail(..))" + - "&& !execution(* com.jsl.oa.controllers.AuthController.authForgetPassword(..))" + - "&& !execution(* com.jsl.oa.controllers.AuthController.authLogin(..))" + - "&& !execution(* com.jsl.oa.controllers.AuthController.authRegister(..)) " + - "&& !execution(* com.jsl.oa.controllers.IndexController.*(..)) " + - "&& !execution(* com.jsl.oa.controllers.CustomController.*(..)) " + - "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderImage(..)) " + - "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderUser(..))" + - "&& !execution(* com.jsl.oa.controllers.ProjectController.*(..))" + - "&& !execution(* com.jsl.oa.controllers.TagController.*(..))") + @Around("execution(* com.jsl.oa.controllers.*.*(..)) " + + "&& !execution(* com.jsl.oa.controllers.AuthController.authSendEmailCode(..))" + + "&& !execution(* com.jsl.oa.controllers.AuthController.authLoginByEmail(..))" + + "&& !execution(* com.jsl.oa.controllers.AuthController.authForgetPassword(..))" + + "&& !execution(* com.jsl.oa.controllers.AuthController.authLogin(..))" + + "&& !execution(* com.jsl.oa.controllers.AuthController.authRegister(..)) " + + "&& !execution(* com.jsl.oa.controllers.IndexController.*(..)) " + + "&& !execution(* com.jsl.oa.controllers.CustomController.*(..)) " + + "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderImage(..)) " + + "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderUser(..))" + + "&& !execution(* com.jsl.oa.controllers.ProjectController.*(..))" + + "&& !execution(* com.jsl.oa.controllers.TagController.*(..))") public Object tokenControllerAround(ProceedingJoinPoint pjp) throws Throwable { // 获取 HttpServletRequest 对象 - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + HttpServletRequest request = + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())) + .getRequest(); // 检查 Token 是否有效 String token = request.getHeader("Authorization"); @@ -121,6 +125,7 @@ public class AuthControllerAspect { long nowTimestamp = System.currentTimeMillis(); // 时间误差允许前后五秒钟 - return nowTimestamp - Long.parseLong(getTimestamp) <= 10000 && nowTimestamp - Long.parseLong(getTimestamp) >= -10000; + return nowTimestamp - Long.parseLong(getTimestamp) <= 10000 + && nowTimestamp - Long.parseLong(getTimestamp) >= -10000; } } diff --git a/src/main/java/com/jsl/oa/config/filter/CorsFilter.java b/src/main/java/com/jsl/oa/config/filter/CorsFilter.java index d25d4d0..0c74f6f 100644 --- a/src/main/java/com/jsl/oa/config/filter/CorsFilter.java +++ b/src/main/java/com/jsl/oa/config/filter/CorsFilter.java @@ -14,20 +14,36 @@ import javax.servlet.http.HttpServletResponse; *
* 用于处理跨域请求 * - * @version v1.1.0 - * @since v1.1.0 - * @see Filter * @author xiao_lfeng + * @version v1.1.0 + * @see Filter + * @since v1.1.0 */ @Slf4j @Component public class CorsFilter implements Filter { + /** + * 设置请求头 + * + * @param response 响应 + */ + protected static void setHeader(@NotNull HttpServletResponse response) { + // 允许跨域请求 + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + //允许请求方式 + response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + //需要放行header头部字段 如需鉴权字段，自行添加，如Authorization + response.setHeader("Access-Control-Allow-Headers", "*"); + } + /** * 用于处理跨域请求 * - * @param req servlet请求 - * @param res servlet响应 + * @param req servlet请求 + * @param res servlet响应 * @param chain 过滤器链 */ @Override @@ -51,7 +67,8 @@ public class CorsFilter implements Filter { * @param filterConfig 过滤器配置 */ @Override - public void init(FilterConfig filterConfig) {} + public void init(FilterConfig filterConfig) { + } /** * 销毁 @@ -61,20 +78,4 @@ public class CorsFilter implements Filter { Filter.super.destroy(); } - /** - * 设置请求头 - * - * @param response 响应 - */ - protected static void setHeader(@NotNull HttpServletResponse response) { - // 允许跨域请求 - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setHeader("Access-Control-Allow-Credentials", "true"); - //允许请求方式 - response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE"); - response.setHeader("Access-Control-Max-Age", "3600"); - //需要放行header头部字段 如需鉴权字段，自行添加，如Authorization - response.setHeader("Access-Control-Allow-Headers", "*"); - } - } diff --git a/src/main/java/com/jsl/oa/config/filter/JwtFilter.java b/src/main/java/com/jsl/oa/config/filter/JwtFilter.java index 8755202..8e48ce3 100755 --- a/src/main/java/com/jsl/oa/config/filter/JwtFilter.java +++ b/src/main/java/com/jsl/oa/config/filter/JwtFilter.java @@ -63,7 +63,10 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { * @throws Exception 异常 */ @Override - protected boolean onAccessDenied(ServletRequest request, ServletResponse response, Object mappedValue) throws Exception { + protected boolean onAccessDenied( + ServletRequest request, + ServletResponse response, + Object mappedValue) throws Exception { // 添加跨域禁止 HttpServletResponse httpServletResponse = (HttpServletResponse) response; CorsFilter.setHeader(httpServletResponse); @@ -80,7 +83,6 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { } else { // 解析Bearer后面的令牌 token = token.replace("Bearer ", ""); - System.out.println(token); if (JwtUtil.verify(token)) { // Token验证通过 return true; diff --git a/src/main/java/com/jsl/oa/config/redis/RedisOperating.java b/src/main/java/com/jsl/oa/config/redis/RedisOperating.java index 94d91ac..a7ad232 100644 --- a/src/main/java/com/jsl/oa/config/redis/RedisOperating.java +++ b/src/main/java/com/jsl/oa/config/redis/RedisOperating.java @@ -89,4 +89,4 @@ public abstract class RedisOperating { return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/jsl/oa/controllers/AuthController.java b/src/main/java/com/jsl/oa/controllers/AuthController.java index b2a4ca2..8300945 100755 --- a/src/main/java/com/jsl/oa/controllers/AuthController.java +++ b/src/main/java/com/jsl/oa/controllers/AuthController.java @@ -1,9 +1,9 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.UserChangePasswordVO; -import com.jsl.oa.model.voData.UserForgetPasswordVO; -import com.jsl.oa.model.voData.UserLoginVO; -import com.jsl.oa.model.voData.UserRegisterVO; +import com.jsl.oa.model.vodata.UserChangePasswordVO; +import com.jsl.oa.model.vodata.UserForgetPasswordVO; +import com.jsl.oa.model.vodata.UserLoginVO; +import com.jsl.oa.model.vodata.UserRegisterVO; import com.jsl.oa.services.AuthService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -51,7 +51,10 @@ public class AuthController { * @since v1.0.0 */ @PostMapping("/auth/register") - public BaseResponse authRegister(@RequestBody @Validated UserRegisterVO userRegisterVO, @NotNull BindingResult bindingResult) { + public BaseResponse authRegister( + @RequestBody @Validated UserRegisterVO userRegisterVO, + @NotNull BindingResult bindingResult + ) { log.info("请求接口[POST]: /auth/register"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { @@ -72,7 +75,10 @@ public class AuthController { * @since v1.0.0 */ @PostMapping("/auth/login") - public BaseResponse authLogin(@RequestBody @Validated UserLoginVO userLoginVO, @NotNull BindingResult bindingResult) { + public BaseResponse authLogin( + @RequestBody @Validated UserLoginVO userLoginVO, + @NotNull BindingResult bindingResult + ) { log.info("请求接口[POST]: /auth/login"); // 判断是否有参数错误 @@ -121,7 +127,6 @@ public class AuthController { public BaseResponse authLoginByEmail(@RequestParam String email, @RequestParam String code) { log.info("请求接口[GET]: /auth/login/email"); if (email != null && code != null && !email.isEmpty() && !code.isEmpty()) { - System.out.println("测试"); if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) { try { Integer integer = Integer.valueOf(code); @@ -163,7 +168,11 @@ public class AuthController { * @since v1.1.0 */ @PutMapping("/auth/password") - public BaseResponse authChangePassword(@RequestBody @Validated UserChangePasswordVO userChangePasswordVO, HttpServletRequest request, @NotNull BindingResult bindingResult) { + public BaseResponse authChangePassword( + @RequestBody @Validated UserChangePasswordVO userChangePasswordVO, + @NotNull BindingResult bindingResult, + HttpServletRequest request + ) { log.info("请求接口[PUT]: /auth/password"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { @@ -178,7 +187,10 @@ public class AuthController { * 忘记密码 */ @PutMapping("auth/password/forget") - public BaseResponse authForgetPassword(@RequestBody @Validated UserForgetPasswordVO userForgetPasswordVO, @NotNull BindingResult bindingResult) { + public BaseResponse authForgetPassword( + @RequestBody @Validated UserForgetPasswordVO userForgetPasswordVO, + @NotNull BindingResult bindingResult + ) { log.info("请求接口[PUT]: /auth/password/forget"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/jsl/oa/controllers/InfoController.java b/src/main/java/com/jsl/oa/controllers/InfoController.java index 3e9d3c2..ec0afec 100755 --- a/src/main/java/com/jsl/oa/controllers/InfoController.java +++ b/src/main/java/com/jsl/oa/controllers/InfoController.java @@ -1,6 +1,6 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.business.info.CarouselVO; +import com.jsl.oa.model.vodata.business.info.CarouselVO; import com.jsl.oa.services.InfoService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -33,6 +33,7 @@ public class InfoController { * 信息服务 */ private final InfoService infoService; + /** * 获取头部图片信息 * @@ -48,13 +49,17 @@ public class InfoController { /** * 编辑头部图片信息 * - * @param carouselVO 图片信息 - * @param request 请求对象 + * @param carouselVO 图片信息 + * @param request 请求对象 * @param bindingResult 数据校验结果 * @return 编辑结果 */ @PutMapping("/info/header-image/edit") - public BaseResponse infoEditHeaderImage(@RequestBody @Validated CarouselVO carouselVO, HttpServletRequest request, @NotNull BindingResult bindingResult) { + public BaseResponse infoEditHeaderImage( + @RequestBody @Validated CarouselVO carouselVO, + HttpServletRequest request, + @NotNull BindingResult bindingResult + ) { log.info("请求接口[PUT]: /info/header-image/edit"); // 参数校验 if (bindingResult.hasErrors()) { @@ -71,7 +76,7 @@ public class InfoController { /** * 删除头部图片信息 * - * @param id 图片id + * @param id 图片id * @param request 请求对象 * @return 删除结果 */ @@ -84,13 +89,17 @@ public class InfoController { /** * 添加头部图片信息 * - * @param carouselVO 图片信息 - * @param request 请求对象 + * @param carouselVO 图片信息 + * @param request 请求对象 * @param bindingResult 数据校验结果 * @return 添加结果 */ @PostMapping("/info/header-image/add") - public BaseResponse infoAddHeaderImage(@RequestBody @Validated CarouselVO carouselVO, HttpServletRequest request, @NotNull BindingResult bindingResult) { + public BaseResponse infoAddHeaderImage( + @RequestBody @Validated CarouselVO carouselVO, + HttpServletRequest request, + @NotNull BindingResult bindingResult + ) { log.info("请求接口[POST]: /info/header-image/add"); // 参数校验 if (bindingResult.hasErrors()) { @@ -104,7 +113,7 @@ public class InfoController { * 编辑头部图片设置 * * @param showType 是否显示 - * @param request 请求对象 + * @param request 请求对象 * @return 编辑结果 */ @PutMapping("/info/header-image/edit-setting") @@ -116,14 +125,18 @@ public class InfoController { /** * 获取头部用户信息 * - * @param order 排序方式 - * @param orderBy 排序字段 - * @param request 请求对象 + * @param order 排序方式 + * @param orderBy 排序字段 + * @param request 请求对象 * @return 用户信息 */ @GetMapping("info/header-user/get") - public BaseResponse infoGetHeaderUser(@RequestParam String order,@RequestParam String orderBy,HttpServletRequest request){ + public BaseResponse infoGetHeaderUser( + @RequestParam String order, + @RequestParam String orderBy, + HttpServletRequest request + ) { log.info("请求接口[GET]: /info/header-user/get"); - return infoService.getHeaderUser(request,order,orderBy); + return infoService.getHeaderUser(request, order, orderBy); } } diff --git a/src/main/java/com/jsl/oa/controllers/MessageController.java b/src/main/java/com/jsl/oa/controllers/MessageController.java index 53b2703..bf8b3a8 100644 --- a/src/main/java/com/jsl/oa/controllers/MessageController.java +++ b/src/main/java/com/jsl/oa/controllers/MessageController.java @@ -35,7 +35,7 @@ public class MessageController { /** * 删除消息 * - * @param id 消息id + * @param id 消息id * @param request 请求对象 * @return 删除结果 */ @@ -43,17 +43,19 @@ public class MessageController { public BaseResponse messageDelete(@RequestParam Long id, HttpServletRequest request) { if (id == null) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR); - } else return messageService.messageDelete(id, request); + } else { + return messageService.messageDelete(id, request); + } } /** * 获取消息列表 * - * @param page 页码 + * @param page 页码 * @param pageSize 每页条数 - * @param request 请求对象 - * @param begin 开始日期 - * @param end 结束日期 + * @param request 请求对象 + * @param begin 开始日期 + * @param end 结束日期 * @return 消息列表 */ @GetMapping("/message/get") @@ -67,18 +69,20 @@ public class MessageController { Long uid = JwtUtil.getUserId(token); if (uid == null) { return ResultUtil.error(ErrorCode.USER_NOT_EXIST); - } else return messageService.messageGet(begin, end, page, pageSize, uid); + } else { + return messageService.messageGet(begin, end, page, pageSize, uid); + } } /** * 获取所有消息列表 * - * @param page 页码 + * @param page 页码 * @param pageSize 每页条数 - * @param request 请求对象 - * @param begin 开始日期 - * @param end 结束日期 - * @param uid 用户id + * @param request 请求对象 + * @param begin 开始日期 + * @param end 结束日期 + * @param uid 用户id * @return 消息列表 */ @GetMapping("/message/get/all") @@ -93,7 +97,9 @@ public class MessageController { Long loginId = JwtUtil.getUserId(token); if (loginId == null) { return ResultUtil.error(ErrorCode.USER_NOT_EXIST); - } else return messageService.messageGetAll(request, begin, end, page, pageSize, loginId, uid); + } else { + return messageService.messageGetAll(request, begin, end, page, pageSize, loginId, uid); + } } } diff --git a/src/main/java/com/jsl/oa/controllers/NewsController.java b/src/main/java/com/jsl/oa/controllers/NewsController.java index c12fc2a..17f7992 100644 --- a/src/main/java/com/jsl/oa/controllers/NewsController.java +++ b/src/main/java/com/jsl/oa/controllers/NewsController.java @@ -1,7 +1,7 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.NewsAddVO; +import com.jsl.oa.model.vodata.NewsAddVO; import com.jsl.oa.services.NewsService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -22,10 +22,10 @@ import javax.servlet.http.HttpServletRequest; *
* 新闻控制器，包含新闻添加接口 * + * @author xiangZr-hhh | xiao_lfeng | 176yunxuan * @version v1.1.0 * @see NewsService * @since v1.1.0 - * @author xiangZr-hhh | xiao_lfeng | 176yunxuan */ @Slf4j @RestController @@ -39,15 +39,19 @@ public class NewsController { *
* 新闻添加接口，接收新闻添加VO对象，并调用NewsService的newsAdd方法进行新闻添加操作。 * - * @param newsAddVO 新闻添加VO对象，包含新闻信息 + * @param newsAddVO 新闻添加VO对象，包含新闻信息 * @param bindingResult 数据校验结果，用于检查请求参数是否有错误 - * @param request 请求对象，包含请求信息 + * @param request 请求对象，包含请求信息 * @return BaseResponse 返回结果，包含操作结果和错误信息 * @see NewsService#newsAdd(NewsAddVO, HttpServletRequest) * @since v1.1.0 */ @PostMapping("/news/add") - public BaseResponse newsAdd(@RequestBody @Validated NewsAddVO newsAddVO, BindingResult bindingResult, HttpServletRequest request) { + public BaseResponse newsAdd( + @RequestBody @Validated NewsAddVO newsAddVO, + BindingResult bindingResult, + HttpServletRequest request + ) { log.info("请求接口[POST]: /news/add"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/jsl/oa/controllers/PermissionController.java b/src/main/java/com/jsl/oa/controllers/PermissionController.java index 077de30..2c003b4 100755 --- a/src/main/java/com/jsl/oa/controllers/PermissionController.java +++ b/src/main/java/com/jsl/oa/controllers/PermissionController.java @@ -1,6 +1,6 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.PermissionEditVO; +import com.jsl.oa.model.vodata.PermissionEditVO; import com.jsl.oa.services.PermissionService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index d27adfb..1e537f4 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -1,10 +1,10 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.ProjectCuttingAddVO; -import com.jsl.oa.model.voData.ProjectCuttingEditVO; -import com.jsl.oa.model.voData.ProjectEditVO; -import com.jsl.oa.model.voData.ProjectWorkVO; -import com.jsl.oa.model.voData.business.info.ProjectShowVO; +import com.jsl.oa.model.vodata.ProjectCuttingAddVO; +import com.jsl.oa.model.vodata.ProjectCuttingEditVO; +import com.jsl.oa.model.vodata.ProjectEditVO; +import com.jsl.oa.model.vodata.ProjectWorkVO; +import com.jsl.oa.model.vodata.business.info.ProjectShowVO; import com.jsl.oa.services.ProjectService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/controllers/RoleController.java b/src/main/java/com/jsl/oa/controllers/RoleController.java index 274527c..43fe0bc 100755 --- a/src/main/java/com/jsl/oa/controllers/RoleController.java +++ b/src/main/java/com/jsl/oa/controllers/RoleController.java @@ -1,8 +1,8 @@ package com.jsl.oa.controllers; import com.jsl.oa.exception.ClassCopyException; -import com.jsl.oa.model.voData.RoleAddVo; -import com.jsl.oa.model.voData.RoleEditVO; +import com.jsl.oa.model.vodata.RoleAddVo; +import com.jsl.oa.model.vodata.RoleEditVO; import com.jsl.oa.services.RoleService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -22,10 +22,10 @@ import javax.servlet.http.HttpServletRequest; *
* 角色控制器，包含角色获取接口 * + * @author xiao_lfeng | 176yunxuan | xiangZr-hhh * @version v1.1.0 * @see RoleService * @since v1.1.0 - * @author xiao_lfeng | 176yunxuan | xiangZr-hhh */ @Slf4j @RestController @@ -52,8 +52,8 @@ public class RoleController { *
* 角色编辑接口 * - * @param request 请求 - * @param roleEditVO 角色编辑VO + * @param request 请求 + * @param roleEditVO 角色编辑VO * @param bindingResult 参数校验结果 * @return {@link BaseResponse} */ @@ -73,7 +73,7 @@ public class RoleController { * 角色删除接口 * * @param request 请求 - * @param id 角色id + * @param id 角色id * @return {@link BaseResponse} */ @DeleteMapping("/role/delete") @@ -124,7 +124,7 @@ public class RoleController { * @Param uid: **/ @PostMapping("role/add") - public BaseResponse addRole(HttpServletRequest request, @RequestBody @Validated RoleAddVo roleAddVO, @NotNull BindingResult bindingResult ) throws ClassCopyException { + public BaseResponse addRole(HttpServletRequest request, @RequestBody @Validated RoleAddVo roleAddVO, @NotNull BindingResult bindingResult) throws ClassCopyException { log.info("请求接口[POST]: /role/add"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ public class RoleController { /** - * @Description: 改变用户角色权限信息 + * @Description: 改变用户角色权限信息 * @Date: 2024/1/20 * @Param request: * @Param uid: 用户id @@ -152,8 +152,4 @@ public class RoleController { } - - - - } diff --git a/src/main/java/com/jsl/oa/controllers/UserController.java b/src/main/java/com/jsl/oa/controllers/UserController.java index 6a3501d..c53b4f7 100644 --- a/src/main/java/com/jsl/oa/controllers/UserController.java +++ b/src/main/java/com/jsl/oa/controllers/UserController.java @@ -1,9 +1,9 @@ package com.jsl.oa.controllers; -import com.jsl.oa.model.voData.UserAddVO; -import com.jsl.oa.model.voData.UserAllCurrentVO; -import com.jsl.oa.model.voData.UserEditProfileVO; -import com.jsl.oa.model.voData.UserEditVO; +import com.jsl.oa.model.vodata.UserAddVO; +import com.jsl.oa.model.vodata.UserAllCurrentVO; +import com.jsl.oa.model.vodata.UserEditProfileVO; +import com.jsl.oa.model.vodata.UserEditVO; import com.jsl.oa.services.UserService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/dao/InfoDAO.java b/src/main/java/com/jsl/oa/dao/InfoDAO.java index 24e6ec7..39e6840 100644 --- a/src/main/java/com/jsl/oa/dao/InfoDAO.java +++ b/src/main/java/com/jsl/oa/dao/InfoDAO.java @@ -2,7 +2,7 @@ package com.jsl.oa.dao; import com.google.gson.Gson; import com.jsl.oa.mapper.InfoMapper; -import com.jsl.oa.model.doData.info.CarouselDO; +import com.jsl.oa.model.dodata.info.CarouselDO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DuplicateKeyException; @@ -64,12 +64,13 @@ public class InfoDAO { private void sortCarousel(CarouselDO getCarousel) { for (int i = 0; i < getCarousel.getData().size(); i++) { for (int j = 0; j < getCarousel.getData().size(); j++) { + CarouselDO.DataDO dataDO = getCarousel.getData().get(i); if ("desc".equals(getCarousel.getOrder())) { - if (getCarousel.getData().get(i).getDisplayOrder() > getCarousel.getData().get(j).getDisplayOrder()) { + if (dataDO.getDisplayOrder() > dataDO.getDisplayOrder()) { Collections.swap(getCarousel.getData(), i, j); } } else { - if (getCarousel.getData().get(i).getDisplayOrder() < getCarousel.getData().get(j).getDisplayOrder()) { + if (dataDO.getDisplayOrder() < dataDO.getDisplayOrder()) { Collections.swap(getCarousel.getData(), i, j); } } diff --git a/src/main/java/com/jsl/oa/dao/NewsDAO.java b/src/main/java/com/jsl/oa/dao/NewsDAO.java index c85e11f..e2550ae 100644 --- a/src/main/java/com/jsl/oa/dao/NewsDAO.java +++ b/src/main/java/com/jsl/oa/dao/NewsDAO.java @@ -1,7 +1,7 @@ package com.jsl.oa.dao; import com.jsl.oa.mapper.NewsMapper; -import com.jsl.oa.model.doData.NewsDO; +import com.jsl.oa.model.dodata.NewsDO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/jsl/oa/dao/PermissionDAO.java b/src/main/java/com/jsl/oa/dao/PermissionDAO.java index 2ac5210..b1b4bf3 100644 --- a/src/main/java/com/jsl/oa/dao/PermissionDAO.java +++ b/src/main/java/com/jsl/oa/dao/PermissionDAO.java @@ -4,7 +4,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.jsl.oa.common.constant.BusinessConstants; import com.jsl.oa.mapper.PermissionMapper; -import com.jsl.oa.model.doData.PermissionDO; +import com.jsl.oa.model.dodata.PermissionDO; import com.jsl.oa.utils.redis.RoleRedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index b82467f..1c24af8 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -2,14 +2,14 @@ package com.jsl.oa.dao; import com.google.gson.Gson; import com.jsl.oa.mapper.ProjectMapper; -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.ProjectWorkDO; -import com.jsl.oa.model.doData.info.ProjectShowDO; -import com.jsl.oa.model.voData.ProjectEditVO; -import com.jsl.oa.model.voData.ProjectInfoVO; -import com.jsl.oa.model.voData.ProjectWorkVO; +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.ProjectWorkDO; +import com.jsl.oa.model.dodata.info.ProjectShowDO; +import com.jsl.oa.model.vodata.ProjectEditVO; +import com.jsl.oa.model.vodata.ProjectInfoVO; +import com.jsl.oa.model.vodata.ProjectWorkVO; import com.jsl.oa.utils.Processing; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -48,7 +48,7 @@ public class ProjectDAO { log.info("\t> 执行 DAO 层 ProjectDAO.projectEdit 方法"); log.info("\t\t> 从 MySQL 更新数据"); ProjectDO projectDO = new ProjectDO(); - Processing.copyProperties(projectEdit,projectDO); + Processing.copyProperties(projectEdit, projectDO); projectDO.setId(projectId); projectMapper.projectEdit(projectDO); log.info("\t\t> 从 MySQL 获取数据"); @@ -123,28 +123,28 @@ public class ProjectDAO { } - public ProjectDO getProjectById(Long id){ + public ProjectDO getProjectById(Long id) { log.info("\t> 执行 DAO 层 ProjectDAO.getProjectById 方法"); log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getProjectById(id); } - public List get(Long userId,Integer listAll,List tags,List isFinish) { + public List get(Long userId, Integer listAll, List tags, List isFinish) { log.info("\t> 执行 DAO 层 ProjectDAO.get 方法"); log.info("\t\t> 从 MySQL 获取数据"); - if(tags != null && !tags.isEmpty()){ + if (tags != null && !tags.isEmpty()) { log.info("tags"); - return projectMapper.getByTags(userId,tags,isFinish); + return projectMapper.getByTags(userId, tags, isFinish); } - if(isFinish != null && !isFinish.isEmpty()){ + if (isFinish != null && !isFinish.isEmpty()) { log.info("finish"); - return projectMapper.getByIsfinish(userId,isFinish); + return projectMapper.getByIsfinish(userId, isFinish); } - if(listAll == 0) { + if (listAll == 0) { return projectMapper.get(userId); - }else { + } else { return projectMapper.get1(userId); } } @@ -152,18 +152,18 @@ public class ProjectDAO { public List workget(Long userId, Integer listAll, List tags, List isFinish, Integer is) { log.info("\t> 执行 DAO 层 ProjectDAO.workget 方法"); log.info("\t\t> 从 MySQL 获取数据"); - if(tags != null && !tags.isEmpty()){ - return projectMapper.workgetByTags(userId,tags,is,isFinish); + if (tags != null && !tags.isEmpty()) { + return projectMapper.workgetByTags(userId, tags, is, isFinish); } - if(isFinish != null && !isFinish.isEmpty()){ - return projectMapper.workgetByIsfinish(userId,isFinish,is); + if (isFinish != null && !isFinish.isEmpty()) { + return projectMapper.workgetByIsfinish(userId, isFinish, is); } - if(listAll == 0) { - return projectMapper.workget(userId,is); - }else { - return projectMapper.workget1(userId,is); + if (listAll == 0) { + return projectMapper.workget(userId, is); + } else { + return projectMapper.workget1(userId, is); } } @@ -173,54 +173,54 @@ public class ProjectDAO { return projectMapper.getByName(name); } - public boolean projectDelete(Long id){ + 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){ + public void projectCuttingAdd(ProjectCuttingDO projectCuttingDO) { log.info("\t> 执行 DAO 层 ProjectDAO.projectCuttingAdd 方法"); log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectCuttingAdd(projectCuttingDO); } - public boolean isExistProjectById(Long id){ + public boolean isExistProjectById(Long id) { log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectById 方法"); log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getProjectById(id) != null; } - public boolean updateProjectCutting(ProjectCuttingDO projectCuttingDO){ + 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){ + public boolean isExistProjectCutting(Long id) { log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectCutting 方法"); log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getProjectCuttingById(id) != null; } - public boolean isExistProjectUser(Long pid,Long uid){ + public boolean isExistProjectUser(Long pid, Long uid) { log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectUse 方法"); log.info("\t\t> 从 MySQL 获取数据"); return projectMapper.getProjectUserByPidAndUid(pid, uid) != null; } - public boolean updateUserForProjectUserByPidAndUid(Long pid,Long oldUid,Long newUid){ + 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){ + ProjectUserDO projectUserDO = projectMapper.getProjectUserByPidAndUid(pid, oldUid); + if (projectUserDO == null) { return false; } log.info("\t\t> 从 MySQL 更新数据"); - return projectMapper.updateUserForProjectUser(newUid,projectUserDO.getId()); + return projectMapper.updateUserForProjectUser(newUid, projectUserDO.getId()); } - public boolean isPrincipalUser(Long uid, Long projectId){ + public boolean isPrincipalUser(Long uid, Long projectId) { log.info("\t> 执行 DAO 层 ProjectDAO.isPrincipalUser 方法"); log.info("\t\t> 从 MySQL 获取数据"); ProjectDO projectDO = projectMapper.getProjectById(projectId); @@ -228,21 +228,21 @@ public class ProjectDAO { } - public List tget(Integer id,List isFinish,List tags) { + public List tget(Integer id, List isFinish, List tags) { log.info("DAO层tget"); - if(tags != null && !tags.isEmpty()){ - return projectMapper.tgetBytags(tags,isFinish); + if (tags != null && !tags.isEmpty()) { + return projectMapper.tgetBytags(tags, isFinish); } - if(isFinish != null && !isFinish.isEmpty()){ + if (isFinish != null && !isFinish.isEmpty()) { return projectMapper.tgetByIsfinish(isFinish); } return projectMapper.tget(id); } - public ProjectWorkDO getProjectWorkerById(Long id){ + public ProjectWorkDO getProjectWorkerById(Long id) { return projectMapper.getProjectWorkById(id); } diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index 2b0e97a..aaf6a18 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -4,8 +4,8 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.jsl.oa.common.constant.BusinessConstants; import com.jsl.oa.mapper.RoleMapper; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; import com.jsl.oa.utils.redis.RoleRedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -44,7 +44,8 @@ public class RoleDAO { return roleMapper.getRoleById(id); } else { log.info("\t\t> 从 Redis 获取数据"); - List roleList = gson.fromJson(getRedisData, new TypeToken>() {}.getType()); + List roleList = gson.fromJson(getRedisData, new TypeToken>() { + }.getType()); for (RoleDO roleDO : roleList) { if (roleDO.getId().equals(id)) { return roleDO; @@ -64,7 +65,8 @@ public class RoleDAO { return roleList; } else { log.info("\t\t> 从 Redis 获取数据"); - return gson.fromJson(getRedisData, new TypeToken>() {}.getType()); + return gson.fromJson(getRedisData, new TypeToken>() { + }.getType()); } } @@ -77,7 +79,7 @@ public class RoleDAO { } - public RoleDO getRoleNameByUid(Long uid){ + public RoleDO getRoleNameByUid(Long uid) { log.info("\t> 执行 DAO 层 RoleDAO.getRoleNameByUid 方法"); log.info("\t\t> 从 MySQL 获取数据"); RoleDO roleDO = roleMapper.getRoleById(getRoleUserByUid(uid).getRid()); diff --git a/src/main/java/com/jsl/oa/dao/TagDAO.java b/src/main/java/com/jsl/oa/dao/TagDAO.java index 462e385..dba1861 100644 --- a/src/main/java/com/jsl/oa/dao/TagDAO.java +++ b/src/main/java/com/jsl/oa/dao/TagDAO.java @@ -1,7 +1,7 @@ package com.jsl.oa.dao; import com.jsl.oa.mapper.TagMapper; -import com.jsl.oa.model.doData.TagProjectDO; +import com.jsl.oa.model.dodata.TagProjectDO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/jsl/oa/dao/UserDAO.java b/src/main/java/com/jsl/oa/dao/UserDAO.java index 2a9bd0f..cecf804 100755 --- a/src/main/java/com/jsl/oa/dao/UserDAO.java +++ b/src/main/java/com/jsl/oa/dao/UserDAO.java @@ -3,12 +3,12 @@ package com.jsl.oa.dao; import com.google.gson.Gson; import com.jsl.oa.common.constant.BusinessConstants; import com.jsl.oa.mapper.UserMapper; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.UserAllCurrentVO; -import com.jsl.oa.model.voData.UserCurrentBackVO; -import com.jsl.oa.model.voData.UserEditProfileVO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.vodata.UserAllCurrentVO; +import com.jsl.oa.model.vodata.UserCurrentBackVO; +import com.jsl.oa.model.vodata.UserEditProfileVO; import com.jsl.oa.utils.Processing; import com.jsl.oa.utils.redis.UserRedisUtil; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/jsl/oa/exception/ProcessException.java b/src/main/java/com/jsl/oa/exception/ProcessException.java index bc7b85b..bf35028 100755 --- a/src/main/java/com/jsl/oa/exception/ProcessException.java +++ b/src/main/java/com/jsl/oa/exception/ProcessException.java @@ -19,8 +19,8 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep *
* 用于处理异常 * + * @author xiao_lfeng * @version v1.1.0 - * @since v1.1.0 * @see HttpRequestMethodNotSupportedException * @see DuplicateKeyException * @see HttpMessageNotReadableException @@ -28,7 +28,7 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep * @see Exception * @see ClassCopyException * @see MethodArgumentTypeMismatchException - * @author xiao_lfeng + * @since v1.1.0 */ @Slf4j @RestControllerAdvice @@ -51,6 +51,7 @@ public class ProcessException { log.warn(e.getMessage(), e); return ResultUtil.error("HttpMessageNotReadable", 400, "请求参数错误"); } + @ExceptionHandler(value = MissingServletRequestParameterException.class) public ResponseEntity businessMissingServletRequestParameterException(MissingServletRequestParameterException e) { log.error(e.getMessage(), e); diff --git a/src/main/java/com/jsl/oa/mapper/InfoMapper.java b/src/main/java/com/jsl/oa/mapper/InfoMapper.java index ffc2812..d0f23a9 100644 --- a/src/main/java/com/jsl/oa/mapper/InfoMapper.java +++ b/src/main/java/com/jsl/oa/mapper/InfoMapper.java @@ -1,6 +1,6 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.ConfigDO; +import com.jsl.oa.model.dodata.ConfigDO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Update; * * @since v1.1.0 * @version v1.1.0 - * @see com.jsl.oa.model.doData.ConfigDO + * @see com.jsl.oa.model.dodata.ConfigDO */ @Mapper public interface InfoMapper { diff --git a/src/main/java/com/jsl/oa/mapper/MessageMapper.java b/src/main/java/com/jsl/oa/mapper/MessageMapper.java index 6a635b4..25896f9 100644 --- a/src/main/java/com/jsl/oa/mapper/MessageMapper.java +++ b/src/main/java/com/jsl/oa/mapper/MessageMapper.java @@ -1,6 +1,6 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.MessageDO; +import com.jsl.oa.model.dodata.MessageDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -12,9 +12,9 @@ import java.util.List; @Mapper public interface MessageMapper { - @Update("UPDATE organize_oa.oa_message " + - "SET `read` = 1, deleted_at = CURRENT_TIMESTAMP " + - "WHERE id = #{mid}") + @Update("UPDATE organize_oa.oa_message " + + "SET `read` = 1, deleted_at = CURRENT_TIMESTAMP " + + "WHERE id = #{mid}") boolean deleteMessage(Long mid); @Select("SELECT * FROM organize_oa.oa_message where id = #{mid}") diff --git a/src/main/java/com/jsl/oa/mapper/ModuleMapper.java b/src/main/java/com/jsl/oa/mapper/ModuleMapper.java index 02e7f90..ae8caf6 100644 --- a/src/main/java/com/jsl/oa/mapper/ModuleMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ModuleMapper.java @@ -1,6 +1,6 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.ProjectWorkDO; +import com.jsl.oa.model.dodata.ProjectWorkDO; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -12,10 +12,8 @@ public interface ModuleMapper { - //@Select("select * from organize_oa.oa_project_work where project_id=#{projectId} and principal_id=#{userId} and type=0") List getByProjectId(Integer projectId, Long userId,int is); - //@Select("select * from organize_oa.oa_project_work where pid=#{sysId} and type=1") List getBySysId(Integer sysId, Long userId,int is); @Select("select principal_id from organize_oa.oa_project where id=#{projectId}") @@ -30,7 +28,7 @@ public interface ModuleMapper { @Select("select * from organize_oa.oa_project_work where pid=#{id} and is_delete=0 and type=1 ") List getAllMoudleByPid(Long id); - @Select("select principal_id from organize_oa.oa_project where id=(select project_id " + - "from organize_oa.oa_project_work where oa_project_work.id = #{sysId})") + @Select("select principal_id from organize_oa.oa_project where id=(select project_id " + + "from organize_oa.oa_project_work where oa_project_work.id = #{sysId})") Long getPridBySysyid(Integer sysId); } diff --git a/src/main/java/com/jsl/oa/mapper/NewsMapper.java b/src/main/java/com/jsl/oa/mapper/NewsMapper.java index 4b37dd7..852344c 100644 --- a/src/main/java/com/jsl/oa/mapper/NewsMapper.java +++ b/src/main/java/com/jsl/oa/mapper/NewsMapper.java @@ -1,7 +1,7 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.NewsDO; +import com.jsl.oa.model.dodata.NewsDO; import org.apache.ibatis.annotations.*; import java.util.List; @@ -10,26 +10,26 @@ import java.util.List; public interface NewsMapper { @Select("SELECT * FROM organize_oa.oa_news WHERE id = #{id}") - NewsDO selectNewsById( Long id); + NewsDO selectNewsById(Long id); @Select("SELECT * FROM organize_oa.oa_news WHERE status = #{status}") - List selectNewsByStatus( Integer status); + List selectNewsByStatus(Integer status); - @Insert("INSERT INTO organize_oa.oa_news(title, content, tags, status) " + - "VALUES(#{title}, #{content}, #{tags}, #{status})") + @Insert("INSERT INTO organize_oa.oa_news(title, content, tags, status) " + + "VALUES(#{title}, #{content}, #{tags}, #{status})") @Options(useGeneratedKeys = true, keyProperty = "id") void addNews(NewsDO news); - @Update("UPDATE organize_oa.oa_news SET title = #{title}, content = #{content}, tags = #{tags}, " + - "likes = #{likes}, comments = #{comments}, status = #{status}, update_at = CURRENT_TIMESTAMP " + - "WHERE id = #{id}") + @Update("UPDATE organize_oa.oa_news SET title = #{title}, content = #{content}, tags = #{tags}, " + + "likes = #{likes}, comments = #{comments}, status = #{status}, update_at = CURRENT_TIMESTAMP " + + "WHERE id = #{id}") void updateNews(NewsDO news); @Delete("DELETE FROM organize_oa.oa_news WHERE id = #{id}") - void deleteNewsById( Long id); + void deleteNewsById(Long id); - @Insert("INSERT INTO organize_oa.oa_news_user(uid,nid)"+ - "VALUES(#{uid}, #{nid})") - void addNewsUser(Long uid,Long nid); + @Insert("INSERT INTO organize_oa.oa_news_user(uid,nid)" + + "VALUES(#{uid}, #{nid})") + void addNewsUser(Long uid, Long nid); } diff --git a/src/main/java/com/jsl/oa/mapper/PermissionMapper.java b/src/main/java/com/jsl/oa/mapper/PermissionMapper.java index 8f10256..fd8604c 100644 --- a/src/main/java/com/jsl/oa/mapper/PermissionMapper.java +++ b/src/main/java/com/jsl/oa/mapper/PermissionMapper.java @@ -1,7 +1,7 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.PermissionDO; -import com.jsl.oa.model.doData.RolePermissionDO; +import com.jsl.oa.model.dodata.PermissionDO; +import com.jsl.oa.model.dodata.RolePermissionDO; import org.apache.ibatis.annotations.*; import java.util.List; @@ -14,7 +14,7 @@ public interface PermissionMapper { @Select("SELECT * FROM organize_oa.oa_permissions WHERE id IN " + "(SELECT pid FROM organize_oa.oa_role_permissions WHERE rid IN " + - "(SELECT rid FROM organize_oa.oa_role_user WHERE uid = #{uid}))") + "(SELECT rid FROM organize_oa.oa_role_user WHERE uid = #{uid}))") List permissionUserPid(Long uid); @Select("SELECT * FROM organize_oa.oa_permissions where id=#{id}") diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 9040613..5ba62c1 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -1,12 +1,12 @@ package com.jsl.oa.mapper; -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.ProjectWorkDO; -import com.jsl.oa.model.voData.ProjectInfoVO; -import com.jsl.oa.model.voData.ProjectWorkSimpleVO; -import com.jsl.oa.model.voData.ProjectWorkVO; +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.ProjectWorkDO; +import com.jsl.oa.model.vodata.ProjectInfoVO; +import com.jsl.oa.model.vodata.ProjectWorkSimpleVO; +import com.jsl.oa.model.vodata.ProjectWorkVO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java index 4cd45cf..e35b10b 100644 --- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java +++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java @@ -1,7 +1,7 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; import org.apache.ibatis.annotations.*; import java.util.List; diff --git a/src/main/java/com/jsl/oa/mapper/TagMapper.java b/src/main/java/com/jsl/oa/mapper/TagMapper.java index 14aa675..766b38e 100644 --- a/src/main/java/com/jsl/oa/mapper/TagMapper.java +++ b/src/main/java/com/jsl/oa/mapper/TagMapper.java @@ -1,6 +1,6 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.TagProjectDO; +import com.jsl.oa.model.dodata.TagProjectDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/jsl/oa/mapper/UserMapper.java b/src/main/java/com/jsl/oa/mapper/UserMapper.java index 5f82e7f..c5913ab 100755 --- a/src/main/java/com/jsl/oa/mapper/UserMapper.java +++ b/src/main/java/com/jsl/oa/mapper/UserMapper.java @@ -1,11 +1,11 @@ package com.jsl.oa.mapper; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.PrincipalSelectVO; -import com.jsl.oa.model.voData.UserAllCurrentVO; -import com.jsl.oa.model.voData.UserEditProfileVO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.vodata.PrincipalSelectVO; +import com.jsl.oa.model.vodata.UserAllCurrentVO; +import com.jsl.oa.model.vodata.UserEditProfileVO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/jsl/oa/model/doData/ConfigDO.java b/src/main/java/com/jsl/oa/model/dodata/ConfigDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/ConfigDO.java rename to src/main/java/com/jsl/oa/model/dodata/ConfigDO.java index 751d9b7..fc5c839 100755 --- a/src/main/java/com/jsl/oa/model/doData/ConfigDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ConfigDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/MessageDO.java b/src/main/java/com/jsl/oa/model/dodata/MessageDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/MessageDO.java rename to src/main/java/com/jsl/oa/model/dodata/MessageDO.java index 08c542c..0921bd5 100644 --- a/src/main/java/com/jsl/oa/model/doData/MessageDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/MessageDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/NewsDO.java b/src/main/java/com/jsl/oa/model/dodata/NewsDO.java similarity index 95% rename from src/main/java/com/jsl/oa/model/doData/NewsDO.java rename to src/main/java/com/jsl/oa/model/dodata/NewsDO.java index ceb9a49..b4bac46 100644 --- a/src/main/java/com/jsl/oa/model/doData/NewsDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/NewsDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/PageBeanDO.java b/src/main/java/com/jsl/oa/model/dodata/PageBeanDO.java similarity index 92% rename from src/main/java/com/jsl/oa/model/doData/PageBeanDO.java rename to src/main/java/com/jsl/oa/model/dodata/PageBeanDO.java index c22afd7..c114063 100644 --- a/src/main/java/com/jsl/oa/model/doData/PageBeanDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/PageBeanDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/PermissionDO.java b/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/PermissionDO.java rename to src/main/java/com/jsl/oa/model/dodata/PermissionDO.java index 2818b78..433dd35 100755 --- a/src/main/java/com/jsl/oa/model/doData/PermissionDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/PermissionDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectCuttingDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java similarity index 96% rename from src/main/java/com/jsl/oa/model/doData/ProjectCuttingDO.java rename to src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java index 3642285..b79a8f7 100755 --- a/src/main/java/com/jsl/oa/model/doData/ProjectCuttingDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ProjectCuttingDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -12,8 +12,8 @@ import java.sql.Timestamp; * 映射 oa_project_cutting 数据表内容进入自定义实体类 * * @author 筱锋xiao_lfeng - * @since v1.1.0 * @version v1.1.0 + * @since v1.1.0 */ @Data @Accessors(chain = true) diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java similarity index 97% rename from src/main/java/com/jsl/oa/model/doData/ProjectDO.java rename to src/main/java/com/jsl/oa/model/dodata/ProjectDO.java index 3d79817..172ab0d 100755 --- a/src/main/java/com/jsl/oa/model/doData/ProjectDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ProjectDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectTypeDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectTypeDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/ProjectTypeDO.java rename to src/main/java/com/jsl/oa/model/dodata/ProjectTypeDO.java index 54fda04..179f81e 100755 --- a/src/main/java/com/jsl/oa/model/doData/ProjectTypeDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ProjectTypeDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectUserDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectUserDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/ProjectUserDO.java rename to src/main/java/com/jsl/oa/model/dodata/ProjectUserDO.java index 432ccea..f2f3625 100755 --- a/src/main/java/com/jsl/oa/model/doData/ProjectUserDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ProjectUserDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java rename to src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java index 6dcd3fa..b707532 100644 --- a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ProjectWorkDO.java @@ -1,5 +1,4 @@ - -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -25,4 +24,4 @@ public class ProjectWorkDO { private boolean status; private Timestamp beginTime; private Timestamp completeTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/jsl/oa/model/doData/RoleDO.java b/src/main/java/com/jsl/oa/model/dodata/RoleDO.java similarity index 93% rename from src/main/java/com/jsl/oa/model/doData/RoleDO.java rename to src/main/java/com/jsl/oa/model/dodata/RoleDO.java index 68f5c05..0d752d9 100755 --- a/src/main/java/com/jsl/oa/model/doData/RoleDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/RoleDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/doData/RolePermissionDO.java b/src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java similarity index 93% rename from src/main/java/com/jsl/oa/model/doData/RolePermissionDO.java rename to src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java index 3b00f2a..f3376fb 100755 --- a/src/main/java/com/jsl/oa/model/doData/RolePermissionDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/RolePermissionDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/RoleUserDO.java b/src/main/java/com/jsl/oa/model/dodata/RoleUserDO.java similarity index 93% rename from src/main/java/com/jsl/oa/model/doData/RoleUserDO.java rename to src/main/java/com/jsl/oa/model/dodata/RoleUserDO.java index 60c769c..3670f07 100755 --- a/src/main/java/com/jsl/oa/model/doData/RoleUserDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/RoleUserDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/doData/TagProjectDO.java b/src/main/java/com/jsl/oa/model/dodata/TagProjectDO.java similarity index 93% rename from src/main/java/com/jsl/oa/model/doData/TagProjectDO.java rename to src/main/java/com/jsl/oa/model/dodata/TagProjectDO.java index 4cd4b31..ad9d9fd 100644 --- a/src/main/java/com/jsl/oa/model/doData/TagProjectDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/TagProjectDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/UserDO.java b/src/main/java/com/jsl/oa/model/dodata/UserDO.java similarity index 96% rename from src/main/java/com/jsl/oa/model/doData/UserDO.java rename to src/main/java/com/jsl/oa/model/dodata/UserDO.java index 354925d..a9bdfad 100755 --- a/src/main/java/com/jsl/oa/model/doData/UserDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/UserDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData; +package com.jsl.oa.model.dodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/doData/info/CarouselDO.java b/src/main/java/com/jsl/oa/model/dodata/info/CarouselDO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/doData/info/CarouselDO.java rename to src/main/java/com/jsl/oa/model/dodata/info/CarouselDO.java index 2ba8bbb..c0417c0 100644 --- a/src/main/java/com/jsl/oa/model/doData/info/CarouselDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/info/CarouselDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData.info; +package com.jsl.oa.model.dodata.info; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/doData/info/ProjectShowDO.java b/src/main/java/com/jsl/oa/model/dodata/info/ProjectShowDO.java similarity index 82% rename from src/main/java/com/jsl/oa/model/doData/info/ProjectShowDO.java rename to src/main/java/com/jsl/oa/model/dodata/info/ProjectShowDO.java index 4ec1f2b..fbcf6bf 100644 --- a/src/main/java/com/jsl/oa/model/doData/info/ProjectShowDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/info/ProjectShowDO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.doData.info; +package com.jsl.oa.model.dodata.info; import lombok.Data; import lombok.experimental.Accessors; @@ -8,7 +8,7 @@ import java.util.List; @Data public class ProjectShowDO { private String order; - private List data; + private List data; @Data @Accessors(chain = true) @@ -22,4 +22,4 @@ public class ProjectShowDO { private String updatedAt; private String author; } -} \ No newline at end of file +} diff --git a/src/main/java/com/jsl/oa/model/voData/NewsAddVO.java b/src/main/java/com/jsl/oa/model/vodata/NewsAddVO.java similarity index 93% rename from src/main/java/com/jsl/oa/model/voData/NewsAddVO.java rename to src/main/java/com/jsl/oa/model/vodata/NewsAddVO.java index 9c10224..6f2e1af 100644 --- a/src/main/java/com/jsl/oa/model/voData/NewsAddVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/NewsAddVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; diff --git a/src/main/java/com/jsl/oa/model/voData/PermissionContentVo.java b/src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java similarity index 87% rename from src/main/java/com/jsl/oa/model/voData/PermissionContentVo.java rename to src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java index ee73de2..e48833d 100644 --- a/src/main/java/com/jsl/oa/model/voData/PermissionContentVo.java +++ b/src/main/java/com/jsl/oa/model/vodata/PermissionContentVo.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/PermissionEditVO.java b/src/main/java/com/jsl/oa/model/vodata/PermissionEditVO.java similarity index 88% rename from src/main/java/com/jsl/oa/model/voData/PermissionEditVO.java rename to src/main/java/com/jsl/oa/model/vodata/PermissionEditVO.java index 6a34d61..fa351fb 100644 --- a/src/main/java/com/jsl/oa/model/voData/PermissionEditVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/PermissionEditVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java b/src/main/java/com/jsl/oa/model/vodata/PrincipalSelectVO.java similarity index 81% rename from src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java rename to src/main/java/com/jsl/oa/model/vodata/PrincipalSelectVO.java index fee0056..f8554aa 100644 --- a/src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/PrincipalSelectVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectCuttingAddVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectCuttingAddVO.java similarity index 91% rename from src/main/java/com/jsl/oa/model/voData/ProjectCuttingAddVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectCuttingAddVO.java index 76ea491..18c7cd3 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectCuttingAddVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectCuttingAddVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectCuttingEditVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectCuttingEditVO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/voData/ProjectCuttingEditVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectCuttingEditVO.java index a90cba2..ee07139 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectCuttingEditVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectCuttingEditVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectEditVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectEditVO.java similarity index 64% rename from src/main/java/com/jsl/oa/model/voData/ProjectEditVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectEditVO.java index 1328fd5..b8dee8b 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectEditVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectEditVO.java @@ -1,12 +1,7 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; -import lombok.Getter; -import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.sql.Timestamp; @Data diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectFileVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectFileVO.java similarity index 77% rename from src/main/java/com/jsl/oa/model/voData/ProjectFileVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectFileVO.java index 54c9df4..834d21d 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectFileVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectFileVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectInfoVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java similarity index 92% rename from src/main/java/com/jsl/oa/model/voData/ProjectInfoVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java index c6a9a46..e5a5784 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectInfoVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectInfoVO.java @@ -1,6 +1,5 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; -import lombok.Builder; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectSimpleVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java similarity index 92% rename from src/main/java/com/jsl/oa/model/voData/ProjectSimpleVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java index c5d13c8..de5ba6c 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectSimpleVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkAndNameVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java similarity index 95% rename from src/main/java/com/jsl/oa/model/voData/ProjectWorkAndNameVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java index 4bee946..c01d706 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkAndNameVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkSimpleVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkSimpleVO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/voData/ProjectWorkSimpleVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectWorkSimpleVO.java index 5f2df5d..15055ff 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkSimpleVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkSimpleVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkVO.java similarity index 95% rename from src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java rename to src/main/java/com/jsl/oa/model/vodata/ProjectWorkVO.java index c5d0501..80630b9 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/RoleAddUserVO.java b/src/main/java/com/jsl/oa/model/vodata/RoleAddUserVO.java similarity index 88% rename from src/main/java/com/jsl/oa/model/voData/RoleAddUserVO.java rename to src/main/java/com/jsl/oa/model/vodata/RoleAddUserVO.java index 8863976..7fe6280 100644 --- a/src/main/java/com/jsl/oa/model/voData/RoleAddUserVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/RoleAddUserVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; diff --git a/src/main/java/com/jsl/oa/model/voData/RoleAddVo.java b/src/main/java/com/jsl/oa/model/vodata/RoleAddVo.java similarity index 91% rename from src/main/java/com/jsl/oa/model/voData/RoleAddVo.java rename to src/main/java/com/jsl/oa/model/vodata/RoleAddVo.java index 501e055..bd31e2b 100644 --- a/src/main/java/com/jsl/oa/model/voData/RoleAddVo.java +++ b/src/main/java/com/jsl/oa/model/vodata/RoleAddVo.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/RoleEditVO.java b/src/main/java/com/jsl/oa/model/vodata/RoleEditVO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/voData/RoleEditVO.java rename to src/main/java/com/jsl/oa/model/vodata/RoleEditVO.java index c5f77d4..b8a4ba9 100644 --- a/src/main/java/com/jsl/oa/model/voData/RoleEditVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/RoleEditVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/RoleRemoveUserVO.java b/src/main/java/com/jsl/oa/model/vodata/RoleRemoveUserVO.java similarity index 84% rename from src/main/java/com/jsl/oa/model/voData/RoleRemoveUserVO.java rename to src/main/java/com/jsl/oa/model/vodata/RoleRemoveUserVO.java index 3b4ba84..d1a4159 100644 --- a/src/main/java/com/jsl/oa/model/voData/RoleRemoveUserVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/RoleRemoveUserVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; diff --git a/src/main/java/com/jsl/oa/model/voData/UserAddVO.java b/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java similarity index 97% rename from src/main/java/com/jsl/oa/model/voData/UserAddVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserAddVO.java index e85f5b4..cfca43d 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserAddVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserAddVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; diff --git a/src/main/java/com/jsl/oa/model/voData/UserAllCurrentVO.java b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java similarity index 85% rename from src/main/java/com/jsl/oa/model/voData/UserAllCurrentVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java index 323ee90..63b7eaf 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserAllCurrentVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/jsl/oa/model/voData/UserChangePasswordVO.java b/src/main/java/com/jsl/oa/model/vodata/UserChangePasswordVO.java similarity index 91% rename from src/main/java/com/jsl/oa/model/voData/UserChangePasswordVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserChangePasswordVO.java index 1fb8aa4..82b0baf 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserChangePasswordVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserChangePasswordVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java similarity index 97% rename from src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java index 66b94a5..1385644 100755 --- a/src/main/java/com/jsl/oa/model/voData/UserCurrentBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/voData/UserEditProfileVO.java b/src/main/java/com/jsl/oa/model/vodata/UserEditProfileVO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/voData/UserEditProfileVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserEditProfileVO.java index ba16771..72fc963 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserEditProfileVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserEditProfileVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java b/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java similarity index 97% rename from src/main/java/com/jsl/oa/model/voData/UserEditVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserEditVO.java index b04b3d1..300335e 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserEditVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/UserForgetPasswordVO.java b/src/main/java/com/jsl/oa/model/vodata/UserForgetPasswordVO.java similarity index 92% rename from src/main/java/com/jsl/oa/model/voData/UserForgetPasswordVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserForgetPasswordVO.java index d97dd36..b210d0f 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserForgetPasswordVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserForgetPasswordVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/UserLoginVO.java b/src/main/java/com/jsl/oa/model/vodata/UserLoginVO.java similarity index 94% rename from src/main/java/com/jsl/oa/model/voData/UserLoginVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserLoginVO.java index c18d2df..d1f230f 100755 --- a/src/main/java/com/jsl/oa/model/voData/UserLoginVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserLoginVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java b/src/main/java/com/jsl/oa/model/vodata/UserProfileVo.java similarity index 92% rename from src/main/java/com/jsl/oa/model/voData/UserProfileVo.java rename to src/main/java/com/jsl/oa/model/vodata/UserProfileVo.java index c94fc1f..1f33552 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserProfileVo.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/UserRegisterVO.java b/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java similarity index 97% rename from src/main/java/com/jsl/oa/model/voData/UserRegisterVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java index 7b6df82..949d0c1 100755 --- a/src/main/java/com/jsl/oa/model/voData/UserRegisterVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserRegisterVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/jsl/oa/model/voData/UserReturnBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java similarity index 96% rename from src/main/java/com/jsl/oa/model/voData/UserReturnBackVO.java rename to src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java index 11bf01f..07f52d7 100755 --- a/src/main/java/com/jsl/oa/model/voData/UserReturnBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData; +package com.jsl.oa.model.vodata; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/voData/business/InfoAboutSecurityKey.java b/src/main/java/com/jsl/oa/model/vodata/business/InfoAboutSecurityKey.java similarity index 87% rename from src/main/java/com/jsl/oa/model/voData/business/InfoAboutSecurityKey.java rename to src/main/java/com/jsl/oa/model/vodata/business/InfoAboutSecurityKey.java index c631e04..35f6517 100644 --- a/src/main/java/com/jsl/oa/model/voData/business/InfoAboutSecurityKey.java +++ b/src/main/java/com/jsl/oa/model/vodata/business/InfoAboutSecurityKey.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData.business; +package com.jsl.oa.model.vodata.business; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java b/src/main/java/com/jsl/oa/model/vodata/business/info/CarouselVO.java similarity index 91% rename from src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java rename to src/main/java/com/jsl/oa/model/vodata/business/info/CarouselVO.java index 089b7b4..b68ce11 100644 --- a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/business/info/CarouselVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData.business.info; +package com.jsl.oa.model.vodata.business.info; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/model/voData/business/info/ProjectShowVO.java b/src/main/java/com/jsl/oa/model/vodata/business/info/ProjectShowVO.java similarity index 80% rename from src/main/java/com/jsl/oa/model/voData/business/info/ProjectShowVO.java rename to src/main/java/com/jsl/oa/model/vodata/business/info/ProjectShowVO.java index 0d14fc0..2af5edc 100644 --- a/src/main/java/com/jsl/oa/model/voData/business/info/ProjectShowVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/business/info/ProjectShowVO.java @@ -1,4 +1,4 @@ -package com.jsl.oa.model.voData.business.info; +package com.jsl.oa.model.vodata.business.info; import lombok.Data; diff --git a/src/main/java/com/jsl/oa/schedule/SafeSchedule.java b/src/main/java/com/jsl/oa/schedule/SafeSchedule.java index e59913d..ad71521 100644 --- a/src/main/java/com/jsl/oa/schedule/SafeSchedule.java +++ b/src/main/java/com/jsl/oa/schedule/SafeSchedule.java @@ -2,8 +2,8 @@ package com.jsl.oa.schedule; import com.google.gson.Gson; import com.jsl.oa.mapper.InfoMapper; -import com.jsl.oa.model.doData.ConfigDO; -import com.jsl.oa.model.voData.business.InfoAboutSecurityKey; +import com.jsl.oa.model.dodata.ConfigDO; +import com.jsl.oa.model.vodata.business.InfoAboutSecurityKey; import com.jsl.oa.utils.Processing; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/jsl/oa/services/AuthService.java b/src/main/java/com/jsl/oa/services/AuthService.java index 78d179b..8eb3b6b 100755 --- a/src/main/java/com/jsl/oa/services/AuthService.java +++ b/src/main/java/com/jsl/oa/services/AuthService.java @@ -1,9 +1,9 @@ package com.jsl.oa.services; -import com.jsl.oa.model.voData.UserChangePasswordVO; -import com.jsl.oa.model.voData.UserForgetPasswordVO; -import com.jsl.oa.model.voData.UserLoginVO; -import com.jsl.oa.model.voData.UserRegisterVO; +import com.jsl.oa.model.vodata.UserChangePasswordVO; +import com.jsl.oa.model.vodata.UserForgetPasswordVO; +import com.jsl.oa.model.vodata.UserLoginVO; +import com.jsl.oa.model.vodata.UserRegisterVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; @@ -68,7 +68,7 @@ public interface AuthService { * @param userChangePasswordVO 用户修改密码信息 * @return {@link BaseResponse} */ - BaseResponse authChangePassword(HttpServletRequest request, UserChangePasswordVO userChangePasswordVO); + BaseResponse authChangePassword(UserChangePasswordVO userChangePasswordVO, HttpServletRequest request); /** *

用户登出

diff --git a/src/main/java/com/jsl/oa/services/InfoService.java b/src/main/java/com/jsl/oa/services/InfoService.java index f6f6b3c..028e7a3 100644 --- a/src/main/java/com/jsl/oa/services/InfoService.java +++ b/src/main/java/com/jsl/oa/services/InfoService.java @@ -1,6 +1,6 @@ package com.jsl.oa.services; -import com.jsl.oa.model.voData.business.info.CarouselVO; +import com.jsl.oa.model.vodata.business.info.CarouselVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/jsl/oa/services/MessageService.java b/src/main/java/com/jsl/oa/services/MessageService.java index 7030145..944c35a 100644 --- a/src/main/java/com/jsl/oa/services/MessageService.java +++ b/src/main/java/com/jsl/oa/services/MessageService.java @@ -16,9 +16,17 @@ import java.time.LocalDate; */ public interface MessageService { - BaseResponse messageDelete(Long mid,HttpServletRequest request); + BaseResponse messageDelete(Long mid, HttpServletRequest request); - BaseResponse messageGet(LocalDate begin,LocalDate end,Long page,Long pageSize,Long uid); + BaseResponse messageGet(LocalDate begin, LocalDate end, Long page, Long pageSize, Long uid); - BaseResponse messageGetAll(HttpServletRequest request,LocalDate begin, LocalDate end, Long page, Long pageSize, Long loginId, Long uid); + BaseResponse messageGetAll( + HttpServletRequest request, + LocalDate begin, + LocalDate end, + Long page, + Long pageSize, + Long loginId, + Long uid + ); } diff --git a/src/main/java/com/jsl/oa/services/ModuleService.java b/src/main/java/com/jsl/oa/services/ModuleService.java index 6e888d2..154aa73 100644 --- a/src/main/java/com/jsl/oa/services/ModuleService.java +++ b/src/main/java/com/jsl/oa/services/ModuleService.java @@ -1,8 +1,6 @@ package com.jsl.oa.services; import com.jsl.oa.utils.BaseResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/jsl/oa/services/NewsService.java b/src/main/java/com/jsl/oa/services/NewsService.java index a79c8f8..8d510ef 100644 --- a/src/main/java/com/jsl/oa/services/NewsService.java +++ b/src/main/java/com/jsl/oa/services/NewsService.java @@ -1,6 +1,6 @@ package com.jsl.oa.services; -import com.jsl.oa.model.voData.NewsAddVO; +import com.jsl.oa.model.vodata.NewsAddVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/jsl/oa/services/PermissionService.java b/src/main/java/com/jsl/oa/services/PermissionService.java index 62129a3..f81e127 100644 --- a/src/main/java/com/jsl/oa/services/PermissionService.java +++ b/src/main/java/com/jsl/oa/services/PermissionService.java @@ -1,6 +1,6 @@ package com.jsl.oa.services; -import com.jsl.oa.model.voData.PermissionEditVO; +import com.jsl.oa.model.vodata.PermissionEditVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 77f614d..9915778 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -1,7 +1,7 @@ package com.jsl.oa.services; -import com.jsl.oa.model.voData.*; -import com.jsl.oa.model.voData.business.info.ProjectShowVO; +import com.jsl.oa.model.vodata.*; +import com.jsl.oa.model.vodata.business.info.ProjectShowVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; @@ -40,7 +40,7 @@ public interface ProjectService { BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); - BaseResponse tget(Integer id, List tags, List isFinish,Integer page,Integer pageSize); + BaseResponse tget(Integer id, List tags, List isFinish, Integer page, Integer pageSize); BaseResponse projectFileGet(HttpServletRequest request, Long projectId); diff --git a/src/main/java/com/jsl/oa/services/RoleService.java b/src/main/java/com/jsl/oa/services/RoleService.java index 0fe8f57..ba46e87 100644 --- a/src/main/java/com/jsl/oa/services/RoleService.java +++ b/src/main/java/com/jsl/oa/services/RoleService.java @@ -1,8 +1,8 @@ package com.jsl.oa.services; import com.jsl.oa.exception.ClassCopyException; -import com.jsl.oa.model.voData.RoleAddVo; -import com.jsl.oa.model.voData.RoleEditVO; +import com.jsl.oa.model.vodata.RoleAddVo; +import com.jsl.oa.model.vodata.RoleEditVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/jsl/oa/services/UserService.java b/src/main/java/com/jsl/oa/services/UserService.java index 80a8ac5..a370321 100755 --- a/src/main/java/com/jsl/oa/services/UserService.java +++ b/src/main/java/com/jsl/oa/services/UserService.java @@ -1,10 +1,10 @@ package com.jsl.oa.services; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.UserAddVO; -import com.jsl.oa.model.voData.UserAllCurrentVO; -import com.jsl.oa.model.voData.UserEditProfileVO; -import com.jsl.oa.model.voData.UserEditVO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.vodata.UserAddVO; +import com.jsl.oa.model.vodata.UserAllCurrentVO; +import com.jsl.oa.model.vodata.UserEditProfileVO; +import com.jsl.oa.model.vodata.UserEditVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; @@ -36,7 +36,7 @@ public interface UserService { * @param id 用户id * @return {@link BaseResponse} */ - BaseResponse userDelete(HttpServletRequest request,Long id); + BaseResponse userDelete(HttpServletRequest request, Long id); /** *

账号锁定

@@ -46,7 +46,7 @@ public interface UserService { * @param id 用户id * @return {@link BaseResponse} */ - BaseResponse userLock(HttpServletRequest request,Long id,Long isLock); + BaseResponse userLock(HttpServletRequest request, Long id, Long isLock); /** *

用户编辑自己的信息

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 3737ad3..25776df 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -5,9 +5,9 @@ import com.jsl.oa.common.constant.BusinessConstants; import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.mapper.UserMapper; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.*; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.vodata.*; import com.jsl.oa.services.AuthService; import com.jsl.oa.services.MailService; import com.jsl.oa.utils.*; @@ -88,7 +88,8 @@ public class AuthServiceImpl implements AuthService { log.info("\t> 执行 Service 层 AuthService.userLogin 方法"); // 检查用户是否存在 UserDO userDO; - if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", userLoginVO.getUser())) { + if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", + userLoginVO.getUser())) { // 是否为手机号 log.info("\t\t> 手机号登陆"); userDO = userMapper.getUserInfoByPhone(userLoginVO.getUser()); @@ -175,7 +176,10 @@ public class AuthServiceImpl implements AuthService { @Override @CheckUserAbleToUse - public BaseResponse authChangePassword(HttpServletRequest request, @NotNull UserChangePasswordVO userChangePasswordVO) { + public BaseResponse authChangePassword( + @NotNull UserChangePasswordVO userChangePasswordVO, + HttpServletRequest request + ) { log.info("\t> 执行 Service 层 AuthService.authChangePassword 方法"); // 检查新密码输入无误 if (!userChangePasswordVO.getNewPassword().equals(userChangePasswordVO.getConfirmPassword())) { @@ -187,7 +191,11 @@ public class AuthServiceImpl implements AuthService { // 检查旧密码 if (BCrypt.checkpw(userChangePasswordVO.getOldPassword(), userDO.getPassword())) { // 更新密码 - if (userMapper.updateUserPassword(userDO.getId(), BCrypt.hashpw(userChangePasswordVO.getNewPassword(), BCrypt.gensalt()))) { + if (userMapper.updateUserPassword( + userDO.getId(), + BCrypt.hashpw(userChangePasswordVO.getNewPassword(), + BCrypt.gensalt())) + ) { return ResultUtil.success("修改成功"); } else { return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR); @@ -226,7 +234,11 @@ public class AuthServiceImpl implements AuthService { // 邮箱获取用户 UserDO userDO = userMapper.getUserInfoByEmail(userForgetPasswordVO.getEmail()); // 更新密码 - if (userMapper.updateUserPassword(userDO.getId(), BCrypt.hashpw(userForgetPasswordVO.getNewPassword(), BCrypt.gensalt()))) { + if (userMapper.updateUserPassword( + userDO.getId(), + BCrypt.hashpw(userForgetPasswordVO.getNewPassword(), + BCrypt.gensalt())) + ) { return ResultUtil.success("修改成功"); } else { return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR); diff --git a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java index 97ed9ed..7540f9f 100644 --- a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java @@ -4,10 +4,10 @@ import com.jsl.oa.annotations.CheckUserHasPermission; import com.jsl.oa.dao.InfoDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.RoleMapper; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.doData.info.CarouselDO; -import com.jsl.oa.model.voData.UserProfileVo; -import com.jsl.oa.model.voData.business.info.CarouselVO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.dodata.info.CarouselDO; +import com.jsl.oa.model.vodata.UserProfileVo; +import com.jsl.oa.model.vodata.business.info.CarouselVO; import com.jsl.oa.services.InfoService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -28,9 +28,9 @@ import java.util.List; *
* 用于信息服务层的实现类 * - * @since v1.0.0 - * @version v1.1.0 * @author xiao_lfeng + * @version v1.1.0 + * @since v1.0.0 */ @Slf4j @Service @@ -179,7 +179,11 @@ public class InfoServiceImpl implements InfoService { orderBy = "userId"; } // 检查参数是否错误 - if (!("asc".equals(order) || "desc".equals(order)) || !("userName".equals(orderBy) || "userId".equals(orderBy))) { + if (!("asc".equals(order) + || "desc".equals(order)) + || !("userName".equals(orderBy) + || "userId".equals(orderBy)) + ) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR); } //获取用户信息 diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java index d80a481..a387dab 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -5,8 +5,8 @@ import com.jsl.oa.annotations.CheckUserAbleToUse; import com.jsl.oa.annotations.CheckUserHasPermission; import com.jsl.oa.mapper.MessageMapper; import com.jsl.oa.mapper.RoleMapper; -import com.jsl.oa.model.doData.MessageDO; -import com.jsl.oa.model.doData.PageBeanDO; +import com.jsl.oa.model.dodata.MessageDO; +import com.jsl.oa.model.dodata.PageBeanDO; import com.jsl.oa.services.MessageService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -77,7 +77,15 @@ public class MessageServiceImpl implements MessageService { @Override @CheckUserHasPermission("message.get") - public BaseResponse messageGetAll(HttpServletRequest request, LocalDate begin, LocalDate end, Long page, Long pageSize, Long loginId, Long uid) { + public BaseResponse messageGetAll( + HttpServletRequest request, + LocalDate begin, + LocalDate end, + Long page, + Long pageSize, + Long loginId, + Long uid + ) { log.info("请求接口服务层"); //1.记录总数据数 Long count = messageMapper.count(uid); diff --git a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java index a2dcb25..d94dff1 100644 --- a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java @@ -1,16 +1,12 @@ package com.jsl.oa.services.impl; -import ch.qos.logback.core.joran.util.beans.BeanUtil; import com.jsl.oa.dao.ModuleDAO; import com.jsl.oa.dao.ProjectDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.ModuleMapper; import com.jsl.oa.mapper.RoleMapper; -import com.jsl.oa.model.doData.ProjectDO; -import com.jsl.oa.model.doData.ProjectWorkDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.ProjectWorkAndNameVO; -import com.jsl.oa.model.voData.ProjectWorkVO; +import com.jsl.oa.model.dodata.ProjectWorkDO; +import com.jsl.oa.model.vodata.ProjectWorkAndNameVO; import com.jsl.oa.services.ModuleService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -21,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; -import javax.xml.transform.Result; import java.util.ArrayList; import java.util.List; @@ -73,7 +68,7 @@ public class ModuleServiceImpl implements ModuleService { List projectWorkAndNameVOS = new ArrayList<>(); for (ProjectWorkDO projectWorkDO : projectWorkDOList) { ProjectWorkAndNameVO projectWorkAndNameVO = new ProjectWorkAndNameVO(); - Processing.copyProperties(projectWorkDO,projectWorkAndNameVO); + Processing.copyProperties(projectWorkDO, projectWorkAndNameVO); // 添加负责人和子系统名称 projectWorkAndNameVO. setChildSystemName(projectDAO.getProjectWorkerById(projectWorkDO.getPid()).getName()) diff --git a/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java index 9707148..6b231eb 100644 --- a/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java @@ -3,8 +3,8 @@ package com.jsl.oa.services.impl; import com.jsl.oa.annotations.CheckUserHasPermission; import com.jsl.oa.dao.NewsDAO; -import com.jsl.oa.model.doData.NewsDO; -import com.jsl.oa.model.voData.NewsAddVO; +import com.jsl.oa.model.dodata.NewsDO; +import com.jsl.oa.model.vodata.NewsAddVO; import com.jsl.oa.services.NewsService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.JwtUtil; diff --git a/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java index 8c5ef92..657dee5 100644 --- a/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java @@ -5,10 +5,10 @@ import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.PermissionMapper; -import com.jsl.oa.model.doData.PermissionDO; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.voData.PermissionContentVo; -import com.jsl.oa.model.voData.PermissionEditVO; +import com.jsl.oa.model.dodata.PermissionDO; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.vodata.PermissionContentVo; +import com.jsl.oa.model.vodata.PermissionEditVO; import com.jsl.oa.services.PermissionService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index fe43d11..1396230 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -9,12 +9,12 @@ import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.ProjectMapper; import com.jsl.oa.mapper.RoleMapper; import com.jsl.oa.mapper.UserMapper; -import com.jsl.oa.model.doData.ProjectCuttingDO; -import com.jsl.oa.model.doData.ProjectDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.doData.info.ProjectShowDO; -import com.jsl.oa.model.voData.*; -import com.jsl.oa.model.voData.business.info.ProjectShowVO; +import com.jsl.oa.model.dodata.ProjectCuttingDO; +import com.jsl.oa.model.dodata.ProjectDO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.dodata.info.ProjectShowDO; +import com.jsl.oa.model.vodata.*; +import com.jsl.oa.model.vodata.business.info.ProjectShowVO; import com.jsl.oa.services.ProjectService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java index 5351a5c..260f68c 100644 --- a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java @@ -4,9 +4,9 @@ import com.jsl.oa.annotations.CheckUserHasPermission; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.exception.ClassCopyException; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.voData.RoleAddVo; -import com.jsl.oa.model.voData.RoleEditVO; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.vodata.RoleAddVo; +import com.jsl.oa.model.vodata.RoleEditVO; import com.jsl.oa.services.RoleService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; diff --git a/src/main/java/com/jsl/oa/services/impl/TagServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/TagServiceImpl.java index 9df16d8..622377f 100644 --- a/src/main/java/com/jsl/oa/services/impl/TagServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/TagServiceImpl.java @@ -1,7 +1,7 @@ package com.jsl.oa.services.impl; import com.jsl.oa.dao.TagDAO; -import com.jsl.oa.model.doData.TagProjectDO; +import com.jsl.oa.model.dodata.TagProjectDO; import com.jsl.oa.services.TagService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ResultUtil; 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 2bd7f96..050c9dc 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -5,10 +5,10 @@ import com.jsl.oa.annotations.CheckUserHasPermission; import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; -import com.jsl.oa.model.doData.RoleDO; -import com.jsl.oa.model.doData.RoleUserDO; -import com.jsl.oa.model.doData.UserDO; -import com.jsl.oa.model.voData.*; +import com.jsl.oa.model.dodata.RoleDO; +import com.jsl.oa.model.dodata.RoleUserDO; +import com.jsl.oa.model.dodata.UserDO; +import com.jsl.oa.model.vodata.*; import com.jsl.oa.services.UserService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -30,11 +30,11 @@ import java.util.regex.Pattern; *
* 用户服务实现类，包含用户账号删除、用户账号锁定、用户编辑自己的信息接口 * + * @author xiao_lfeng * @version v1.1.0 * @see UserService * @see UserEditProfileVO * @since v1.0.0 - * @author xiao_lfeng */ @Slf4j @Service @@ -249,7 +249,7 @@ public class UserServiceImpl implements UserService { .setAccountNoLocked(userEditVO.getIsLocked()); //向数据库中修改属性 userDAO.userEdit(userDO); - roleDAO.roleChangeUser(userEditVO.getId(),userEditVO.getRid()); + roleDAO.roleChangeUser(userEditVO.getId(), userEditVO.getRid()); return ResultUtil.success("用户信息修改成功"); } diff --git a/src/main/java/com/jsl/oa/utils/ErrorCode.java b/src/main/java/com/jsl/oa/utils/ErrorCode.java index 58098e2..26ba713 100755 --- a/src/main/java/com/jsl/oa/utils/ErrorCode.java +++ b/src/main/java/com/jsl/oa/utils/ErrorCode.java @@ -8,9 +8,9 @@ import lombok.extern.slf4j.Slf4j; *
* 用于定义错误码 * + * @author xiao_lfeng * @version v1.1.0 * @since v1.0.0 - * @author xiao_lfeng */ @Slf4j @Getter @@ -29,7 +29,7 @@ public enum ErrorCode { TOKEN_EXPIRED("TokenExpired", 40101, "Token已过期"), VERIFICATION_INVALID("VerificationInvalid", 40102, "验证码无效"), TOKEN_NOT_EXIST("TokenNotExist", 40103, "Token不存在"), - CLASS_COPY_EXCEPTION("ClassCopyException",40104,"实体类拷贝异常"), + CLASS_COPY_EXCEPTION("ClassCopyException", 40104, "实体类拷贝异常"), USER_IS_LOCKED("UserIsLocked", 40300, "用户已被锁定"), USER_IS_DEACTIVATED("UserIsDeactivated", 40301, "用户已被禁用"), NOT_ADMIN("NotAdmin", 40302, "不是管理员"), @@ -43,8 +43,8 @@ public enum ErrorCode { ID_NOT_EXIST("IdNotExist", 40400, "ID不存在"), ROLE_NOT_FOUNDED("RoleNotFounded", 40401, "角色不存在"), ROLE_NAME_REPEAT("RoleNameRepeat", 40402, "角色名称重复"), - MESSAGE_ONLY_DELETE_BY_THEMSELVES("MessageOnlyDeleteByThenSelves",40500 ,"用户只能删除自己的消息" ), - PERMISSION_NOT_EXIST("permissionNotExist",40501,"权限不存在"), + MESSAGE_ONLY_DELETE_BY_THEMSELVES("MessageOnlyDeleteByThenSelves", 40500, "用户只能删除自己的消息"), + PERMISSION_NOT_EXIST("permissionNotExist", 40501, "权限不存在"), DATABASE_INSERT_ERROR("DatabaseInsertError", 50010, "数据库插入错误"), DATABASE_UPDATE_ERROR("DatabaseUpdateError", 50011, "数据库更新错误"), DATABASE_DELETE_ERROR("DatabaseDeleteError", 50012, "数据库删除错误"), diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java index c689862..2ce83d2 100755 --- a/src/main/java/com/jsl/oa/utils/Processing.java +++ b/src/main/java/com/jsl/oa/utils/Processing.java @@ -8,10 +8,10 @@ import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.exception.ClassCopyException; import com.jsl.oa.mapper.RoleMapper; -import com.jsl.oa.model.doData.*; -import com.jsl.oa.model.voData.PermissionContentVo; -import com.jsl.oa.model.voData.ProjectSimpleVO; -import com.jsl.oa.model.voData.UserCurrentBackVO; +import com.jsl.oa.model.dodata.*; +import com.jsl.oa.model.vodata.PermissionContentVo; +import com.jsl.oa.model.vodata.ProjectSimpleVO; +import com.jsl.oa.model.vodata.UserCurrentBackVO; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -165,7 +165,7 @@ public class Processing { *
* 该方法用于检查用户是否是管理员，类型封装后字节返回结果 * - * @param request 请求 + * @param request 请求 * @param roleMapper RoleMapper * @return 如果为 true 是管理员，false 不是管理员 */ @@ -181,6 +181,7 @@ public class Processing { /** * 检查用户是否是老师 + * * @param request * @param roleMapper * @return @@ -204,7 +205,7 @@ public class Processing { /** - * @Description: VO类与实体类属性赋值 + * @Description: VO类与实体类属性赋值 * @Date: 2024/1/18 * @Param source: * @Param dest: @@ -230,7 +231,7 @@ public class Processing { Object value = sourceField.get(source); - if(value == null){ + if (value == null) { continue; } @@ -253,18 +254,18 @@ public class Processing { /** - * @Description: 将性别转为字符形式 + * @Description: 将性别转为字符形式 * @Date: 2024/1/18 **/ @Contract(pure = true) - public static @NotNull String getSex(short sex){ - if(sex == 0){ + public static @NotNull String getSex(short sex) { + if (sex == 0) { return "保密"; } - if(sex == 1){ + if (sex == 1) { return "男"; } - if(sex == 2){ + if (sex == 2) { return "女"; } return " "; @@ -284,8 +285,7 @@ public class Processing { RoleUserDO getUserRole = roleDAO.getRoleUserByUid(userDO.getId()); if (getUserRole == null) { getUserRole = new RoleUserDO(); - getUserRole.setRid(0L) - .setCreatedAt(new Timestamp(System.currentTimeMillis())); + getUserRole.setRid(0L).setCreatedAt(new Timestamp(System.currentTimeMillis())); } else { getUserRole.setUid(null); } @@ -299,34 +299,11 @@ public class Processing { // 获取权限列表信息 getPermissionForString = permissionDAO.getPermission(userDO.getId()); } - userCurrent.setUser(new UserCurrentBackVO.ReturnUser() - .setId(userDO.getId()) - .setJobId(userDO.getJobId()) - .setUsername(userDO.getUsername()) - .setAddress(userDO.getAddress()) - .setPhone(userDO.getPhone()) - .setEmail(userDO.getEmail()) - .setAge(userDO.getAge()) - .setSignature(userDO.getSignature()) - .setAvatar(userDO.getAvatar()) - .setNickname(userDO.getNickname()) - .setSex(userDO.getSex()) - .setEnabled(userDO.getEnabled()) - .setAccountNoExpired(userDO.getAccountNoExpired()) - .setCredentialsNoExpired(userDO.getCredentialsNoExpired()) - .setRecommend(userDO.getRecommend()) - .setAccountNoLocked(userDO.getAccountNoLocked()) - .setDescription(userDO.getDescription()) - .setCreatedAt(userDO.getCreatedAt()) - .setUpdatedAt(userDO.getUpdatedAt()) - .setIsDelete(userDO.getIsDelete())) - .setRole(new UserCurrentBackVO.ReturnUserRole() - .setRid(getUserRole.getRid())) - .setPermission(getPermissionForString); + userCurrent.setUser(new UserCurrentBackVO.ReturnUser().setId(userDO.getId()).setJobId(userDO.getJobId()).setUsername(userDO.getUsername()).setAddress(userDO.getAddress()).setPhone(userDO.getPhone()).setEmail(userDO.getEmail()).setAge(userDO.getAge()).setSignature(userDO.getSignature()).setAvatar(userDO.getAvatar()).setNickname(userDO.getNickname()).setSex(userDO.getSex()).setEnabled(userDO.getEnabled()).setAccountNoExpired(userDO.getAccountNoExpired()).setCredentialsNoExpired(userDO.getCredentialsNoExpired()).setRecommend(userDO.getRecommend()).setAccountNoLocked(userDO.getAccountNoLocked()).setDescription(userDO.getDescription()).setCreatedAt(userDO.getCreatedAt()).setUpdatedAt(userDO.getUpdatedAt()).setIsDelete(userDO.getIsDelete())).setRole(new UserCurrentBackVO.ReturnUserRole().setRid(getUserRole.getRid())).setPermission(getPermissionForString); return userCurrent; } - public static List orderUser(List userDOS,String order,String orderBy){ + public static List orderUser(List userDOS, String order, String orderBy) { Comparator comparator = null; @@ -348,8 +325,7 @@ public class Processing { return userDOS; } - public static void projectTosimply(ProjectSimpleVO projectSimpleVO, ProjectDO projectDO, - UserDAO userDAO,ObjectMapper objectMapper) { + public static void projectTosimply(ProjectSimpleVO projectSimpleVO, ProjectDO projectDO, UserDAO userDAO, ObjectMapper objectMapper) { projectSimpleVO.setId(projectDO.getId()); projectSimpleVO.setName(projectDO.getName()); @@ -364,9 +340,9 @@ public class Processing { rootNode = objectMapper.readTree(projectDO.getDescription()); // 访问特定的key JsonNode targetNode = rootNode.get("description"); - if(targetNode != null && !rootNode.isNull()){ + if (targetNode != null && !rootNode.isNull()) { projectSimpleVO.setDescription(targetNode.asText()); - }else{ + } else { projectSimpleVO.setDescription("null"); } } catch (JsonProcessingException ignored) { @@ -377,7 +353,7 @@ public class Processing { } /** - * @Description: 将Permission归纳为父子关系的json形式 + * @Description: 将Permission归纳为父子关系的json形式 * @Date: 2024/1/20 * @Param permissions: 权限实体类 **/ @@ -404,14 +380,14 @@ public class Processing { } /** - * @Description: 封装PermissionContentVo的子类，被convertToVoList方法调用 + * @Description: 封装PermissionContentVo的子类，被convertToVoList方法调用 * @Date: 2024/1/20 * @Param permission: 权限实体类 * @Param childrenMap: 要封装的子类 **/ public static PermissionContentVo convertToVo(PermissionDO permission, Map> childrenMap) { PermissionContentVo vo = new PermissionContentVo(); - copyProperties(permission,vo); + copyProperties(permission, vo); List children = childrenMap.get(permission.getId()); if (children != null) { diff --git a/src/main/java/com/jsl/oa/utils/redis/EmailRedisUtil.java b/src/main/java/com/jsl/oa/utils/redis/EmailRedisUtil.java index 016b2e0..bbbb3c7 100755 --- a/src/main/java/com/jsl/oa/utils/redis/EmailRedisUtil.java +++ b/src/main/java/com/jsl/oa/utils/redis/EmailRedisUtil.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; * @see RedisConfiguration * @see com.jsl.oa.common.constant.RedisConstant * @since v1.1.0 + * @param 泛型 */ @Slf4j @Component diff --git a/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml b/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml index cedd210..bdd6c94 100644 --- a/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml @@ -5,14 +5,14 @@ - select * from organize_oa.oa_project_work where project_id=#{projectId} and type=0 and (principal_id=#{userId} or principal_id is null) - select * from organize_oa.oa_project_work where pid=#{sysId} and type=1 and (principal_id=#{userId} or principal_id is null) diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index e5be938..1295372 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -47,7 +47,7 @@ where id = #{id} - select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and status=1 and @@ -66,7 +66,7 @@ - select * from organize_oa.oa_project where is_delete=false and principal_id =#{userId} and status=1 and is_finish in #{Finish} @@ -75,7 +75,7 @@ - select * from organize_oa.oa_project where (principal_id = #{userId} and is_delete=false) or @@ -97,7 +97,7 @@ - select * from organize_oa.oa_project where (principal_id = #{userId} and is_delete=false) or @@ -108,7 +108,7 @@ - select * from organize_oa.oa_project where (principal_id = #{userId} and is_delete=false) or @@ -116,20 +116,20 @@ id in(select project_id from organize_oa.oa_project_work where is_delete=false and principal_id=#{userId}) - select * from organize_oa.oa_project_work where status=1 and principal_id=#{userId} - select * from organize_oa.oa_project where is_delete=false and status=1 and id=#{id} - select * from organize_oa.oa_project where is_delete=false and status=1 and is_finish in @@ -145,7 +145,7 @@ - select * from organize_oa.oa_project where is_delete=false and status=1 and is_finish in #{Finish}