wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/FIX-1855' into 'master'

Browse Source 
hotfix/FIX-1855: 规范化controller

See merge request universal/infrastructure/backend/nanopart!7
This commit is contained in:
金海洋 2024-03-07 10:16:50 +00:00
commit d7c9100f8d
3 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
job/job-api/src/main/java/cn/axzo/nanopart/api/JobApi.java
View File

@ -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);
}

11
job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobController.java
View File

@ -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));
}
}

41
job/job-server/src/main/java/cn/axzo/nanopart/server/controller/JobExternalController.java
View File

@ -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));
}
}