From c8559503cfd7ea011691086813a767b7150cfd5f Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Fri, 13 Jun 2025 20:36:34 +0800 Subject: [PATCH] =?UTF-8?q?sast=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cd/casic/ci/api/SastController.java | 6 ++++++ .../ci/process/constant/SastUrlConstant.java | 1 + .../process/dto/resp/sast/SastReportResp.java | 19 +++++++++++++++++ .../process/service/sast/SastService.java | 3 +++ .../service/sast/impl/SastServiceImpl.java | 21 +++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/sast/SastReportResp.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java index 3f406d22..40d76385 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java @@ -8,6 +8,8 @@ import cd.casic.ci.process.dto.resp.sast.*; import cd.casic.ci.process.process.service.sast.SastService; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageParam; +import cd.casic.framework.commons.pojo.PageResult; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import jakarta.annotation.Resource; @@ -92,4 +94,8 @@ public class SastController { public CommonResult> language(){ return CommonResult.success(sastService.language()); } + @GetMapping("/reportList") + public CommonResult> reportList(@RequestBody PageParam pageParam){ + return CommonResult.success(sastService.reportList(pageParam)); + } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java index 9c31c6f0..78f3ab9e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java @@ -14,4 +14,5 @@ public class SastUrlConstant { public static final String reportIndex = "/api/report/index"; public static final String reportDownload = "/api/report/index/download"; public static final String language = "/invoke/language"; + public static final String reportList = "/api/report/index/pageList"; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/sast/SastReportResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/sast/SastReportResp.java new file mode 100644 index 00000000..c8b39bb1 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/sast/SastReportResp.java @@ -0,0 +1,19 @@ +package cd.casic.ci.process.dto.resp.sast; + +import lombok.Data; + +@Data +public class SastReportResp { + private String id; + private String createdTime; + private String createdBy; + private String updatedTime; + private String updatedBy; + private String name; + private String projectId; + private String type; + private String applicationScope; + private String mode; + private String status; + private String format; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java index 7effeb76..f719a4a1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java @@ -4,6 +4,8 @@ import cd.casic.ci.process.dto.req.sast.SastApplicationCreateReq; import cd.casic.ci.process.dto.req.sast.SastIdentifiedLanguageTaskReq; import cd.casic.ci.process.dto.req.sast.SastReportCreateReq; import cd.casic.ci.process.dto.resp.sast.*; +import cd.casic.framework.commons.pojo.PageParam; +import cd.casic.framework.commons.pojo.PageResult; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import jakarta.servlet.http.HttpServletResponse; @@ -24,4 +26,5 @@ public interface SastService { String reportIndex(SastReportCreateReq req); public String reportDownload(String reportId); public List language(); + public PageResult reportList(PageParam pageParam); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java index 85ac20c2..7d8f6ee8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java @@ -3,9 +3,12 @@ package cd.casic.ci.process.process.service.sast.impl; import cd.casic.ci.process.dto.req.sast.SastApplicationCreateReq; import cd.casic.ci.process.dto.req.sast.SastIdentifiedLanguageTaskReq; import cd.casic.ci.process.dto.req.sast.SastReportCreateReq; +import cd.casic.ci.process.dto.resp.report.ReportResp; import cd.casic.ci.process.dto.resp.sast.*; import cd.casic.ci.process.process.service.sast.SastService; import cd.casic.ci.process.properties.SastProperties; +import cd.casic.framework.commons.pojo.PageParam; +import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.redis.core.RedisTemplateUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -202,6 +205,24 @@ public class SastServiceImpl implements SastService { return JSON.parseArray(exchange.getBody(),SastLanguageResp.class); } + @Override + public PageResult reportList(PageParam pageParam) { + HttpHeaders httpHeaders = getHeaders(); + Map entityMap = new HashMap<>(); + HttpEntity> entity = new HttpEntity<>(entityMap,httpHeaders); + String uriString = UriComponentsBuilder.fromHttpUrl(sastProperties.getBaseUrl() + reportList) + .queryParam("page", pageParam.getPageNo()) + .queryParam("size", pageParam.getPageSize()) + .toUriString(); + System.out.println(uriString); + ResponseEntity exchange = restTemplate.exchange(uriString, HttpMethod.GET,entity, String.class,new HashMap<>()); + JSONObject jsonObject = JSON.parseObject(exchange.getBody()); + List respList = JSONArray.parseArray(jsonObject.getString("content"), SastReportResp.class); + + PageResult pageResult = new PageResult(respList,jsonObject.getLong("totalElements"),Long.valueOf(String.valueOf(pageParam.getPageNo())),Long.valueOf(String.valueOf(pageParam.getPageSize()))); + return pageResult; + } + private HttpHeaders getHeaders(){ HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.set(TOKEN_HEADER_KEY,TOKEN_PREFIX+getToken());