From e0055f4a6cce66776f6a7894a31373f28626aa7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E8=B0=A6?= <wangsiqian@axzo.cn>
Date: Sat, 2 Mar 2024 17:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/nanopart/api/JobApi.java     | 13 ++++++
 .../server/controller/JobController.java      | 11 ++++-
 .../controller/JobExternalController.java     | 41 -------------------
 3 files changed, 23 insertions(+), 42 deletions(-)
 delete mode 100644 job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobExternalController.java

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<Void> updateJobById(@PathVariable("id") Long id, @Validated @RequestBody UpdateJobReq req);
+
+    /**
+     * 官网获取职位列表
+     */
+    @GetMapping("/webApi/jobs/all")
+    ApiResult<List<JobResp>> listAllJobs();
+
+    /**
+     * 官网获取职位详情
+     */
+    @GetMapping("/webApi/jobs/detail")
+    ApiResult<JobDetailResp> 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<List<JobResp>> listAllJobs() {
+        return ApiResult.ok(jobService.listAllJobs());
+    }
+
+    @Override
+    public ApiResult<JobDetailResp> 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<List<JobResp>> listJobsForUser() {
-        return ApiResult.ok(jobService.listAllJobs());
-    }
-
-    /**
-     * 官网获取职位详情
-     */
-    @GetMapping("/detail")
-    public ApiResult<JobDetailResp> getJobById(@RequestParam("id") Long id) {
-        return ApiResult.ok(jobService.getJobByIdForUser(id));
-    }
-}