From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期一, 30 八月 2021 13:13:18 +0800 Subject: [PATCH] Merge branch 'test' into 'yuyue_dev' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java index aad74ff..4793173 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java @@ -1,5 +1,10 @@ package com.panzhihua.common.listen; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.fastjson.JSON; @@ -12,12 +17,8 @@ import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; -import lombok.extern.slf4j.Slf4j; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import lombok.extern.slf4j.Slf4j; /** * @description: 社区楼栋导入监听 @@ -25,24 +26,17 @@ */ @Slf4j public class ComMngBuildingExcelListen extends AnalysisEventListener<Map<Integer, String>> { - private CommunityService communityService; - - private GridService gridService; - - private Long communityId; - + private static final int BATCH_COUNT = 5000; private static int headSize = 0; - + List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>(); + private CommunityService communityService; + private GridService gridService; + private Long communityId; private Map<Integer, String> headData; - - public ComMngBuildingExcelListen(CommunityService communityService, Long communityId) { this.communityService = communityService; this.communityId = communityId; } - - private static final int BATCH_COUNT = 5000; - List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>(); @Override public void invoke(Map<Integer, String> data, AnalysisContext context) { @@ -124,7 +118,6 @@ vo.setBuildFloorSum(0); } - try { vo.setEveryFloorSum(oneData.get(9) == null ? 0 : Integer.valueOf(oneData.get(9))); } catch (Exception e1) { @@ -159,7 +152,8 @@ R r = communityService.listSaveBuildingExcelVO(voList, communityId); if (!R.isOk(r)) { String errMsg = r.getMsg(); - List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg, ComMngPopulationImportErrorVO.class); + List<ComMngPopulationImportErrorVO> errorList = + JSON.parseArray(errMsg, ComMngPopulationImportErrorVO.class); if (!errorList.isEmpty()) { populationImportErrorVOList.addAll(errorList); } @@ -172,7 +166,7 @@ } - }catch (NumberFormatException e){ + } catch (NumberFormatException e) { e.printStackTrace(); } } -- Gitblit v1.7.1