From 9914555f16c4b9331ea37ab49315b2f948a03ff3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 09:26:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=EF=BC=9A*=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=AD=97=E4=BD=93=E7=BA=A2?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPropertyManagementImportExcelData.java | 2 +- .../yantai/ic_property_management_temp.xlsx | Bin 10172 -> 10204 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index e172260c16..55196ffa18 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -14,7 +14,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ - @ExcelProperty(value = "物业名称") + @ExcelProperty(value = "*物业名称") private String name; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx index f0611d26b02afacb2c68d0be54f50c135b9baf1c..dce1bbfc28d71ebd307f27cc0c0462a4ee58708a 100644 GIT binary patch delta 4196 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 From 9431110e84ce6ef4f293fea1a5b598e8126cfcde Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 09:44:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=EF=BC=8C=E6=A5=BC=E9=95=BF?= =?UTF-8?q?=E5=8D=95=E5=85=83=E9=95=BF=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yt/CommunityBuildingManagerResultDTO.java | 33 ++++++ .../CommunityBuildingManagerController.java | 103 ++++++++++++++++++ .../PropertyManagementController.java | 2 +- ...ommunity_building_manager_import_temp.xlsx | Bin 0 -> 10704 bytes .../yantai/ic_property_management_temp.xlsx | Bin 10204 -> 10303 bytes 5 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java index ffb2fc69c8..7a591b1d12 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.dto.result.yt; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.io.Serializable; @@ -19,26 +22,34 @@ public class CommunityBuildingManagerResultDTO implements Serializable { /** * 主键（烟台需求） */ + @ExcelIgnore private String id; /** * 客户Id customer.id */ + @ExcelIgnore private String customerId; /** * 姓名 */ + @ExcelProperty(value = "姓名") + @ColumnWidth(20) private String name; /** * 联系电话 */ + @ExcelProperty(value = "联系电话") + @ColumnWidth(25) private String phone; /** * 身份证号 */ + @ExcelProperty(value = "证件号") + @ColumnWidth(30) private String idCard; /** @@ -49,50 +60,72 @@ public class CommunityBuildingManagerResultDTO implements Serializable { /** * 所属区县id；取名字关联customer_agency */ + @ExcelIgnore private String districtId; + @ExcelProperty(value = "所属区市") + @ColumnWidth(30) private String districtName; /** * 所属街道id；取名字关联customer_agency */ + @ExcelIgnore private String streetId; + @ExcelProperty(value = "所属镇街") + @ColumnWidth(30) private String streetName; /** * 所属社区id；取名字关联customer_agency */ + @ExcelIgnore private String communityId; + @ExcelProperty(value = "所属社区") + @ColumnWidth(30) private String communityName; /** * 所属网格id；取名字关联customer_grid */ + @ExcelIgnore private String gridId; + @ExcelProperty(value = "所属网格") + @ColumnWidth(30) private String gridName; /** * 网格的全路径，包含网格id */ + @ExcelIgnore private String orgIdPath; /** * 所属小区id */ + @ExcelIgnore private String viliageId; + @ExcelProperty(value = "所属小区") + @ColumnWidth(30) private String viliageName; /** * 所属楼栋id */ + @ExcelIgnore private String buildingId; + @ExcelProperty(value = "楼栋") + @ColumnWidth(20) private String buildingName; /** * 所属单元id; 单元长时必填此列 */ + @ExcelIgnore private String unitId; /** * 所属单元id; 单元长时必填此列 */ + @ExcelProperty(value = "单元") + @ColumnWidth(20) private String unitName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 264e37c895..771bcb1006 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -1,22 +1,45 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; import java.util.List; @@ -26,6 +49,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-05-06 */ +@Slf4j @RestController @RequestMapping("communityBuildingManager") public class CommunityBuildingManagerController { @@ -108,4 +132,83 @@ public class CommunityBuildingManagerController { return new Result(); } + /** + * 楼长单元长-下载导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "download-tem", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("楼长单元长导入模版", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/community_building_manager_import_temp.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + /** + * 楼长单元长-列表导出 + * + * @param tokenDto + * @param formDTO + * @param response + * @return + * @throws IOException + */ + @PostMapping("export") + public void exportCommunityBuildingManager(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "楼长单元长列表导出" + DateUtils.format(new Date()) + ".xlsx"; + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + headWriteCellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + FreezeAndFilter writeHandler = new FreezeAndFilter(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), CommunityBuildingManagerResultDTO.class) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .registerWriteHandler(writeHandler).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = communityBuildingManagerService.page(formDTO); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(data.getList(), writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(data.getList()) && data.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 result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("楼长单元长导出异常export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 0f171a308a..c3bff703b0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -178,7 +178,7 @@ public class PropertyManagementController implements ResultDataResolver { * @throws IOException */ @PostMapping("export") - public void exportEnterprise(@LoginUser TokenDto tokenDto, @RequestBody IcPropertyManagementFormDTO formDTO, HttpServletResponse response) throws IOException { + public void exportIcPropertyManagement(@LoginUser TokenDto tokenDto, @RequestBody IcPropertyManagementFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fe4242960d6c8691ed7a67875317c48a550c202b GIT binary patch literal 10704 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 literal 0 HcmV?d00001 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx index dce1bbfc28d71ebd307f27cc0c0462a4ee58708a..c219d94ab5477bb859a8a0780e9b04182bb01a25 100644 GIT binary patch delta 4299 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 Date: Tue, 9 May 2023 09:48:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=EF=BC=8C=E6=A5=BC=E9=95=BF?= =?UTF-8?q?=E5=8D=95=E5=85=83=E9=95=BF=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java index 7a591b1d12..dc4414daa4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -48,7 +48,7 @@ public class CommunityBuildingManagerResultDTO implements Serializable { /** * 身份证号 */ - @ExcelProperty(value = "证件号") + @ExcelProperty(value = "身份证号") @ColumnWidth(30) private String idCard;