From 0e38244fbc7b086e8677beeac37b39ccf8661fca Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Thu, 5 Jun 2025 21:34:13 +0800 Subject: [PATCH] =?UTF-8?q?0605=20ljc=20=20=20=E6=8A=A5=E5=91=8A=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/impl/ReportServiceImpl.java | 87 ++++++++++--------- 1 file changed, 44 insertions(+), 43 deletions(-) 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 98bfb933..1ab22047 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 @@ -9,15 +9,13 @@ import cd.casic.ci.process.process.service.report.ReportService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.PageResult; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import java.security.KeyManagementException; @@ -39,15 +37,16 @@ import static cd.casic.ci.process.engine.worker.base.HttpWorker.getRestTemplateW @Slf4j public class ReportServiceImpl implements ReportService { + public static final String PATH = "/openapi/v1/asset/report/downLoadReport/batch"; + @Override public PageResult findReportList(BaseIdPageReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException { RestTemplate restTemplate = getRestTemplateWithoutSANCheck(); String reportFindUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/list"; - MultiValueMap body = buildFindRequestBody(req); + String body = buildFindRequestBody(req); HttpHeaders headers = createHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - headers.add("OpenApiUserToken", ConstantContextHolder.getScaToken()); - HttpEntity> requestEntity = new HttpEntity<>(body, headers); + HttpEntity requestEntity = new HttpEntity<>(body, headers); log.info("报告分页查询接口:" + reportFindUrl); JSONObject response = restTemplate.postForObject(reportFindUrl, requestEntity, JSONObject.class); @@ -72,12 +71,11 @@ public class ReportServiceImpl implements ReportService { @Override public ReportResp deleteReport(ReportDeleteReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException { RestTemplate restTemplate = getRestTemplateWithoutSANCheck(); - String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/delet"; - MultiValueMap body = buildDeleteRequestBody(req); + String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/delete"; + String body = buildDeleteRequestBody(req); HttpHeaders headers = createHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - headers.add("OpenApiUserToken", ConstantContextHolder.getScaToken()); - HttpEntity> requestEntity = new HttpEntity<>(body, headers); + HttpEntity requestEntity = new HttpEntity<>(body, headers); log.info("报告删除接口:" + reportDeleteUrl); JSONObject response = restTemplate.postForObject(reportDeleteUrl, requestEntity, JSONObject.class); @@ -101,12 +99,11 @@ public class ReportServiceImpl implements ReportService { @Override public String downLoadReport(BaseIdReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException { RestTemplate restTemplate = getRestTemplateWithoutSANCheck(); - String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/downLoadReport/batch"; - MultiValueMap body = buildDownloadRequestBody(req); + String reportDeleteUrl = ConstantContextHolder.getScaIp() + PATH; + String body = buildDownloadRequestBody(req); HttpHeaders headers = createHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - headers.add("OpenApiUserToken", ConstantContextHolder.getScaToken()); - HttpEntity> requestEntity = new HttpEntity<>(body, headers); + HttpEntity requestEntity = new HttpEntity<>(body, headers); log.info("报告下载接口:" + reportDeleteUrl); JSONObject response = restTemplate.postForObject(reportDeleteUrl, requestEntity, JSONObject.class); @@ -132,40 +129,43 @@ public class ReportServiceImpl implements ReportService { return headers; } - private MultiValueMap buildFindRequestBody(BaseIdPageReq req) { - MultiValueMap body = new LinkedMultiValueMap<>(); - if (!ObjectUtils.isEmpty(req.getProjectId())){ - body.add("projectId", req.getProjectId()); + private String buildFindRequestBody(BaseIdPageReq req) { + JSONObject json = new JSONObject(); + if (req.getProjectId() != null) { + json.put("projectId", req.getProjectId()); } - body.add("pageNum", req.getPageNo()); - body.add("pageSize", req.getPageSize()); - return body; + json.put("pageNum", req.getPageNo()); + json.put("pageSize", req.getPageSize()); + return json.toJSONString(); } - private MultiValueMap buildDeleteRequestBody(ReportDeleteReq req) { - MultiValueMap body = new LinkedMultiValueMap<>(); - body.add("endDate", req.getEndDate()); - body.add("name", req.getName()); - body.add("projectIdList", req.getProjectIdList()); - body.add("reportId", req.getReportId()); - body.add("sourceCode", req.getSourceCode()); - body.add("startDate", req.getStartDate()); - body.add("status", req.getStatus()); - body.add("type", req.getType()); - body.add("use", req.getUse()); - return body; + private String buildDeleteRequestBody(ReportDeleteReq req) { + JSONObject json = new JSONObject(); + + json.put("endDate", req.getEndDate()); + json.put("name", req.getName()); + json.put("projectIdList", req.getProjectIdList()); + json.put("reportId", req.getReportId()); + json.put("sourceCode", req.getSourceCode()); + json.put("startDate", req.getStartDate()); + json.put("status", req.getStatus()); + json.put("type", req.getType()); + json.put("use", req.getUse()); + + return json.toJSONString(); } - private MultiValueMap buildDownloadRequestBody(BaseIdReq req) { - MultiValueMap body = new LinkedMultiValueMap<>(); - body.add("reportIds", req.getReportIds()); - return body; + private String buildDownloadRequestBody(BaseIdReq req) { + JSONObject json = new JSONObject(); + json.put("reportIds", req.getReportIds()); + return json.toJSONString(); } private void setReportFindResp(JSONObject data, String xmTraceId, List respList) { - data.getJSONArray("records").forEach(item -> { - JSONObject report = (JSONObject) item; + JSONArray records = data.getJSONArray("records"); + for (int i = 0; i < records.size(); i++) { + JSONObject report = records.getJSONObject(i); ReportResp reportResp = new ReportResp(); reportResp.setId(report.getInteger("id")); @@ -183,13 +183,14 @@ public class ReportServiceImpl implements ReportService { reportResp.setXmTraceId(xmTraceId); List typeList = new ArrayList<>(); - report.getJSONArray("type").forEach(o->{ - typeList.add((Integer) o); - }); + JSONArray typeArray = report.getJSONArray("type"); + for (int j = 0; j < typeArray.size(); j++) { + typeList.add(typeArray.getInteger(j)); + } reportResp.setType(typeList); respList.add(reportResp); - }); + } }