diff --git a/job/job-api/src/main/java/cn/axzo/nanopart/api/JobApi.java b/job/job-api/src/main/java/cn/axzo/nanopart/api/JobApi.java index 691bee87..b364fdd7 100644 --- a/job/job-api/src/main/java/cn/axzo/nanopart/api/JobApi.java +++ b/job/job-api/src/main/java/cn/axzo/nanopart/api/JobApi.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*; import cn.axzo.framework.domain.web.result.ApiResult; import javax.validation.Valid; +import java.util.List; /** * @author wangsiqian @@ -61,4 +62,16 @@ public interface JobApi { */ @PostMapping("/api/v1/jobs/{id}") ApiResult updateJobById(@PathVariable("id") Long id, @Validated @RequestBody UpdateJobReq req); + + /** + * 官网获取职位列表 + */ + @GetMapping("/webApi/jobs/all") + ApiResult> listAllJobs(); + + /** + * 官网获取职位详情 + */ + @GetMapping("/webApi/jobs/detail") + ApiResult getJobDetailById(@RequestParam("id") Long id); } diff --git a/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobController.java b/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobController.java index a10f82ad..177ae8fb 100644 --- a/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobController.java +++ b/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobController.java @@ -13,7 +13,6 @@ import cn.axzo.nanopart.server.dto.CreateJobDto; import cn.axzo.nanopart.server.dto.ListJobsDto; import cn.axzo.nanopart.server.dto.UpdateJobDto; import cn.axzo.nanopart.server.service.JobService; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -56,4 +55,14 @@ public class JobController implements JobApi { jobService.updateJobById(dto); return ApiResult.ok(); } + + @Override + public ApiResult> listAllJobs() { + return ApiResult.ok(jobService.listAllJobs()); + } + + @Override + public ApiResult getJobDetailById(Long id) { + return ApiResult.ok(jobService.getJobByIdForUser(id)); + } } diff --git a/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobExternalController.java b/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobExternalController.java deleted file mode 100644 index e2049951..00000000 --- a/job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobExternalController.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.axzo.nanopart.server.controller; - -import cn.axzo.framework.domain.web.result.ApiResult; -import cn.axzo.nanopart.api.response.JobDetailResp; -import cn.axzo.nanopart.api.response.JobResp; -import cn.axzo.nanopart.server.dto.ListJobsDto; -import cn.axzo.nanopart.server.service.JobService; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wangsiqian - * @since 2024/02/21 - */ -@Slf4j -@RestController -@RequestMapping("/webApi/jobs") -@RequiredArgsConstructor -public class JobExternalController { - private final JobService jobService; - - /** - * 官网获取职位列表 - */ - @GetMapping("/all") - public ApiResult> listJobsForUser() { - return ApiResult.ok(jobService.listAllJobs()); - } - - /** - * 官网获取职位详情 - */ - @GetMapping("/detail") - public ApiResult getJobById(@RequestParam("id") Long id) { - return ApiResult.ok(jobService.getJobByIdForUser(id)); - } -}