diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 2486b306f0..05e7b81853 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -373,13 +373,25 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res c.setImportTag(importTag); newlyOrChangedResi.set(c); - List resiCategoryItems = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listResiCategoryItems(customerId), + // 查询居民类别的字段->中文的map + //List resiCategoryItems = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listResiCategoryItems(customerId), + // ServiceConstant.OPER_CUSTOMIZE_SERVER, + // EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + // String.format("【居民信息导入】查询居民类别items失败,customerId:%s", customerId), + // "居民信息导入失败"); + // + //Map columnNameAndLabel = resiCategoryItems.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel())); + + IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO(); + sfdto.setCustomerId(customerId); + + List categoryListResult = getResultDataOrThrowsException(operCustomizeOpenFeignClient.getCategoryList(sfdto), ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - String.format("【居民信息导入】查询居民类别items失败,customerId:%s", customerId), + String.format("【居民信息导入】初始化居民类别items失败,customerId:%s", customerId), "居民信息导入失败"); - Map columnNameAndLabel = resiCategoryItems.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel())); + Map columnNameAndLabel = categoryListResult.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel())); resiCategoryColumnNameAndLabel.set(columnNameAndLabel); }