|
|
|
@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant; |
|
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|
|
|
import com.epmet.commons.tools.dto.result.OptionResultDTO; |
|
|
|
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.redis.common.CustomerOrgRedis; |
|
|
|
@ -45,7 +46,6 @@ import com.epmet.dto.result.InfoByNamesResultDTO; |
|
|
|
import com.epmet.entity.IcNeighborHoodEntity; |
|
|
|
import com.epmet.entity.IcNeighborHoodPropertyEntity; |
|
|
|
import com.epmet.entity.IcPropertyManagementEntity; |
|
|
|
import com.epmet.excel.IcBuildingExcel; |
|
|
|
import com.epmet.excel.IcNeighborHoodExcel; |
|
|
|
import com.epmet.service.IcNeighborHoodPropertyService; |
|
|
|
import com.epmet.service.IcNeighborHoodService; |
|
|
|
@ -226,10 +226,10 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
*/ |
|
|
|
public Result disposeImportNeighborhood(ImportInfoFormDTO formDTO, List<IcNeighborHoodExcel> result){ |
|
|
|
if (CollectionUtils.isEmpty(result)){ |
|
|
|
return new Result().error(9999,"excel表格内没有数据"); |
|
|
|
return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"excel表格内没有数据"); |
|
|
|
} |
|
|
|
List<Integer> nums = new ArrayList<>(); |
|
|
|
List<String> gridNames = result.stream().map(m -> m.getGridName()).distinct().collect(Collectors.toList()); |
|
|
|
List<String> gridNames = result.stream().map(IcNeighborHoodExcel::getGridName).distinct().collect(Collectors.toList()); |
|
|
|
// 1. 查询数据网格是否存在
|
|
|
|
List<InfoByNamesResultDTO> gridInfos = customerGridDao.selectGridInfoByNames(gridNames, formDTO.getCustomerId()); |
|
|
|
if (CollectionUtils.isEmpty(gridInfos)){ |
|
|
|
@ -238,7 +238,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
nums.add(i); |
|
|
|
} |
|
|
|
String str = String.format("共%s条，成功导入%s条。",result.size(),0); |
|
|
|
return new Result().error(9999,str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
} |
|
|
|
result.forEach(r -> { |
|
|
|
for (InfoByNamesResultDTO g : gridInfos) { |
|
|
|
@ -253,7 +253,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
// 只获取能查询到的网格
|
|
|
|
List<IcNeighborHoodExcel> neighborHoods = groupStatus.get(true); |
|
|
|
// 2. 查询组织选中组织下存在的小区
|
|
|
|
List<String> existNames = baseDao.selectNeighborhoodNameByNames(neighborHoods.stream().map(m -> m.getNeighborHoodName()).distinct().collect(Collectors.toList()), formDTO.getCustomerId()); |
|
|
|
List<String> existNames = baseDao.selectNeighborhoodNameByNames(neighborHoods.stream().map(IcNeighborHoodExcel::getNeighborHoodName).distinct().collect(Collectors.toList()), formDTO.getCustomerId()); |
|
|
|
// 为了显示多少行插入成功，未成功
|
|
|
|
result.forEach(r -> { |
|
|
|
for (String s : existNames) { |
|
|
|
@ -272,7 +272,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
nums.add(i); |
|
|
|
} |
|
|
|
String str = String.format("共%s条，成功导入%s条。",result.size(),0); |
|
|
|
return new Result().error(9999,str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
} |
|
|
|
if (formDTO.getOrgType().equals(CustomerGridConstant.AGENCY)){ |
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId()); |
|
|
|
@ -304,7 +304,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
nums.add(i); |
|
|
|
} |
|
|
|
String str = String.format("共%s条，成功导入%s条。",result.size(),0); |
|
|
|
return new Result().error(9999,str +"第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),str +"第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
} |
|
|
|
Map<String, Long> collect = finalNeedInsert.stream().collect(Collectors.groupingBy(o -> o.getGridName() + "_" + o.getNeighborHoodName(), Collectors.counting())); |
|
|
|
collect.forEach((k,v) -> { |
|
|
|
@ -368,7 +368,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
} |
|
|
|
String str = String.format("共%s条，成功导入%s条。",result.size(),entities.size()); |
|
|
|
if (CollectionUtils.isNotEmpty(nums)){ |
|
|
|
return new Result().error(9999,str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),str + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"行未成功!"); |
|
|
|
} |
|
|
|
return new Result().ok(str); |
|
|
|
} |
|
|
|
@ -406,4 +406,4 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
jianjun
4 years ago