From 813c83d2edc2c1d53eafc4b1deda658d3b90aa39 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 1 Jul 2022 12:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E6=AF=8F=E6=AC=A11w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/HouseController.java |   6 +-
 .../epmet/service/impl/HouseServiceImpl.java  |  56 +++++++++++-------
 .../excel/house_export_for_easyexcel.xlsx     | Bin 0 -> 10760 bytes
 .../src/main/resources/mapper/IcHouseDao.xml  |   4 +-
 4 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_easyexcel.xlsx

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index 473430f076..58ce113aa1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -236,8 +236,12 @@ public class HouseController implements ResultDataResolver {
     @RequestMapping("exporthouseinfo")
     public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
         ValidatorUtils.validateEntity(formDTO);
+        if (StringUtils.isNotBlank(formDTO.getId())){
+            formDTO.setSelectType("id");
+        }else{
+            formDTO.setSelectType("agency");
+        }
         formDTO.setIsPage(false);
-        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
         houseService.exportBuildinginfo(formDTO, response);
 
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index ba9cb5e146..76ce9a6149 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -1,9 +1,10 @@
 package com.epmet.service.impl;
 
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -24,10 +25,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.FileUtils;
-import com.epmet.commons.tools.utils.HouseQRcodeUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.CustomerGridConstant;
 import com.epmet.constant.NeighborhoodConstant;
 import com.epmet.constants.ImportTaskConstants;
@@ -48,7 +46,6 @@ import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportHouseInfoListener;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.*;
-import com.epmet.util.ExcelPoiUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.cache.Cache;
@@ -377,22 +374,41 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
         //如果类型是house 查房屋
         //导出房屋
-        PageData<IcHouseListResultDTO> icHouseExcels = new PageData<>(new ArrayList<>(), NumConstant.ZERO);
-        List<IcHouseListResultDTO> list = new ArrayList<>();
+        PageData<IcHouseListResultDTO> icHouseExcels = null;
         Integer pageNo = NumConstant.ONE;
-        do {
-            formDTO.setPageNo(pageNo);
-            icHouseExcels = getHouseList(formDTO);
-            if (CollectionUtils.isEmpty(icHouseExcels.getList())) {
-                break;
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        ExcelWriter excelWriter = null;
+        long start = System.currentTimeMillis();
+        try {
+            String templatePath = "excel/house_export_for_easyexcel.xlsx";
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("房屋信息.xlsx", response))
+                    .withTemplate(inputStream).build();
+
+            WriteSheet writeSheet = EasyExcel.writerSheet().build();
+            do {
+                formDTO.setPageNo(pageNo);
+                icHouseExcels = getHouseList(formDTO);
+                if (CollectionUtils.isEmpty(icHouseExcels.getList())) {
+                    break;
+                }
+                excelWriter.fill(icHouseExcels.getList(), writeSheet);
+                pageNo++;
+            } while (icHouseExcels.getList().size() == formDTO.getPageSize());
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
             }
-            list.addAll(icHouseExcels.getList());
-            pageNo++;
-        } while (icHouseExcels.getList().size() == formDTO.getPageSize());
-        TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx");
-        Map<String, Object> map = new HashMap<>();
-        map.put("maplist", list);
-        ExcelPoiUtils.exportExcel(templatePath, map, "房屋信息录入表", response);
+            log.info("exportBuildinginfo cost:{}ms",System.currentTimeMillis()-start);
+        }
     }
 
     @Override
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_easyexcel.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_easyexcel.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..359b68f0bd9eaaab0b054688bc663835cafe7cd0
GIT binary patch
literal 10760
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
Yt|$Zhn8iFC5>FxG9>%Os`S|UB0Q^3aPXGV_

literal 0
HcmV?d00001

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index d0dd039a7f..4943a95b1c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -122,8 +122,8 @@
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
-        LEFT JOIN customer_grid gr on gr.ID = c.GRID_ID and d.DEL_FLAG = '0'
-        LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and d.DEL_FLAG = '0'
+        LEFT JOIN customer_grid gr on gr.ID = c.GRID_ID and gr.DEL_FLAG = '0'
+        LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and ag.DEL_FLAG = '0'
         <where>
              1 = 1
             and a.del_flag = '0'