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..c866f839 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,12 @@ 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()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -165,8 +169,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..959e4a7d 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,12 @@ 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()); + }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..8716a520 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,12 @@ 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()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -174,8 +178,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..6fbbb463 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,12 @@ 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()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -171,8 +175,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..55046835 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,12 @@ 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()); + }else { + append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); + } } //更新scaTaskId数据到task表 @@ -157,7 +161,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 +172,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..33a0f212 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); + setReportAssetResp(response.getString("xmTraceId"),response.getInteger("data"),reportResp); return reportResp; } else { + reportResp.setMessage(message); log.error("===============根据任务ID列表生成检测报告失败================="); - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"根据任务ID列表生成检测报告失败"); + return reportResp; } } @@ -294,8 +295,10 @@ public class ReportServiceImpl implements ReportService { reportResp.setXmTraceId(xmTraceId); } - private void setReportAssetResp(String xmTraceId, ReportResp reportResp) { + private void setReportAssetResp(String xmTraceId, Integer data, ReportResp reportResp) { reportResp.setXmTraceId(xmTraceId); + reportResp.setMessage("success"); + reportResp.setId(data); }