mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
HopeLi 2025-07-24 10:27:32 +08:00
commit e36d596bc7
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ShuiMuController.java
View File

@ -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<List<ShuiMuTestProblemResp>> problemsOfTest(@RequestBody ShuiMuTestProblemReq req){
public CommonResult<PageResult<ShuiMuTestProblemResp>> problemsOfTest(@RequestBody ShuiMuTestProblemReq req){
return CommonResult.success(shuiMuService.problemsOfTest(req));
}
@GetMapping("/getProjectReport")

1
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/ShuiMuUrlConstant.java
View File

@ -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";

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/ShuiMuService.java
View File

@ -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<ShuiMuTestProblemResp> problemsOfTest(ShuiMuTestProblemReq req);
PageResult<ShuiMuTestProblemResp> problemsOfTest(ShuiMuTestProblemReq req);
ShuiMuProjectReportResp getProjectReport(String projectId);
ShuiMuWebFuzzProjectCreateResp createWebFuzzProject(ShuiMuWebFuzzProjectCreateUpdateReq req);

16
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/shuimu/impl/ShuiMuServiceImpl.java
View File

@ -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<ShuiMuTestProblemResp> problemsOfTest(ShuiMuTestProblemReq req) {
public PageResult<ShuiMuTestProblemResp> problemsOfTest(ShuiMuTestProblemReq req) {
HttpHeaders headers = getHeaders();
HttpEntity<String> 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<String> 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<ShuiMuTestProblemResp> result = new PageResult<>(shuiMuTestProblemResps,count,pageNo,pageSize);
return result;
}
@Override
public ShuiMuProjectReportResp getProjectReport(String projectId) {