diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AflManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AflManagerController.java index c5ece23d..7a4b4587 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AflManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AflManagerController.java @@ -131,19 +131,19 @@ public class AflManagerController { } - @PostMapping(path="/findAflPlotInfo") - public CommonResult findAflPlotInfo(@RequestBody @Valid AflManagerReq req) throws SftpUploadUtil.SftpUploadException { + @PostMapping(path="/findAflPlotInfoNow") + public CommonResult findAflPlotInfoNow(@RequestBody @Valid AflManagerReq req) throws SftpUploadUtil.SftpUploadException { - AflPlotInfoResp resp = aflPlotInfoService.findAflPlotInfo(req); + AflPlotInfoResp resp = aflPlotInfoService.findAflPlotInfoNow(req); return CommonResult.success(resp); } - @PostMapping(path="/findAflPlotInfoList") - public CommonResult> findAflPlotInfoList(@RequestBody @Valid AflManagerReq req){ + @PostMapping(path="/findAflPlotInfoListByHistory") + public CommonResult> findAflPlotInfoListByHistory(@RequestBody @Valid AflManagerReq req){ - List respList = aflPlotInfoService.findAflPlotInfoList(req); + List respList = aflPlotInfoService.findAflPlotInfoListByHistory(req); return CommonResult.success(respList); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/AflPlotInfoService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/AflPlotInfoService.java index a5b7f1b7..eb352786 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/AflPlotInfoService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/AflPlotInfoService.java @@ -20,9 +20,9 @@ public interface AflPlotInfoService extends IService { String saveAflPlotInfo(@Valid AflManagerReq req) throws SftpUploadUtil.SftpUploadException; - AflPlotInfoResp findAflPlotInfo(@Valid AflManagerReq req) throws SftpUploadUtil.SftpUploadException; + AflPlotInfoResp findAflPlotInfoNow(@Valid AflManagerReq req) throws SftpUploadUtil.SftpUploadException; - List findAflPlotInfoList(@Valid AflManagerReq req); + List findAflPlotInfoListByHistory(@Valid AflManagerReq req); void updateHistoryPipelineIdByAflPlotInfo(@Valid AflManagerReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java index 059c2c14..ec18a6e9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/aflManager/impl/AflPlotInfoServiceImpl.java @@ -110,7 +110,7 @@ public class AflPlotInfoServiceImpl extends ServiceImpl findAflPlotInfoList(AflManagerReq req) { + public List findAflPlotInfoListByHistory(AflManagerReq req) { QueryWrapper wrapper = new QueryWrapper<>(); if (!ObjectUtils.isEmpty(req.getId())){ wrapper.eq("id",req.getId());