From 7a124aa4d0392e39b39ec49eda505c0f11d0da61 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 18 Dec 2024 10:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2Get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsCiPipelinesController.java | 12 ++++++++++++ .../service/IPmsCiPipelinesService.java | 2 ++ .../service/impl/PmsCiPipelinesServiceImpl.java | 17 +++++++++++++++++ .../pms/utils/PmsGitLinkRequestUrl.java | 4 ++++ 4 files changed, 35 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java index 3aff4746a..1d816b292 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java @@ -251,4 +251,16 @@ public class PmsCiPipelinesController extends BaseController pmsCiPipelinesService.getPipelineRunJobLogs(id, run, job, response); } + /** + * 流水线执行测试报告结果查询 + */ + @PostMapping(value = "/{id}/actions/runs/{run}/results") + @ApiOperation("流水线执行测试报告结果查询") + public AjaxResult getPipelineRunResults(@ApiParam(name = "id", value = "流水线id")@PathVariable Long id, + @ApiParam(name = "run", value = "执行记录序号")@PathVariable String run) + { + return success(pmsCiPipelinesService.getPipelineRunResults(id, run)); + } + + } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java index ce3e38f87..a427e2715 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java @@ -98,4 +98,6 @@ public interface IPmsCiPipelinesService void getPipelineRunJobLogs(Long id, String run, String job, HttpServletResponse response); JSONObject runPipelineRunsJob(Long id, String workflow, String ref); + + JSONObject getPipelineRunResults(Long id, String run); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java index e7a758018..a631a87b5 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java @@ -414,6 +414,23 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { } } + + @Override + public JSONObject getPipelineRunResults(Long id, String run) { + PmsCiPipelines pmsCiPipelines = pmsCiPipelinesMapper.selectPmsCiPipelinesById(id); + if (pmsCiPipelines == null) { + throw new ServiceException("该项目流水线不存在(流水线ID[%s])", id); + } + try { + return gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_PIPELINE_RUN_RESULTS(pmsCiPipelines.getOwner(), + pmsCiPipelines.getRepoIdentifier(), + run)); + } catch (Exception e) { + logger.error(e.getMessage()); + throw new ServiceException("获取流水线运行结果信息失败"); + } + } + private void saveOrUpdateGraphicJsonToLocal(Long id, PmsCiPipelineBuildYamlInputVo pmsCiPipelineBuildInputVo) { PmsCiPipelineGraphics existentialPmsCiPipelineGraphics = pmsCiPipelineGraphicsService.selectPmsCiPipelineGraphicsByPmsCiPipelineId(id); PmsCiPipelineGraphics pmsCiPipelineGraphics = new PmsCiPipelineGraphics(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java index d9b37d278..e84cc5a4e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java @@ -391,4 +391,8 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return getGitLinkRequestUrl( String.format("/api/pm/dashboards/my_operate_journals?pm_project_id=%d&page=1&limit=10", pmProjectId)); } + + public static GitLinkRequestUrl GET_PIPELINE_RUN_RESULTS(String owner, String repoIdentifier, String run){ + return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/pipelines/run_results.json?run_id=%s", owner, repoIdentifier, run)); + } }