From 981659ddc60f52a55f527e8425901f8404ee9ae7 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 23 Jul 2025 17:22:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=9C=A8=E7=BC=BA=E9=99=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=80=BB=E6=95=B0=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cd/casic/ci/api/ShuiMuController.java | 3 ++- .../ci/process/constant/ShuiMuUrlConstant.java | 1 + .../process/service/shuimu/ShuiMuService.java | 3 ++- .../service/shuimu/impl/ShuiMuServiceImpl.java | 16 ++++++++++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ShuiMuController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ShuiMuController.java index a97518b1..9006f709 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ShuiMuController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ShuiMuController.java @@ -4,6 +4,7 @@ import cd.casic.ci.process.dto.req.shuimu.*; import cd.casic.ci.process.dto.resp.shuimu.*; import cd.casic.ci.process.process.service.shuimu.ShuiMuService; import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; @@ -61,7 +62,7 @@ public class ShuiMuController { return CommonResult.success(); } @PostMapping("/problemsOfTest") - public CommonResult> problemsOfTest(@RequestBody ShuiMuTestProblemReq req){ + public CommonResult> problemsOfTest(@RequestBody ShuiMuTestProblemReq req){ return CommonResult.success(shuiMuService.problemsOfTest(req)); } @GetMapping("/getProjectReport") diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/ShuiMuUrlConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/ShuiMuUrlConstant.java index 7d13981f..268cc6f5 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/ShuiMuUrlConstant.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/ShuiMuUrlConstant.java @@ -18,6 +18,7 @@ public class ShuiMuUrlConstant { public static final String executeAllEntrypointsTest ="/api/driverGeneration/executeAllEntrypointsTest"; public static final String problemsOfTest = "/api/test/problemsOfTest"; + public static final String problemsOfTestCount = "/api/webFuzz/test/problemsOfTestCount"; public static final String getProjectReport = "/api/project"; public static final String createWebFuzzProject = "/api/webFuzz/project/create"; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/ShuiMuService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/ShuiMuService.java index 641681ae..85087d76 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/ShuiMuService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/ShuiMuService.java @@ -2,6 +2,7 @@ package cd.casic.ci.process.process.service.shuimu; import cd.casic.ci.process.dto.req.shuimu.*; import cd.casic.ci.process.dto.resp.shuimu.*; +import cd.casic.framework.commons.pojo.PageResult; import java.util.List; @@ -29,7 +30,7 @@ public interface ShuiMuService { void executeAllEntrypointsTest(String projectId,Integer fuzzMinutes); ShuiMuProjectResourceResp getProjectResource(String projectId); - List problemsOfTest(ShuiMuTestProblemReq req); + PageResult problemsOfTest(ShuiMuTestProblemReq req); ShuiMuProjectReportResp getProjectReport(String projectId); ShuiMuWebFuzzProjectCreateResp createWebFuzzProject(ShuiMuWebFuzzProjectCreateUpdateReq req); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java index f9ca6d5f..3440acea 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java @@ -10,6 +10,7 @@ import cd.casic.ci.process.process.service.target.TargetVersionService; import cd.casic.ci.process.properties.ShuiMuProperties; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.framework.redis.core.RedisTemplateUtils; import com.alibaba.fastjson.JSON; @@ -279,7 +280,7 @@ public class ShuiMuServiceImpl implements ShuiMuService { } @Override - public List problemsOfTest(ShuiMuTestProblemReq req) { + public PageResult problemsOfTest(ShuiMuTestProblemReq req) { HttpHeaders headers = getHeaders(); HttpEntity entity = new HttpEntity<>(null,headers); String skip = String.valueOf((req.getPageNo()-1)*req.getPageSize()); @@ -302,7 +303,18 @@ public class ShuiMuServiceImpl implements ShuiMuService { .toLocalDateTime(); item.setCreateTime(date); }); - return shuiMuTestProblemResps; + String countUrlString = UriComponentsBuilder.fromUriString(shuiMuProperties.getBaseUrl() + problemsOfTestCount) + .queryParam("skip", skip) + .queryParam("limit", limit) + .queryParam("product", product) + .queryParam("projectId", projectId).toUriString(); + ResponseEntity countExchange = restTemplate.exchange(uriString, HttpMethod.GET, entity, String.class, new HashMap<>()); + JSONObject countResp = JSON.parseObject(countExchange.getBody()); + Long count = jsonObject.getLong("data"); + Long pageNo = Long.parseLong(String.valueOf(req.getPageNo())); + Long pageSize = Long.parseLong(String.valueOf(req.getPageSize())); + PageResult result = new PageResult<>(shuiMuTestProblemResps,count,pageNo,pageSize); + return result; } @Override public ShuiMuProjectReportResp getProjectReport(String projectId) {