【报表】批量导出，修改

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<PageData<ReportHouseTestResultDTO>> listHouses(@RequestBody ReportHouseTestFormDTO input, @RequestParam(value="id", required = false) String id) {
+    @ReportRequest
-        System.out.println("id:"+id);
+    public Result<PageData<ReportHouseTestResultDTO>> listHouses(@RequestBody ReportHouseTestFormDTO input) {
-        PageData<ReportHouseTestResultDTO> pageData = houseService.listHouses4ReportTest(id, input.getPageNo(), input.getPageSize());
+        System.out.println("id:"+input.getId());
+        PageData<ReportHouseTestResultDTO> pageData = houseService.listHouses4ReportTest(input.getId(), input.getPageNo(), input.getPageSize());
         return new Result<PageData<ReportHouseTestResultDTO>>().ok(pageData);
     }
 

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;
 

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

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java

@@ -51,5 +51,5 @@ public interface IcCustomerReportService extends BaseService<IcCustomerReportEnt
      */
     List<JiMuReportResultDTO> reportIdAndName(ReportListFormDTO formDTO);
 
-    void batchExport(String reportId, String token, String paramKey, HttpServletResponse response);
+    void batchExport(String reportId, String paramKey, HttpServletResponse response);
 }

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<IcCustomerRepor
     }
 
     @Override
-    public void batchExport(String reportId, String token, String paramKey, HttpServletResponse response) {
+    public void batchExport(String reportId, String paramKey, HttpServletResponse response) {
 
         // 1. 首先去积木服务，查询出报表数据源的详细信息，包括报表url，isList；获取到哪一列是id(idFieldName)
 
@@ -293,7 +293,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
         }
 
         // 2. 调用该url的接口，获取到一个列表，根据idFieldName取出ID列
-        List<String> ids = listIds(apiUrl, isHttps, idFieldName);
+        List<String> ids = listIds(paramKey, apiUrl, isHttps, idFieldName);
 
         // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载
         Path storePath = makeTemporaryDownloadDir(reportId);
@@ -453,8 +453,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
      * @param idFieldName
      * @return
      */
-    public List<String> listIds(String apiUrl, boolean isHttps, String idFieldName) {
+    public List<String> listIds(String paramKey, String apiUrl, boolean isHttps, String idFieldName) {
         apiUrl = apiUrl.replace("${id}", "");
+        apiUrl = apiUrl.replace("${paramKey}", paramKey);
 
         Map<String, Object> headers = new HashMap<>();
         headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER));