From ec584b22c5756b8a2bdad9dcd0830c52d698784d Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 11 六月 2021 20:24:30 +0800
Subject: [PATCH] 实有人口导入
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java
index 0e7e3b0..0281394 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
@@ -32,12 +33,22 @@
private ComActDAO comActDAO;
@Override
- public R batchSaveBuilding(List<ComMngBuildingExcelVO> newVoList, Long communityId, Long streetId) {
+ public R batchSaveBuilding(List<ComMngBuildingExcelVO> newVoList, Long communityId) {
ArrayList<ComMngBuildingDO> list = Lists.newArrayList();
+ int index = 2;
+ List<ComMngPopulationImportErrorVO> errorList = new ArrayList<>();
for(ComMngBuildingExcelVO vo:newVoList){
ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getAlley()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
if(comMngVillageDO == null){
+ continue;
+ }
+ List<ComMngBuildingDO> buildingDOList = this.baseMapper.selectList(new QueryWrapper<ComMngBuildingDO>().eq("street_id",comMngVillageDO.getStreetId()).eq("act_id",communityId).eq("village_id",comMngVillageDO.getVillageId()).eq("name",vo.getName()));
+ if(buildingDOList.size() > 0){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("重复楼栋");
+ importErrorVO.setErrorPosition("第" + index + "行");
+ errorList.add(importErrorVO);
continue;
}
ComMngBuildingDO comMngBuildingDO = new ComMngBuildingDO();
@@ -51,9 +62,16 @@
comMngBuildingDO.setPath(path.toString());
comMngBuildingDO.setGridId(null);
list.add(comMngBuildingDO);
+ index ++;
}
- this.saveBatch(list);
+ if(list.size()>0){
+ this.saveBatch(list);
+ }
+
+ if(errorList.size() > 0){
+ return R.fail(JSON.toJSONString(errorList));
+ }
return R.ok();
}
}
--
Gitblit v1.7.1