From c0e2df344e7bac4e4ed3a71c1b0ccaaf39940780 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Mon, 11 Mar 2024 13:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/controllers/ProjectController.java | 4 +++- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 4 ++-- src/main/java/com/jsl/oa/mapper/ProjectMapper.java | 7 ++++--- src/main/java/com/jsl/oa/services/ProjectService.java | 4 +++- .../java/com/jsl/oa/services/impl/ProjectServiceImpl.java | 4 ++-- src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml | 7 +++++++ 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index db50763..d6c8f49 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -17,6 +17,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; @Slf4j @RestController @@ -45,7 +47,7 @@ public class ProjectController { */ @GetMapping("/project/get") public BaseResponse projectGet(@RequestParam(required = false) Integer listAll, - @RequestParam(required = false) String tags, + @RequestParam(required = false) List tags, HttpServletRequest request) { log.info("请求接口[GET]: /project/get"); return projectService.get(listAll,request,tags); diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 5791030..e4650a5 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -105,10 +105,10 @@ public class ProjectDAO { return projectMapper.setProjectShow(setProjectShow); } - public List get(Long userId,Integer listAll,String tags) { + public List get(Long userId,Integer listAll,List tags) { log.info("\t> 执行 DAO 层 ProjectDAO.get 方法"); log.info("\t\t> 从 MySQL 获取数据"); - if(tags != null){ + if(tags != null && !tags.isEmpty()){ return projectMapper.getByTags(tags); } if(listAll == 0) { diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index df16f63..1454402 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -5,6 +5,7 @@ import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.ProjectUserDO; import com.jsl.oa.model.voData.ProjectInfoVO; import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,9 +41,9 @@ public interface ProjectMapper { @Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow}, updated_at = CURRENT_TIMESTAMP WHERE value = 'project_show'") boolean setProjectShow(String setProjectShow); - @Select("select * from organize_oa.oa_project where json_extract(tags,'$.tags')" + - "like concat('%',#{tags},'%')") - ListgetByTags(String tags); + //@Select("select * from organize_oa.oa_project where json_extract(tags,'$.tags')" + + //"like concat('%',#{tags},'%')") + ListgetByTags(List tags); @Select("select * from organize_oa.oa_project where is_delete=false and status =1") List get(Long userId); diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 3f50336..9b3a7c4 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -5,8 +5,10 @@ import com.jsl.oa.model.voData.ProjectCuttingEditVO; import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.model.voData.business.info.ProjectShowVO; import com.jsl.oa.utils.BaseResponse; +import org.apache.catalina.LifecycleState; import javax.servlet.http.HttpServletRequest; +import java.util.List; public interface ProjectService { BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd); @@ -25,7 +27,7 @@ public interface ProjectService { BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id); - BaseResponse get(Integer listAll,HttpServletRequest request,String tags); + BaseResponse get(Integer listAll, HttpServletRequest request, List tags); BaseResponse getByName(String name); 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 7d867d8..0d4acbc 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -184,12 +184,12 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse get(Integer listAll,HttpServletRequest request,String tags) { + public BaseResponse get(Integer listAll,HttpServletRequest request,List tags) { log.info("\t> 执行 Service 层 ProjectService.get 方法"); //获取用户 Long userId= Processing.getAuthHeaderToUserId(request); //根据标签查询 - if(tags != null){ + if(tags != null && !tags.isEmpty()){ List projectDOList = projectDAO.get(userId,listAll,tags); return ResultUtil.success(projectDOList); } diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 5cb5ef4..4b2441f 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -47,4 +47,11 @@ where id = #{id} + + \ No newline at end of file