feat: 代码风格调整

.github/linters/alibaba-checkstyle.xml

@@ -69,14 +69,9 @@
         <module name="UpperEll"/>
 
         <!-- 长度检查 -->
-        <!-- 方法不超过50行 -->
-        <module name="MethodLength">
-            <property name="tokens" value="METHOD_DEF" />
-            <property name="max" value="50" />
-        </module>
         <!-- 方法的参数个数不超过5个。 并且不对构造方法进行检查-->
         <module name="ParameterNumber">
-            <property name="max" value="5" />
+            <property name="max" value="8" />
             <property name="ignoreOverriddenMethods" value="true"/>
             <property name="tokens" value="METHOD_DEF" />
         </module>

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.dodata.ConfigDO;
-import com.jsl.oa.model.voData.business.InfoAboutSecurityKey;
+import com.jsl.oa.model.vodata.business.InfoAboutSecurityKey;
 import com.jsl.oa.utils.Processing;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.SmartInitializingSingleton;

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.doData.UserDO;
+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));
+                        RoleUserDO roleUserDO = roleDAO.roleMapper
-                        if (roleUserDO != null) {
+                                .getRoleUserByUid(Processing.getAuthHeaderToUserId(request));
-                            RoleDO roleDO = roleDAO.roleMapper.getRoleByRoleName("admin");
+                        if (roleUserDO == null) {
-                            if (roleUserDO.getRid().equals(roleDO.getId())) {
-                                return pjp.proceed();
-                            } else {
-                                return ResultUtil.error(ErrorCode.NOT_PERMISSION);
-                            }
-                        } else {
                             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);

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.*.*(..)) " +
+    @Around("execution(* com.jsl.oa.controllers.*.*(..)) "
-            "&& !execution(* com.jsl.oa.controllers.AuthController.authSendEmailCode(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.AuthController.authSendEmailCode(..))"
-            "&& !execution(* com.jsl.oa.controllers.AuthController.authLoginByEmail(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.AuthController.authLoginByEmail(..))"
-            "&& !execution(* com.jsl.oa.controllers.AuthController.authForgetPassword(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.AuthController.authForgetPassword(..))"
-            "&& !execution(* com.jsl.oa.controllers.AuthController.authLogin(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.AuthController.authLogin(..))"
-            "&& !execution(* com.jsl.oa.controllers.AuthController.authRegister(..)) " +
+            + "&& !execution(* com.jsl.oa.controllers.AuthController.authRegister(..)) "
-            "&& !execution(* com.jsl.oa.controllers.IndexController.*(..)) " +
+            + "&& !execution(* com.jsl.oa.controllers.IndexController.*(..)) "
-            "&& !execution(* com.jsl.oa.controllers.CustomController.*(..)) " +
+            + "&& !execution(* com.jsl.oa.controllers.CustomController.*(..)) "
-            "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderImage(..)) " +
+            + "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderImage(..)) "
-            "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderUser(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.InfoController.infoGetHeaderUser(..))"
-            "&& !execution(* com.jsl.oa.controllers.ProjectController.*(..))" +
+            + "&& !execution(* com.jsl.oa.controllers.ProjectController.*(..))"
-            "&& !execution(* com.jsl.oa.controllers.TagController.*(..))")
+            + "&& !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;
     }
 }

src/main/java/com/jsl/oa/config/filter/CorsFilter.java

@@ -14,20 +14,36 @@ import javax.servlet.http.HttpServletResponse;
  * <hr/>
  * 用于处理跨域请求
  *
- * @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 req   servlet请求
-     * @param res  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", "*");
-    }
-
 }

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;

src/main/java/com/jsl/oa/config/redis/RedisOperating.java

@@ -89,4 +89,4 @@ public abstract class RedisOperating<R> {
             return null;
         }
     }
-}
+}

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.UserChangePasswordVO;
-import com.jsl.oa.model.voData.UserForgetPasswordVO;
+import com.jsl.oa.model.vodata.UserForgetPasswordVO;
-import com.jsl.oa.model.voData.UserLoginVO;
+import com.jsl.oa.model.vodata.UserLoginVO;
-import com.jsl.oa.model.voData.UserRegisterVO;
+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()) {

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 carouselVO    图片信息
-     * @param request    请求对象
+     * @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 carouselVO    图片信息
-     * @param request    请求对象
+     * @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 order   排序方式
-     * @param orderBy    排序字段
+     * @param orderBy 排序字段
-     * @param request     请求对象
+     * @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);
     }
 }

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 request  请求对象
-     * @param begin 开始日期
+     * @param begin    开始日期
-     * @param end 结束日期
+     * @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 request  请求对象
-     * @param begin 开始日期
+     * @param begin    开始日期
-     * @param end 结束日期
+     * @param end      结束日期
-     * @param uid 用户id
+     * @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);
+        }
     }
 
 }

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;
  * <hr/>
  * 新闻控制器，包含新闻添加接口
  *
+ * @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 {
      * <hr/>
      * 新闻添加接口，接收新闻添加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()) {

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;

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.ProjectCuttingAddVO;
-import com.jsl.oa.model.voData.ProjectCuttingEditVO;
+import com.jsl.oa.model.vodata.ProjectCuttingEditVO;
-import com.jsl.oa.model.voData.ProjectEditVO;
+import com.jsl.oa.model.vodata.ProjectEditVO;
-import com.jsl.oa.model.voData.ProjectWorkVO;
+import com.jsl.oa.model.vodata.ProjectWorkVO;
-import com.jsl.oa.model.voData.business.info.ProjectShowVO;
+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;

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.RoleAddVo;
-import com.jsl.oa.model.voData.RoleEditVO;
+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;
  * <hr/>
  * 角色控制器，包含角色获取接口
  *
+ * @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 {
      * <hr/>
      * 角色编辑接口
      *
-     * @param request 请求
+     * @param request       请求
-     * @param roleEditVO 角色编辑VO
+     * @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 {
     }
 
 
-
-
-
-
 }

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.UserAddVO;
-import com.jsl.oa.model.voData.UserAllCurrentVO;
+import com.jsl.oa.model.vodata.UserAllCurrentVO;
-import com.jsl.oa.model.voData.UserEditProfileVO;
+import com.jsl.oa.model.vodata.UserEditProfileVO;
-import com.jsl.oa.model.voData.UserEditVO;
+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;

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);
                     }
                 }

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;

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;

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.ProjectCuttingDO;
-import com.jsl.oa.model.doData.ProjectDO;
+import com.jsl.oa.model.dodata.ProjectDO;
-import com.jsl.oa.model.doData.ProjectUserDO;
+import com.jsl.oa.model.dodata.ProjectUserDO;
-import com.jsl.oa.model.doData.ProjectWorkDO;
+import com.jsl.oa.model.dodata.ProjectWorkDO;
-import com.jsl.oa.model.doData.info.ProjectShowDO;
+import com.jsl.oa.model.dodata.info.ProjectShowDO;
-import com.jsl.oa.model.voData.ProjectEditVO;
+import com.jsl.oa.model.vodata.ProjectEditVO;
-import com.jsl.oa.model.voData.ProjectInfoVO;
+import com.jsl.oa.model.vodata.ProjectInfoVO;
-import com.jsl.oa.model.voData.ProjectWorkVO;
+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<ProjectDO> get(Long userId,Integer listAll,List<String> tags,List<Integer> isFinish) {
+    public List<ProjectDO> get(Long userId, Integer listAll, List<String> tags, List<Integer> 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<ProjectDO> workget(Long userId, Integer listAll, List<String> tags, List<Integer> isFinish, Integer is) {
         log.info("\t> 执行 DAO 层 ProjectDAO.workget 方法");
         log.info("\t\t> 从 MySQL 获取数据");
-        if(tags != null && !tags.isEmpty()){
+        if (tags != null && !tags.isEmpty()) {
-            return projectMapper.workgetByTags(userId,tags,is,isFinish);
+            return projectMapper.workgetByTags(userId, tags, is, isFinish);
         }
 
-        if(isFinish != null && !isFinish.isEmpty()){
+        if (isFinish != null && !isFinish.isEmpty()) {
-            return projectMapper.workgetByIsfinish(userId,isFinish,is);
+            return projectMapper.workgetByIsfinish(userId, isFinish, is);
         }
 
-        if(listAll == 0) {
+        if (listAll == 0) {
-            return projectMapper.workget(userId,is);
+            return projectMapper.workget(userId, is);
-        }else {
+        } else {
-            return projectMapper.workget1(userId,is);
+            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);
+        ProjectUserDO projectUserDO = projectMapper.getProjectUserByPidAndUid(pid, oldUid);
-        if(projectUserDO == null){
+        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<ProjectDO> tget(Integer id,List<Integer> isFinish,List<String> tags) {
+    public List<ProjectDO> tget(Integer id, List<Integer> isFinish, List<String> tags) {
         log.info("DAO层tget");
 
-        if(tags != null && !tags.isEmpty()){
+        if (tags != null && !tags.isEmpty()) {
-            return projectMapper.tgetBytags(tags,isFinish);
+            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);
     }
 

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+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<RoleDO> roleList = gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {}.getType());
+            List<RoleDO> roleList = gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
+            }.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<List<RoleDO>>() {}.getType());
+            return gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
+            }.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());

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;

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.doData.UserDO;
+import com.jsl.oa.model.dodata.UserDO;
-import com.jsl.oa.model.voData.UserAllCurrentVO;
+import com.jsl.oa.model.vodata.UserAllCurrentVO;
-import com.jsl.oa.model.voData.UserCurrentBackVO;
+import com.jsl.oa.model.vodata.UserCurrentBackVO;
-import com.jsl.oa.model.voData.UserEditProfileVO;
+import com.jsl.oa.model.vodata.UserEditProfileVO;
 import com.jsl.oa.utils.Processing;
 import com.jsl.oa.utils.redis.UserRedisUtil;
 import lombok.RequiredArgsConstructor;

src/main/java/com/jsl/oa/exception/ProcessException.java

@@ -19,8 +19,8 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep
  * <hr/>
  * 用于处理异常
  *
+ * @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<BaseResponse> businessMissingServletRequestParameterException(MissingServletRequestParameterException e) {
         log.error(e.getMessage(), e);

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 {

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 " +
+    @Update("UPDATE organize_oa.oa_message "
-            "SET `read` = 1, deleted_at = CURRENT_TIMESTAMP " +
+            + "SET `read` = 1, deleted_at = CURRENT_TIMESTAMP "
-            "WHERE id = #{mid}")
+            + "WHERE id = #{mid}")
     boolean deleteMessage(Long mid);
 
     @Select("SELECT * FROM organize_oa.oa_message where id = #{mid}")

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<ProjectWorkDO> getByProjectId(Integer projectId, Long userId,int is);
 
-    //@Select("select * from organize_oa.oa_project_work where pid=#{sysId} and type=1")
     List<ProjectWorkDO> 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<ProjectWorkDO> getAllMoudleByPid(Long id);
 
-    @Select("select principal_id from organize_oa.oa_project where id=(select project_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})")
+            + "from organize_oa.oa_project_work where oa_project_work.id = #{sysId})")
     Long getPridBySysyid(Integer sysId);
 }

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<NewsDO> selectNewsByStatus( Integer status);
+    List<NewsDO> selectNewsByStatus(Integer status);
 
-    @Insert("INSERT INTO organize_oa.oa_news(title, content, tags, status) " +
+    @Insert("INSERT INTO organize_oa.oa_news(title, content, tags, status) "
-            "VALUES(#{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}, " +
+    @Update("UPDATE organize_oa.oa_news SET title = #{title}, content = #{content}, tags = #{tags}, "
-            "likes = #{likes}, comments = #{comments}, status = #{status}, update_at = CURRENT_TIMESTAMP " +
+            + "likes = #{likes}, comments = #{comments}, status = #{status}, update_at = CURRENT_TIMESTAMP "
-            "WHERE id = #{id}")
+            + "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)"+
+    @Insert("INSERT INTO organize_oa.oa_news_user(uid,nid)"
-            "VALUES(#{uid}, #{nid})")
+            + "VALUES(#{uid}, #{nid})")
-    void addNewsUser(Long uid,Long nid);
+    void addNewsUser(Long uid, Long nid);
 
 }

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.PermissionDO;
-import com.jsl.oa.model.doData.RolePermissionDO;
+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<PermissionDO> permissionUserPid(Long uid);
 
     @Select("SELECT * FROM organize_oa.oa_permissions where id=#{id}")

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.ProjectCuttingDO;
-import com.jsl.oa.model.doData.ProjectDO;
+import com.jsl.oa.model.dodata.ProjectDO;
-import com.jsl.oa.model.doData.ProjectUserDO;
+import com.jsl.oa.model.dodata.ProjectUserDO;
-import com.jsl.oa.model.doData.ProjectWorkDO;
+import com.jsl.oa.model.dodata.ProjectWorkDO;
-import com.jsl.oa.model.voData.ProjectInfoVO;
+import com.jsl.oa.model.vodata.ProjectInfoVO;
-import com.jsl.oa.model.voData.ProjectWorkSimpleVO;
+import com.jsl.oa.model.vodata.ProjectWorkSimpleVO;
-import com.jsl.oa.model.voData.ProjectWorkVO;
+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;

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;

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;
 

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.doData.UserDO;
+import com.jsl.oa.model.dodata.UserDO;
-import com.jsl.oa.model.voData.PrincipalSelectVO;
+import com.jsl.oa.model.vodata.PrincipalSelectVO;
-import com.jsl.oa.model.voData.UserAllCurrentVO;
+import com.jsl.oa.model.vodata.UserAllCurrentVO;
-import com.jsl.oa.model.voData.UserEditProfileVO;
+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;

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;

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;

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;

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;

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;

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)

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;

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;

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;

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;
-}
+}

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;

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;

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;

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;
 

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;

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;

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<com.jsl.oa.model.doData.info.ProjectShowDO.DataDO> data;
+    private List<com.jsl.oa.model.dodata.info.ProjectShowDO.DataDO> data;
 
     @Data
     @Accessors(chain = true)
@@ -22,4 +22,4 @@ public class ProjectShowDO {
         private String updatedAt;
         private String author;
     }
-}
+}

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;

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;
 

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;
 

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;
 

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;
 

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;

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

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;
 

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;

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;

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;

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;

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;
 

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;
 

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.dodata.ConfigDO;
-import com.jsl.oa.model.voData.business.InfoAboutSecurityKey;
+import com.jsl.oa.model.vodata.business.InfoAboutSecurityKey;
 import com.jsl.oa.utils.Processing;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;

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.UserChangePasswordVO;
-import com.jsl.oa.model.voData.UserForgetPasswordVO;
+import com.jsl.oa.model.vodata.UserForgetPasswordVO;
-import com.jsl.oa.model.voData.UserLoginVO;
+import com.jsl.oa.model.vodata.UserLoginVO;
-import com.jsl.oa.model.voData.UserRegisterVO;
+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);
 
     /**
      * <h2>用户登出</h2>

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;

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
+    );
 }

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;
 

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;

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;

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.*;
-import com.jsl.oa.model.voData.business.info.ProjectShowVO;
+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<String> tags, List<Integer> isFinish,Integer page,Integer pageSize);
+    BaseResponse tget(Integer id, List<String> tags, List<Integer> isFinish, Integer page, Integer pageSize);
 
     BaseResponse projectFileGet(HttpServletRequest request, Long projectId);
 

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.RoleAddVo;
-import com.jsl.oa.model.voData.RoleEditVO;
+import com.jsl.oa.model.vodata.RoleEditVO;
 import com.jsl.oa.utils.BaseResponse;
 
 import javax.servlet.http.HttpServletRequest;

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.dodata.UserDO;
-import com.jsl.oa.model.voData.UserAddVO;
+import com.jsl.oa.model.vodata.UserAddVO;
-import com.jsl.oa.model.voData.UserAllCurrentVO;
+import com.jsl.oa.model.vodata.UserAllCurrentVO;
-import com.jsl.oa.model.voData.UserEditProfileVO;
+import com.jsl.oa.model.vodata.UserEditProfileVO;
-import com.jsl.oa.model.voData.UserEditVO;
+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);
 
     /**
      * <h2>账号锁定</h2>
@@ -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);
 
     /**
      * <h2>用户编辑自己的信息</h2>

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.RoleUserDO;
-import com.jsl.oa.model.doData.UserDO;
+import com.jsl.oa.model.dodata.UserDO;
-import com.jsl.oa.model.voData.*;
+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);

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.UserDO;
-import com.jsl.oa.model.doData.info.CarouselDO;
+import com.jsl.oa.model.dodata.info.CarouselDO;
-import com.jsl.oa.model.voData.UserProfileVo;
+import com.jsl.oa.model.vodata.UserProfileVo;
-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;
@@ -28,9 +28,9 @@ import java.util.List;
  * <hr/>
  * 用于信息服务层的实现类
  *
- * @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);
         }
         //获取用户信息

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.MessageDO;
-import com.jsl.oa.model.doData.PageBeanDO;
+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);

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.ProjectWorkDO;
+import com.jsl.oa.model.vodata.ProjectWorkAndNameVO;
-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.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<ProjectWorkAndNameVO> 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())

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.dodata.NewsDO;
-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.JwtUtil;

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.PermissionDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.voData.PermissionContentVo;
+import com.jsl.oa.model.vodata.PermissionContentVo;
-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;

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.ProjectCuttingDO;
-import com.jsl.oa.model.doData.ProjectDO;
+import com.jsl.oa.model.dodata.ProjectDO;
-import com.jsl.oa.model.doData.UserDO;
+import com.jsl.oa.model.dodata.UserDO;
-import com.jsl.oa.model.doData.info.ProjectShowDO;
+import com.jsl.oa.model.dodata.info.ProjectShowDO;
-import com.jsl.oa.model.voData.*;
+import com.jsl.oa.model.vodata.*;
-import com.jsl.oa.model.voData.business.info.ProjectShowVO;
+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;

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.dodata.RoleDO;
-import com.jsl.oa.model.voData.RoleAddVo;
+import com.jsl.oa.model.vodata.RoleAddVo;
-import com.jsl.oa.model.voData.RoleEditVO;
+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;

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;

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.RoleDO;
-import com.jsl.oa.model.doData.RoleUserDO;
+import com.jsl.oa.model.dodata.RoleUserDO;
-import com.jsl.oa.model.doData.UserDO;
+import com.jsl.oa.model.dodata.UserDO;
-import com.jsl.oa.model.voData.*;
+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;
  * <hr/>
  * 用户服务实现类，包含用户账号删除、用户账号锁定、用户编辑自己的信息接口
  *
+ * @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("用户信息修改成功");
     }