From f297ff342e3249705cd409df4e17ffcabf9d8ed9 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Fri, 13 Jun 2025 17:52:07 +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 --- .../cd/casic/ci/process/engine/worker/ApplicationWorker.java | 1 - .../java/cd/casic/ci/process/engine/worker/CodingWorker.java | 1 - .../cd/casic/ci/process/engine/worker/ScaBinaryWorker.java | 1 - .../cd/casic/ci/process/engine/worker/ScaMirrorWorker.java | 1 - .../cd/casic/ci/process/engine/worker/ScaSbomWorker.java | 1 - .../process/service/report/impl/ReportServiceImpl.java | 5 +++-- 6 files changed, 3 insertions(+), 7 deletions(-) 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 97b2bd61..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 @@ -143,7 +143,6 @@ public class ApplicationWorker extends HttpWorker { if (reportResp.getMessage().equals("success")){ append(context,"回调报告生成接口成功"); applicationConfigInfo.put("reportId",reportResp.getId()); - applicationConfigInfo.put("reportName",reportResp.getName()); }else { append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); } 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 7926751d..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 @@ -119,7 +119,6 @@ public class CodingWorker extends HttpWorker { if (reportResp.getMessage().equals("success")){ append(context,"回调报告生成接口成功"); codingConfigInfo.put("reportId",reportResp.getId()); - codingConfigInfo.put("reportName",reportResp.getName()); }else { append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); } 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 d9a2d690..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 @@ -151,7 +151,6 @@ public class ScaBinaryWorker extends HttpWorker { if (reportResp.getMessage().equals("success")){ append(context,"回调报告生成接口成功"); scaBinaryConfigInfo.put("reportId",reportResp.getId()); - scaBinaryConfigInfo.put("reportName",reportResp.getName()); }else { append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); } 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 97b66a75..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 @@ -148,7 +148,6 @@ public class ScaMirrorWorker extends HttpWorker { if (reportResp.getMessage().equals("success")){ append(context,"回调报告生成接口成功"); scaMirrorConfigInfo.put("reportId",reportResp.getId()); - scaMirrorConfigInfo.put("reportName",reportResp.getName()); }else { append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); } 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 ce747417..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 @@ -145,7 +145,6 @@ public class ScaSbomWorker extends HttpWorker { if (reportResp.getMessage().equals("success")){ append(context,"回调报告生成接口成功"); scaSbomConfigInfo.put("reportId",reportResp.getId()); - scaSbomConfigInfo.put("reportName",reportResp.getName()); }else { append(context,"回调报告生成接口失败,scaTaskId = " + scaTaskId + "=====错误原因=====" + reportResp.getMessage()); } 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 34ef40b1..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 @@ -154,7 +154,7 @@ public class ReportServiceImpl implements ReportService { ReportResp reportResp = new ReportResp(); if (message.equals("success")) { log.info("===============根据任务ID列表生成检测报告成功================="); - setReportAssetResp(response.getString("xmTraceId"),reportResp); + setReportAssetResp(response.getString("xmTraceId"),response.getInteger("data"),reportResp); return reportResp; @@ -295,9 +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); }