diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ReportController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ReportController.java index 7576b1fa6d..3499e2dc6a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ReportController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ReportController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.ReportRequest; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.ReportHouseTestFormDTO; @@ -20,9 +21,10 @@ public class ReportController { * @return */ @PostMapping("houses/test") - public Result> listHouses(@RequestBody ReportHouseTestFormDTO input, @RequestParam(value="id", required = false) String id) { - System.out.println("id:"+id); - PageData pageData = houseService.listHouses4ReportTest(id, input.getPageNo(), input.getPageSize()); + @ReportRequest + public Result> listHouses(@RequestBody ReportHouseTestFormDTO input) { + System.out.println("id:"+input.getId()); + PageData pageData = houseService.listHouses4ReportTest(input.getId(), input.getPageNo(), input.getPageSize()); return new Result>().ok(pageData); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportBatchExportFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportBatchExportFormDTO.java index a2673061a5..9fccc4517d 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportBatchExportFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportBatchExportFormDTO.java @@ -8,7 +8,7 @@ import lombok.Data; @Data public class ReportBatchExportFormDTO { - private String token; + //private String token; private String paramKey; private String reportId; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java index afd9fabde9..b5f1a1c28a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java @@ -93,9 +93,8 @@ public class IcCustomerReportController { String reportId = input.getReportId(); String paramKey = input.getParamKey(); - String token = input.getToken(); - icCustomerReportService.batchExport(reportId, token, paramKey, response); + icCustomerReportService.batchExport(reportId, paramKey, response); } @ReportRequest diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java index 6bd359dd57..54b5a6f22c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java @@ -51,5 +51,5 @@ public interface IcCustomerReportService extends BaseService reportIdAndName(ReportListFormDTO formDTO); - void batchExport(String reportId, String token, String paramKey, HttpServletResponse response); + void batchExport(String reportId, String paramKey, HttpServletResponse response); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 41bef27c2d..2d985ad0c7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -257,7 +257,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl ids = listIds(apiUrl, isHttps, idFieldName); + List ids = listIds(paramKey, apiUrl, isHttps, idFieldName); // 3. 然后以这一列作为查询条件,循环,继续调用该接口,得到单条数据,每一条数据都下载一个excel,最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); @@ -453,8 +453,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listIds(String apiUrl, boolean isHttps, String idFieldName) { + public List listIds(String paramKey, String apiUrl, boolean isHttps, String idFieldName) { apiUrl = apiUrl.replace("${id}", ""); + apiUrl = apiUrl.replace("${paramKey}", paramKey); Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER));