From 5807d32c2449348fc1b49510530e217d5c39be7d Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Fri, 13 Jun 2025 17:46:31 +0800 Subject: [PATCH] =?UTF-8?q?0611=20ljc=20=20=20report=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/process/dto/resp/report/ReportResp.java | 2 ++ .../process/engine/worker/ApplicationWorker.java | 11 +++++++---- .../ci/process/engine/worker/CodingWorker.java | 9 +++++++-- .../ci/process/engine/worker/ScaBinaryWorker.java | 11 +++++++---- .../ci/process/engine/worker/ScaMirrorWorker.java | 11 +++++++---- .../ci/process/engine/worker/ScaSbomWorker.java | 14 +++++++++----- .../service/report/impl/ReportServiceImpl.java | 6 ++++-- 7 files changed, 43 insertions(+), 21 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java index 3675fcf4..402c6b18 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/report/ReportResp.java @@ -82,4 +82,6 @@ public class ReportResp { private Integer fail; private Integer success; + private String message; + } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java index 24a2a1ea..97b2bd61 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java @@ -140,8 +140,13 @@ public class ApplicationWorker extends HttpWorker { req.setScaTaskId(scaTaskId); ReportResp reportResp = reportService.assetReportTask(req); if (!ObjectUtils.isEmpty(reportResp)){ - applicationConfigInfo.put("reportId",reportResp.getId()); - applicationConfigInfo.put("reportName",reportResp.getName()); + if (reportResp.getMessage().equals("success")){ + append(context,"回调报告生成接口成功"); + applicationConfigInfo.put("reportId",reportResp.getId()); + applicationConfigInfo.put("reportName",reportResp.getName()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -165,8 +170,6 @@ public class ApplicationWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-应用包审查分析节点执行失败"); } -// Thread.currentThread().interrupt(); - toBadEnding(); } private MultiValueMap buildRequestBody(Map applicationConfigInfo, File file) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java index ac1ebad4..7926751d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java @@ -116,8 +116,13 @@ public class CodingWorker extends HttpWorker { req.setScaTaskId(scaTaskId); ReportResp reportResp = reportService.assetReportTask(req); if (!ObjectUtils.isEmpty(reportResp)){ - codingConfigInfo.put("reportId",reportResp.getId()); - codingConfigInfo.put("reportName",reportResp.getName()); + if (reportResp.getMessage().equals("success")){ + append(context,"回调报告生成接口成功"); + codingConfigInfo.put("reportId",reportResp.getId()); + codingConfigInfo.put("reportName",reportResp.getName()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java index fedb36ac..d9a2d690 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java @@ -148,8 +148,13 @@ public class ScaBinaryWorker extends HttpWorker { req.setScaTaskId(scaTaskId); ReportResp reportResp = reportService.assetReportTask(req); if (!ObjectUtils.isEmpty(reportResp)){ - scaBinaryConfigInfo.put("reportId",reportResp.getId()); - scaBinaryConfigInfo.put("reportName",reportResp.getName()); + if (reportResp.getMessage().equals("success")){ + append(context,"回调报告生成接口成功"); + scaBinaryConfigInfo.put("reportId",reportResp.getId()); + scaBinaryConfigInfo.put("reportName",reportResp.getName()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -174,8 +179,6 @@ public class ScaBinaryWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } -// Thread.currentThread().interrupt(); - toBadEnding(); } private MultiValueMap buildRequestBody(Map scaBinaryConfigInfo, File file) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java index 2173a269..97b66a75 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java @@ -145,8 +145,13 @@ public class ScaMirrorWorker extends HttpWorker { req.setScaTaskId(scaTaskId); ReportResp reportResp = reportService.assetReportTask(req); if (!ObjectUtils.isEmpty(reportResp)){ - scaMirrorConfigInfo.put("reportId",reportResp.getId()); - scaMirrorConfigInfo.put("reportName",reportResp.getName()); + if (reportResp.getMessage().equals("success")){ + append(context,"回调报告生成接口成功"); + scaMirrorConfigInfo.put("reportId",reportResp.getId()); + scaMirrorConfigInfo.put("reportName",reportResp.getName()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -171,8 +176,6 @@ public class ScaMirrorWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } -// Thread.currentThread().interrupt(); - toBadEnding(); } private MultiValueMap buildRequestBody(Map scaMirrorConfigInfo, File file) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java index 0226fe55..ce747417 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java @@ -142,8 +142,13 @@ public class ScaSbomWorker extends HttpWorker { req.setScaTaskId(scaTaskId); ReportResp reportResp = reportService.assetReportTask(req); if (!ObjectUtils.isEmpty(reportResp)){ - scaSbomConfigInfo.put("reportId",reportResp.getId()); - scaSbomConfigInfo.put("reportName",reportResp.getName()); + if (reportResp.getMessage().equals("success")){ + append(context,"回调报告生成接口成功"); + scaSbomConfigInfo.put("reportId",reportResp.getId()); + scaSbomConfigInfo.put("reportName",reportResp.getName()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -157,7 +162,7 @@ public class ScaSbomWorker extends HttpWorker { Integer oldScaTaskId = (Integer) scaSbomConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) scaSbomConfigInfo.get("applicationId"); append(context,"跳过上传步骤，获取scaTaskId:"+oldScaTaskId); - append(context,"重新运行上一次的，scaTaskId:"+oldScaTaskId); + append(context,"重新运行上一次的，applicationId:"+oldApplicationId); int restartResult = reStartTask(restTemplate, oldApplicationId,context); if (restartResult != 0) { return; @@ -168,8 +173,7 @@ public class ScaSbomWorker extends HttpWorker { append(context,message); throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"SCA-SBOM节点执行失败"); } -// Thread.currentThread().interrupt(); - toBadEnding(); + } private MultiValueMap buildRequestBody(Map scaSbomConfigInfo, File file) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java index d608c793..34ef40b1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java @@ -151,16 +151,17 @@ public class ReportServiceImpl implements ReportService { log.info("根据任务ID列表生成检测报告:" + reportDeleteUrl); JSONObject response = restTemplate.postForObject(reportDeleteUrl, requestEntity, JSONObject.class); String message = response.getString("message"); + ReportResp reportResp = new ReportResp(); if (message.equals("success")) { - ReportResp reportResp = new ReportResp(); log.info("===============根据任务ID列表生成检测报告成功================="); setReportAssetResp(response.getString("xmTraceId"),reportResp); return reportResp; } else { + reportResp.setMessage(message); log.error("===============根据任务ID列表生成检测报告失败================="); - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"根据任务ID列表生成检测报告失败"); + return reportResp; } } @@ -296,6 +297,7 @@ public class ReportServiceImpl implements ReportService { private void setReportAssetResp(String xmTraceId, ReportResp reportResp) { reportResp.setXmTraceId(xmTraceId); + reportResp.setMessage("success"); }