From 05ccc3fdd8dd2293db3c0d89f210d8c71d8feb77 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sun, 14 Apr 2024 14:52:33 +0800 Subject: [PATCH] =?UTF-8?q?patch:=20=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 拼写错误 - 未引入部分删除 --- .../jsl/oa/controllers/ProjectController.java | 8 +++++--- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 4 ++-- .../java/com/jsl/oa/mapper/ReviewMapper.java | 5 +++-- .../com/jsl/oa/services/ProjectService.java | 12 ++++++------ .../oa/services/impl/ProjectServiceImpl.java | 19 +++++++------------ 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 13c3f23..11c8ec6 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -1,4 +1,5 @@ package com.jsl.oa.controllers; + import com.jsl.oa.model.vodata.ProjectEditVO; import com.jsl.oa.model.vodata.ProjectInfoVO; import com.jsl.oa.model.vodata.ProjectWorkVO; @@ -14,6 +15,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -80,7 +82,7 @@ public class ProjectController { @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer pageSize) { log.info("请求接口[GET]: /project/get/custom"); - return projectService.tget(tags, isFinish, page, pageSize); + return projectService.tGet(tags, isFinish, page, pageSize); } /** @@ -113,7 +115,7 @@ public class ProjectController { @RequestParam(required = false, defaultValue = "10") Integer pageSize, HttpServletRequest request) { log.info("请求接口[GET]: /project/work/get"); - return projectService.workget(request, tags, isFinish, is, page, pageSize); + return projectService.workGet(request, tags, isFinish, is, page, pageSize); } /** @@ -189,7 +191,7 @@ public class ProjectController { if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult)); } - return projectService.projecWorktAdd(request, projectWorkVO); + return projectService.projectWorkAdd(request, projectWorkVO); } diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 5f55995..6ffe0d0 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -35,7 +35,7 @@ public class ProjectDAO { } public void projectWorkAdd(ProjectWorkVO projectWorkVO) { - log.info("\t> 执行 DAO 层 ProjectDAO.projecWorktAdd 方法"); + log.info("\t> 执行 DAO 层 ProjectDAO.projectWorkAdd 方法"); log.info("\t\t> 从 MySQL 获取数据"); projectMapper.projectWorkAdd(projectWorkVO); } @@ -133,7 +133,7 @@ public class ProjectDAO { } public List workget(Long userId, List tags, List isFinish, Integer is) { - log.info("\t> 执行 DAO 层 ProjectDAO.workget 方法"); + log.info("\t> 执行 DAO 层 ProjectDAO.workGet 方法"); log.info("\t\t> 从 MySQL 获取数据"); if (tags != null && !tags.isEmpty()) { return projectMapper.workgetByTags(userId, tags, is, isFinish); diff --git a/src/main/java/com/jsl/oa/mapper/ReviewMapper.java b/src/main/java/com/jsl/oa/mapper/ReviewMapper.java index ea2613e..6aa89fb 100644 --- a/src/main/java/com/jsl/oa/mapper/ReviewMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ReviewMapper.java @@ -1,14 +1,15 @@ package com.jsl.oa.mapper; import com.jsl.oa.model.dodata.ReviewDO; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @Mapper public interface ReviewMapper { - @Select("SELECT * FROM organize_oa.oa_review WHERE project_id = #{projectId}" + @Select("SELECT * FROM organize_oa.oa_review WHERE project_id = #{projectId} " + "AND is_delete = 0") List selectAllReviewFromProject(Long projectId); diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 9753e00..2e67be1 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -1,6 +1,8 @@ package com.jsl.oa.services; -import com.jsl.oa.model.vodata.*; +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.vodata.business.info.ProjectShowVO; import com.jsl.oa.utils.BaseResponse; @@ -32,9 +34,7 @@ public interface ProjectService { BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectVO); - BaseResponse projectToOtherUserForCutting(HttpServletRequest request, Long oldUid, Long pid, Long newUid); - - BaseResponse workget( + BaseResponse workGet( HttpServletRequest request, List tags, List isFinish, @@ -42,9 +42,9 @@ public interface ProjectService { Integer page, Integer pageSize); - BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); + BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); - BaseResponse tget(List tags, List isFinish, Integer page, Integer pageSize); + BaseResponse tGet(List tags, List isFinish, Integer page, Integer pageSize); BaseResponse projectFileGet(HttpServletRequest request, Long projectId); 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 4a46276..48d6726 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -1,4 +1,5 @@ package com.jsl.oa.services.impl; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -13,7 +14,6 @@ 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.MessageService; import com.jsl.oa.services.ProjectService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -23,6 +23,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; + import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.ArrayList; @@ -50,7 +51,6 @@ public class ProjectServiceImpl implements ProjectService { private final UserDAO userDAO; private final ObjectMapper objectMapper; private final RoleDAO roleDAO; - private final MessageService messageService; @Override public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) { @@ -80,12 +80,7 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse projectToOtherUserForCutting(HttpServletRequest request, Long oldUid, Long pid, Long newUid) { - return null; - } - - @Override - public BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) { + public BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) { log.info("\t> 执行 Service 层 ProjectService.projectWorkAdd 方法"); //获取用户id Long userId = Processing.getAuthHeaderToUserId(request); @@ -110,8 +105,8 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse tget(List tags, List isFinish, Integer page, Integer pageSize) { - log.info("\t> 执行 Service 层 ProjectService.tget 方法"); + public BaseResponse tGet(List tags, List isFinish, Integer page, Integer pageSize) { + log.info("\t> 执行 Service 层 ProjectService.tGet 方法"); List projectDOList = projectDAO.tget(isFinish, tags); @@ -350,7 +345,7 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse workget( + public BaseResponse workGet( HttpServletRequest request, List tags, List isFinish, @@ -358,7 +353,7 @@ public class ProjectServiceImpl implements ProjectService { Integer page, Integer pageSize ) { - log.info("\t> 执行 Service 层 ProjectService.workget 方法"); + log.info("\t> 执行 Service 层 ProjectService.workGet 方法"); //获取用户 Long userId = Processing.getAuthHeaderToUserId(request);