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 84fb7ef5..b1660c3e 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 @@ -66,7 +66,7 @@ public class ShuiMuController { return CommonResult.success(); } @PostMapping("/problemsOfTest") - public CommonResult problemsOfTest(@RequestBody ShuiMuTestProblemReq req){ - return null; + public CommonResult> problemsOfTest(@RequestBody ShuiMuTestProblemReq req){ + return CommonResult.success(shuiMuService.problemsOfTest(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 df837bed..93a9be22 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 @@ -293,9 +293,8 @@ public class ShuiMuServiceImpl implements ShuiMuService { .queryParam("projectId", projectId).toUriString(); ResponseEntity exchange = restTemplate.exchange(uriString, HttpMethod.GET, entity, String.class, new HashMap<>()); JSONObject jsonObject = JSON.parseObject(exchange.getBody()); - JSONArray data = jsonObject.getJSONArray("data"); - - return null; + String data = jsonObject.getString("data"); + return JSONArray.parseArray(data, ShuiMuTestProblemResp.class); } private HttpHeaders getHeaders(){