From 1d6e4d5319bfb8c2e4eabbc1659ada7f61c8d176 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 28 Nov 2022 17:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E7=9A=84items=E6=89=80=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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); }