【政策】完成导出

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java

@@ -1,5 +1,8 @@
 package com.epmet.dataaggre.dto.epmetuser.result;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -11,16 +14,33 @@ import java.util.Date;
 @AllArgsConstructor
 public class ResiByPolicyInfoResultDTO {
 
+    @ExcelIgnore
     private String icResiUserId;
+
+    @ExcelProperty(value = "姓名")
+    @ColumnWidth(10)
     private String name;
+
+    @ExcelProperty("手机号")
+    @ColumnWidth(20)
     private String mobile;
+
+    @ExcelProperty("身份证号")
+    @ColumnWidth(30)
     private String idCard;
     /**
      * 小区全名，包含小区前面的属性，比如网格等
      */
+    @ExcelIgnore
     private String gridId;
+    @ExcelIgnore
     private String neighborhoodId;
+    @ExcelProperty("小区名称")
+    @ColumnWidth(30)
     private String neighborHoodName;
+    @ExcelProperty("年龄")
+    @ColumnWidth(10)
     private Integer age;
+    @ExcelIgnore
     private Date birthday;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java

@@ -114,13 +114,13 @@ public class IcUserController implements ResultDataResolver {
      * 导出政策查找到的居民
      * @param input
      */
-    @PostMapping("exportByPolicy")
+    @PostMapping("exportByPolicyRules")
     public void exportResisByPolicy(@RequestBody ResisByPolicyRulesFormDTO input, HttpServletResponse response) {
         try {
             icResiService.exportResisByPolicy(
                     input.getOrgId(), input.getOrgType(), input.getNeighborHoodId(), input.getBuildingId(), input.getUnitId(),
-                    input.getHouseId(), input.getIdCard(), input.getName(), input.getPageNo(), input.getPageSize(),
-                    input.getRuleId(), input.getRuleList().getResiRuleList(), input.getRuleList().getHouseRuleList(), input.getRuleList().getStatRuleList(), response);
+                    input.getHouseId(), input.getIdCard(), input.getName(), input.getRuleId(), input.getRuleList().getResiRuleList(),
+                    input.getRuleList().getHouseRuleList(), input.getRuleList().getStatRuleList(), response);
         } catch (IOException e) {
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "导出Excel文件失败", "导出Excel文件失败");
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java

@@ -39,12 +39,10 @@ public interface ResiService {
      * @param houseId
      * @param idCard
      * @param name
-     * @param pageNo
-     * @param pageSize
      * @param ruleId
      */
     void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
-                             String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
+                             String houseId, String idCard, String name,
                              String ruleId, List<ResisByPolicyRulesFormDTO.ResiRule> resiRule,
                              List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
                              List<ResisByPolicyRulesFormDTO.StatRule> statRule,

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -12,6 +13,7 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO;
@@ -215,7 +217,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
 
     @Override
     public void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
-                                    String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
+                                    String houseId, String idCard, String name,
                                     String ruleId, List<ResisByPolicyRulesFormDTO.ResiRule> resiRule,
                                     List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
                                     List<ResisByPolicyRulesFormDTO.StatRule> statRule,
@@ -234,10 +236,19 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
             statRule = ConvertUtils.sourceToTarget(ruleList.getStatRuleList(), ResisByPolicyRulesFormDTO.StatRule.class);
         }
 
-        ServletOutputStream ostream = response.getOutputStream();
-        ExcelWriterSheetBuilder sheetBuilder = EasyExcel.write(ostream, ResisByPolicyExcel.class).sheet("居民列表");
+        // 模板导出
+        ExcelWriter writer = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("政策人员预览信息导出.xlsx", response))
+                //.withTemplate(inputStream)
+                .build();
+
+        WriteSheet writeSheet = EasyExcel.writerSheet("政策人员列表")
+                .head(ResiByPolicyInfoResultDTO.class)
+                .build();
+
+        Integer pageSize = 500;
+        Integer pageNo = 1;
 
-        // 循环填充数据
+        try {
             do {
                 PageData<ResiByPolicyInfoResultDTO> resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId,
                         houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule);
@@ -246,12 +257,13 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
                 if (CollectionUtils.isEmpty(excelDatas)) {
                     break;
                 }
-            //sheetBuilder.write(excelDatas);
-        } while (true);
 
-
-
-        System.out.println(666);
+                writer.write(resis.getList(), writeSheet);
+                pageNo++;
+            } while (true);
+        } finally {
+            writer.finish();
+        }
 
     }
 }