From 8b2bc3eac90efc57b978894b5b609a921d7f74c9 Mon Sep 17 00:00:00 2001 From: YUJT Date: Thu, 8 Jul 2021 16:36:32 +0800 Subject: [PATCH] update --- epdc-cloud-custom/pom.xml | 6 +++--- .../epidemic/controller/EpidemicUserInfoController.java | 6 +----- .../epidemic/service/impl/EpidemicUserInfoExportServer.java | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/epdc-cloud-custom/pom.xml b/epdc-cloud-custom/pom.xml index 80279de..0b10d55 100644 --- a/epdc-cloud-custom/pom.xml +++ b/epdc-cloud-custom/pom.xml @@ -220,9 +220,9 @@ true - mse-7be164015-p.nacos-ans.mse.aliyuncs.com:8848 - 115.28.104.30 - 95aea863-dcc6-4f75-b256-9a6061a30a40 + 192.168.0.59:8848 + 192.168.0.59 + 8831513c-2f72-42e8-899f-eb6c2c5ae110 192.168.0.59:9876 organizationGroup diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java index 01569b5..200ba1c 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.vaccine.epidemic.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.elink.esua.epdc.commons.tools.annotation.LogOperation; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -22,13 +21,10 @@ import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.List; import java.util.Map; @@ -94,7 +90,7 @@ public class EpidemicUserInfoController { public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { ExportParams exportParams = new ExportParams(); exportParams.setHeight((short) (2 * 256)); - ExcelUtils.exportBigExcel(StringUtils.EMPTY, params, exportServer, response, new ExportParams(), EpidecmicUserNewExcel.class); + ExcelUtils.exportBigExcel(StringUtils.EMPTY, params, exportServer, response, exportParams, EpidecmicUserNewExcel.class); } /* @GetMapping("export") diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java index f61c761..935eb3a 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java @@ -28,8 +28,8 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { @Override public List selectListForExcelExport(Object queryParams, int page) { Map params = (Map) queryParams; - params.put("excelBigDataPageSize", 50000); - params.put("excelBigDataPageIndex", (page - 1) * 50000); + params.put("excelBigDataPageSize", 30000); + params.put("excelBigDataPageIndex", (page - 1) * 30000); List recordList = epidemicUserInfoDao.getEpidemicUserRecordList(params); List targetList = new ArrayList<>(); if (CollUtil.isNotEmpty(recordList)) {