From 7a2e1fd9e34ab58caf9fa8565e94dd9fcd174a1a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 12 六月 2021 17:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_excel610' into test_excel610
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 77d75e2..e93680a 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,10 +1,12 @@
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;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
@@ -38,17 +40,26 @@
private GridBuildRelationService gridBuildRelationService;
@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<GridBuildRelationDO> keyList = 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) {
+ 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();
- BeanUtils.copyProperties(vo, comMngBuildingDO);
+ BeanUtils.copyProperties(vo,comMngBuildingDO);
comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
@@ -58,9 +69,18 @@
comMngBuildingDO.setPath(path.toString());
comMngBuildingDO.setGridId(vo.getGridId());
list.add(comMngBuildingDO);
- GridBuildRelationDO gridBuildRelation = getGridBuildRelationDO(communityId, streetId, vo, comMngBuildingDO);
+ index ++;
+ GridBuildRelationDO gridBuildRelation = getGridBuildRelationDO(communityId, comMngVillageDO.getStreetId(), vo, comMngBuildingDO);
keyList.add(gridBuildRelation);
}
+
+ if(list.size()>0){
+ this.saveBatch(list);
+ }
+
+ if(errorList.size() > 0){
+ return R.fail(JSON.toJSONString(errorList));
+ }
gridBuildRelationService.saveBatchGridBuildRelation(keyList);
this.saveBatch(list);
return R.ok();
--
Gitblit v1.7.1