diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 89a9a58..dcca935 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -31,6 +31,17 @@ public class ProjectController { return projectService.getHeader(id); } + @GetMapping("/project/get") + public BaseResponse projectGet(){ + return projectService.get(); + } + + @GetMapping("/project/header") + public BaseResponse projectGetByName(@RequestParam(required = false) String name) { + log.info("请求接口[GET]: /project/header"); + return projectService.getByName(name); + } + @PostMapping("/project/header/add") public BaseResponse projectAddHeader(@RequestBody @Validated ProjectShowVO projectShowVO, HttpServletRequest request, @NotNull BindingResult bindingResult) { log.info("请求接口[POST]: /project/header/add"); diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 84b2539..69c8bbc 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -3,9 +3,11 @@ package com.jsl.oa.dao; import com.google.gson.Gson; import com.jsl.oa.mapper.ProjectMapper; import com.jsl.oa.model.doData.ProjectCuttingDO; +import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.info.CarouselDO; import com.jsl.oa.model.doData.info.ProjectShowDO; import com.jsl.oa.model.voData.ProjectInfoVO; +import com.jsl.oa.utils.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Component; @@ -86,4 +88,13 @@ public class ProjectDAO { String setProjectShow = gson.toJson(projectShowDO); return projectMapper.setProjectShow(setProjectShow); } + + public List get() { + + return projectMapper.get(); + } + + public BaseResponse getByName(String name) { + return projectMapper.getByName(name); + } } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 70a0846..ae724cb 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -3,6 +3,7 @@ package com.jsl.oa.mapper; import com.jsl.oa.model.doData.ProjectCuttingDO; import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.voData.ProjectInfoVO; +import com.jsl.oa.utils.BaseResponse; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -39,4 +40,10 @@ public interface ProjectMapper { @Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow} WHERE value = 'project_show'") boolean setProjectShow(String setProjectShow); + + @Select("select * from organize_oa.oa_permissions") + List get(); + + @Select("select * from organize_oa.oa_project where name=#{name}") + BaseResponse getByName(String name); } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 0539e63..96479bf 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -23,4 +23,8 @@ public interface ProjectService { BaseResponse delHeader(Integer id, HttpServletRequest request); BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id); + + BaseResponse get(); + + 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 3eaa576..dcac7b6 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -4,6 +4,7 @@ import com.jsl.oa.dao.ProjectDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.RoleMapper; import com.jsl.oa.model.doData.ProjectCuttingDO; +import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.UserDO; import com.jsl.oa.model.doData.info.CarouselDO; import com.jsl.oa.model.doData.info.ProjectShowDO; @@ -162,5 +163,16 @@ public class ProjectServiceImpl implements ProjectService { } } + @Override + public BaseResponse get() { + List projectDOList =projectDAO.get(); + return ResultUtil.success(projectDOList); + } + + @Override + public BaseResponse getByName(String name) { + return projectDAO.getByName(name); + } + }