From 33b09221fba455de668337446dd29a8adc8794a8 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 8 Sep 2020 19:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HousingInformationController.java         | 270 ++----------------
 .../excel/居民信息录入模板.xls        | Bin 43520 -> 43008 bytes
 2 files changed, 21 insertions(+), 249 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java
index da698e67..9f51415d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java
@@ -20,7 +20,6 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.ExcelSelectionDto;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -31,9 +30,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.constant.PopulationDictConstant;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.form.SysPopulationSimpleDictFormDTO;
-import com.elink.esua.epdc.excel.BasePopulationInformationExcel;
 import com.elink.esua.epdc.excel.BasePopulationInformationExportExcel;
-import com.elink.esua.epdc.excel.BaseResidentInformationExcel;
 import com.elink.esua.epdc.excel.BaseResidentInformationExportExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.HousingInformationService;
@@ -45,9 +42,11 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -234,258 +233,31 @@ public class HousingInformationController {
         return  housingInformationService.importPopulationInfo(file,gridId);
     }
 
-
-
     /**
-     * @Description  导出模板 
+     * @Description  导出模板
      * @Author songyunpeng
      * @Date  2020/8/27
      * @Param [params, response]
      * @return void
      **/
     @GetMapping("exportModule")
-    public void exportModule(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<BasePopulationInformationExcel> basePopulationInformationExcels = new ArrayList<>(1);
-        List<BaseResidentInformationExcel> baseResidentInformationExcels = new ArrayList<>(1);
-        BasePopulationInformationExcel basePopulationInformationExcel = new BasePopulationInformationExcel();
-        basePopulationInformationExcel.setHouseAddress("XX小区XX号楼XX单元");
-        basePopulationInformationExcel.setBuyingTime("2020-02-02");
-        basePopulationInformationExcel.setHouseArea(new BigDecimal("0"));
-        basePopulationInformationExcel.setPropertyOwner("");
-        basePopulationInformationExcel.setPropertyOwnerIdentityNo("");
-        basePopulationInformationExcel.setPropertyOwnerMobile("");
-        basePopulationInformationExcel.setHouseUse("");
-        basePopulationInformationExcel.setTenantName("");
-        basePopulationInformationExcel.setTenantPhone("");
-        basePopulationInformationExcel.setTenantIdentityNo("");
-        basePopulationInformationExcel.setEnterpriseName("");
-        basePopulationInformationExcel.setSocialUniformCode("");
-        basePopulationInformationExcel.setLegalRepresentative("");
-        basePopulationInformationExcel.setEnterprisePhone("");
-        basePopulationInformationExcel.setResidentsName("");
-        basePopulationInformationExcel.setResidentsNation("");
-        basePopulationInformationExcel.setEducationLevel("");
-        basePopulationInformationExcel.setPoliticsStatus("");
-        basePopulationInformationExcel.setJoinTime("2020-02-02");
-        basePopulationInformationExcel.setOrganizationalRelationshipLocation("");
-        basePopulationInformationExcel.setResidentsIdentityNo("");
-        basePopulationInformationExcel.setResidentsPhone("");
-        basePopulationInformationExcel.setBodyStatus("");
-        basePopulationInformationExcel.setMaritalStatus("");
-        basePopulationInformationExcel.setAccountType("");
-        basePopulationInformationExcel.setMilitaryService("");
-        basePopulationInformationExcel.setHouseholdRegistrationPlace("");
-        basePopulationInformationExcel.setEmploymentStatus("");
-        basePopulationInformationExcel.setCurrentEmployer("");
-        basePopulationInformationExcel.setCurrentEmployerAddress("");
-        basePopulationInformationExcel.setUnemploymentReason("");
-        basePopulationInformationExcel.setReemploymentPermit("");
-        basePopulationInformationExcel.setUnemploymentRegister("");
-        basePopulationInformationExcel.setUnemploymentRegisterTime("2020-02-02");
-        basePopulationInformationExcel.setFamilyCategory("");
-        basePopulationInformationExcel.setHelpStatus("");
-        basePopulationInformationExcel.setMotorVehicleNum(0);
-        basePopulationInformationExcel.setMotorVehicleCategory("");
-        basePopulationInformationExcel.setDogStatus("");
-        BaseResidentInformationExcel baseResidentInformationExcel = new BaseResidentInformationExcel();
-        baseResidentInformationExcel.setResidentsIdentityNo("XX");
-        baseResidentInformationExcel.setHouseHeadRelation("XX");
-        baseResidentInformationExcel.setResidentsName("XX");
-        baseResidentInformationExcel.setResidentsSex("男");
-        baseResidentInformationExcel.setResidentsNation("汉");
-        baseResidentInformationExcel.setCurrentEmployer("XX");
-        baseResidentInformationExcel.setCurrentAddress("XX");
-        basePopulationInformationExcels.add(basePopulationInformationExcel);
-        baseResidentInformationExcels.add(baseResidentInformationExcel);
-        List<Class<?>> classes = new ArrayList<>(2);
-        classes.add(basePopulationInformationExcel.getClass());
-        classes.add(baseResidentInformationExcel.getClass());
-        List<String> sheetNames = new ArrayList<>(2);
-        sheetNames.add("房屋信息和户主信息");
-        sheetNames.add("居民信息");
-        //设置待选项
-        List<ExcelSelectionDto> excelSelectionDtos = new ArrayList<>();
-        //获取字典信息
-        SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO = new SysPopulationSimpleDictFormDTO();
-        List<String> dicTypes = new ArrayList<>();
-        Collections.addAll(dicTypes, PopulationDictConstant.ACCOUNT_TYPE, PopulationDictConstant.BODY_STATUS, PopulationDictConstant.EDUCATION_LEVEL
-                , PopulationDictConstant.EMPLOYMENT_STATUS, PopulationDictConstant.FAMILY_CATEGORY, PopulationDictConstant.GENDER, PopulationDictConstant.HELP_STATUS, PopulationDictConstant.MARITAL_STATUS
-                , PopulationDictConstant.MOTOR_VEHICLE_CATEGORY, PopulationDictConstant.POLITICS_STATUS, PopulationDictConstant.UNEMPLOYMENT_REASON);
-        sysPopulationSimpleDictFormDTO.setDicTypes(dicTypes);
-        Result<List<SysPopulationSimpleDictDTO>> listResult = adminFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO);
-        if (listResult == null || !listResult.success()) {
-            throw new RenException("获取字典信息失败");
-        }
-        List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS = listResult.getData();
-        ExcelSelectionDto houseUse = new ExcelSelectionDto();
-        houseUse.setSheetIndex(0);
-        houseUse.setFirstCol(7);
-        houseUse.setLastCol(7);
-        houseUse.setExcelSelections(new String[]{"自住","租赁","经营"});
-        ExcelSelectionDto educationLevel = new ExcelSelectionDto();
-        educationLevel.setSheetIndex(0);
-        educationLevel.setFirstCol(17);
-        educationLevel.setLastCol(17);
-        ExcelSelectionDto politicsStatus = new ExcelSelectionDto();
-        politicsStatus.setSheetIndex(0);
-        politicsStatus.setFirstCol(18);
-        politicsStatus.setLastCol(18);
-        ExcelSelectionDto bodyStatus = new ExcelSelectionDto();
-        bodyStatus.setSheetIndex(0);
-        bodyStatus.setFirstCol(23);
-        bodyStatus.setLastCol(23);
-        ExcelSelectionDto maritalStatus = new ExcelSelectionDto();
-        maritalStatus.setSheetIndex(0);
-        maritalStatus.setFirstCol(24);
-        maritalStatus.setLastCol(24);
-        ExcelSelectionDto accountType = new ExcelSelectionDto();
-        accountType.setSheetIndex(0);
-        accountType.setFirstCol(25);
-        accountType.setLastCol(25);
-        ExcelSelectionDto militaryService = new ExcelSelectionDto();
-        militaryService.setSheetIndex(0);
-        militaryService.setFirstCol(26);
-        militaryService.setLastCol(26);
-        militaryService.setExcelSelections(new String[]{"是","否"});
-        ExcelSelectionDto employedStatus = new ExcelSelectionDto();
-        employedStatus.setSheetIndex(0);
-        employedStatus.setFirstCol(28);
-        employedStatus.setLastCol(28);
-        ExcelSelectionDto unEmployedReason = new ExcelSelectionDto();
-        unEmployedReason.setSheetIndex(0);
-        unEmployedReason.setFirstCol(31);
-        unEmployedReason.setLastCol(31);
-        ExcelSelectionDto reEmployedPermit = new ExcelSelectionDto();
-        reEmployedPermit.setSheetIndex(0);
-        reEmployedPermit.setFirstCol(32);
-        reEmployedPermit.setLastCol(32);
-        reEmployedPermit.setExcelSelections(new String[]{"有","无"});
-        ExcelSelectionDto unEmployedRegister = new ExcelSelectionDto();
-        unEmployedRegister.setSheetIndex(0);
-        unEmployedRegister.setFirstCol(33);
-        unEmployedRegister.setLastCol(33);
-        unEmployedRegister.setExcelSelections(new String[]{"是","否"});
-        ExcelSelectionDto familyCategory = new ExcelSelectionDto();
-        familyCategory.setSheetIndex(0);
-        familyCategory.setFirstCol(35);
-        familyCategory.setLastCol(35);
-        ExcelSelectionDto helpStatus = new ExcelSelectionDto();
-        helpStatus.setSheetIndex(0);
-        helpStatus.setFirstCol(36);
-        helpStatus.setLastCol(36);
-        ExcelSelectionDto motorVehicleCategory = new ExcelSelectionDto();
-        motorVehicleCategory.setSheetIndex(0);
-        motorVehicleCategory.setFirstCol(38);
-        motorVehicleCategory.setLastCol(38);
-        ExcelSelectionDto dogStatus = new ExcelSelectionDto();
-        dogStatus.setSheetIndex(0);
-        dogStatus.setFirstCol(39);
-        dogStatus.setLastCol(39);
-        dogStatus.setExcelSelections(new String[]{"有","无"});
-        ExcelSelectionDto houseHeadRelation = new ExcelSelectionDto();
-        houseHeadRelation.setSheetIndex(1);
-        houseHeadRelation.setFirstCol(1);
-        houseHeadRelation.setLastCol(1);
-        houseHeadRelation.setExcelSelections(new String[]{"子女","夫妻","父母","其他"});
-        ExcelSelectionDto residentSex  = new ExcelSelectionDto();
-        residentSex.setSheetIndex(1);
-        residentSex.setFirstCol(3);
-        residentSex.setLastCol(3);
-        residentSex.setExcelSelections(new String[]{"男","女"});
-        //遍历赋值选项
-        for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.EDUCATION_LEVEL)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                educationLevel.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.POLITICS_STATUS)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                politicsStatus.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.BODY_STATUS)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                bodyStatus.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.MARITAL_STATUS)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                maritalStatus.setExcelSelections(data);
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.ACCOUNT_TYPE)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                accountType.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.EMPLOYMENT_STATUS)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                employedStatus.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.UNEMPLOYMENT_REASON)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                unEmployedReason.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.FAMILY_CATEGORY)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                familyCategory.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.HELP_STATUS)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                helpStatus.setExcelSelections(data);
-                continue;
-            }
-            if(sysPopulationSimpleDictDTO.getDicType().equals(PopulationDictConstant.MOTOR_VEHICLE_CATEGORY)){
-                List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
-                String[] data = new String[sysSimpleDicts.size()];
-                for (int i = 0;i<sysSimpleDicts.size();i++) {
-                    data[i] = sysSimpleDicts.get(i).getDictName();
-                }
-                motorVehicleCategory.setExcelSelections(data);
-                continue;
-            }
+    public void exportModule(HttpServletResponse res) throws Exception{
+        //获取要下载的模板名称
+        String fileName = "居民信息录入模板";
+        //设置要下载的文件的名称
+        res.setCharacterEncoding("UTF-8");
+        res.setHeader("content-Type", "application/vnd.ms-excel");
+        res.setHeader("Content-Disposition",
+                "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
+        //获取文件的路径
+        InputStream input = this.getClass().getResourceAsStream("/excel/居民信息录入模板.xls");
+        OutputStream out = res.getOutputStream();
+        byte[] b = new byte[2048];
+        int len;
+        while ((len = input.read(b)) != -1) {
+            out.write(b, 0, len);
         }
-        Collections.addAll(excelSelectionDtos,houseUse,educationLevel,politicsStatus,bodyStatus,maritalStatus,accountType,employedStatus,unEmployedReason,familyCategory,helpStatus,motorVehicleCategory,dogStatus,unEmployedRegister,reEmployedPermit,militaryService,houseHeadRelation,residentSex);
-        ExcelUtils.exportExcelToTargetWithSheets(response, "居民信息录入模板",sheetNames,classes,excelSelectionDtos,basePopulationInformationExcels,baseResidentInformationExcels);
-    }
+        input.close();
 
+    }
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls
index 0063f2f83b964b7ffa4587effac93fbb1b0bc563..3121b6a25ca0a9b956e28b61a887d3bbc0f79861 100644
GIT binary patch
delta 4265
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
WYe*4)j(+|t;P{FP{?sr0s{aF@+i{No

delta 5215
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
M(peQg|Ef>-Kj84N$^ZZW