From 6e4f22170d78490cb4fedb2e158abb1c1dbcc27b Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Mon, 11 Mar 2024 22:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsl/oa/aspect/AuthControllerAspect.java | 2 +- .../com/jsl/oa/config/shiro/ShiroConfiguration.java | 2 ++ .../com/jsl/oa/controllers/ProjectController.java | 13 ++++++++++++- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 6 +++++- src/main/java/com/jsl/oa/mapper/ProjectMapper.java | 9 +++++---- .../java/com/jsl/oa/services/ProjectService.java | 2 ++ .../jsl/oa/services/impl/ProjectServiceImpl.java | 7 +++++++ .../resources/com/jsl/oa/mapper/ProjectMapper.xml | 6 ++++++ 8 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java b/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java index b5530e0..0d0d33b 100755 --- a/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java +++ b/src/main/java/com/jsl/oa/aspect/AuthControllerAspect.java @@ -76,7 +76,7 @@ public class AuthControllerAspect { "&& !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.projectGet(..))") + "&& !execution(* com.jsl.oa.controllers.ProjectController.projectGetCustom(..))") public Object tokenControllerAround(ProceedingJoinPoint pjp) throws Throwable { // 获取 HttpServletRequest 对象 HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); diff --git a/src/main/java/com/jsl/oa/config/shiro/ShiroConfiguration.java b/src/main/java/com/jsl/oa/config/shiro/ShiroConfiguration.java index 3faed43..c23b655 100755 --- a/src/main/java/com/jsl/oa/config/shiro/ShiroConfiguration.java +++ b/src/main/java/com/jsl/oa/config/shiro/ShiroConfiguration.java @@ -63,7 +63,9 @@ public class ShiroConfiguration { filterChainDefinitionMap.put("/info/header-user/get", "anon"); // 信息接口允许匿名访问 filterChainDefinitionMap.put("/project/header/get", "anon"); // 信息接口允许匿名访问 filterChainDefinitionMap.put("/project/get", "anon"); // 信息接口允许匿名访问 + filterChainDefinitionMap.put("/project/get/custom", "anon"); // 游客获取项目允许匿名访问 filterChainDefinitionMap.put("/**/**", "authc"); // 其他接口一律拦截(需要Token) + return filterChainDefinitionMap; } } diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index d60f3b5..f738fa2 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -42,7 +42,18 @@ public class ProjectController { } /** - * 全部项目的信息获取(打开项目页) + * 游客获取项目 + * @return + */ + @GetMapping("/project/get/custom") + public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id){ + log.info("请求接口[GET]: /project/all/get"); + return projectService.tget(id); + } + + + /** + * 我负责的界面的获取项目 * * @return */ diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 8a1afe1..eaf1743 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -9,6 +9,7 @@ import com.jsl.oa.model.doData.ProjectWorkDO; import com.jsl.oa.model.doData.info.ProjectShowDO; import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.model.voData.ProjectWorkVO; +import com.jsl.oa.utils.BaseResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -198,5 +199,8 @@ public class ProjectDAO { } - + public List tget(Integer id) { + log.info("DAO层"); + return projectMapper.tget(id); + } } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index adde849..723c22f 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -50,15 +50,15 @@ public interface ProjectMapper { //@Select("select * from organize_oa.oa_project where json_extract(tags,'$.tags')" + //"like concat('%',#{tags},'%')") - @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false") + @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false and principal_id=#{userId}") ListgetByIsfinish(Long userId,Integer isFinish); ListgetByTags(Long userId,List tags); - @Select("select * from organize_oa.oa_project where is_delete=false and status=1") + @Select("select * from organize_oa.oa_project where is_delete=false and status=1 and principal_id=#{userId}") List get(Long userId); - @Select("select * from organize_oa.oa_project where status =1 and is_delete =true") + @Select("select * from organize_oa.oa_project where status =1 and is_delete =true and principal_id=#{userId}") List get1(Long userId); @Select("select * from organize_oa.oa_project where name=#{name}") @@ -96,5 +96,6 @@ public interface ProjectMapper { @Select("select * from organize_oa.oa_project_work where is_delete =true and status=1 and principal_id=#{userId}") List workget1(Long userId); - + //@Select("select * from organize_oa.oa_project where is_delete=false and status=1") + List tget(Integer id); } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index ab605a4..0f270fe 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -42,4 +42,6 @@ public interface ProjectService { BaseResponse workget(Integer listAll, HttpServletRequest request, List tags, Integer isFinish); BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); + + BaseResponse tget(Integer id); } 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 7d62050..ed732f2 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -64,6 +64,13 @@ public class ProjectServiceImpl implements ProjectService { return ResultUtil.success("添加成功"); } + @Override + public BaseResponse tget(Integer id) { + log.info("\t> 执行 Service 层 ProjectService.tget 方法"); + List projectDOList = projectDAO.tget(id); + return ResultUtil.success(projectDOList); + } + @Override @CheckUserHasPermission("project.edit") public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectInfoVO projectEdit) { diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index f9a9685..cc1e00c 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -64,5 +64,11 @@ #{tag} + \ No newline at end of file