From 8d27413c88d3bc5a552a6b31dc0648485f107350 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 27 Jul 2022 23:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=B9=B4=E9=BE=84->=E5=87=BA?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F=E9=87=8D=E5=A4=8D=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/IcUserController.java | 6 +++++- .../com/epmet/dataaggre/service/impl/ResiServiceImpl.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 63d686260c..98432996ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -17,6 +17,7 @@ import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; +import com.epmet.dataaggre.service.impl.ResiServiceImpl; import com.epmet.feign.EpmetHeartOpenFeignClient; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -41,7 +42,7 @@ public class IcUserController implements ResultDataResolver { private EpmetUserService epmetUserService; @Autowired - private ResiService icResiService; + private ResiServiceImpl icResiService; @Autowired private EpmetHeartOpenFeignClient heartOpenFeignClient; @@ -105,6 +106,9 @@ public class IcUserController implements ResultDataResolver { return new Result().ok(new PageData<>(new ArrayList<>(), 0)); } + // 对特殊规则进行转换。 + icResiService.specificRuleConvert(resiRule); + PageData page = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); return new Result>().ok(page); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 0df05a3831..8ea7d871d5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -75,9 +75,6 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { String client = EpmetRequestHolder.getLoginUserClient(); String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - // 对特殊规则进行转换。 - specificRuleConvert(resiRule); - // 查询当前组织及下级id路径 LoginUserDetailsResultDTO userDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO(app, client, userId)), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); @@ -148,7 +145,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { * 为特定的规则进行转换 * @param resiRule */ - private void specificRuleConvert(List resiRule) { + public void specificRuleConvert(List resiRule) { // 使用年龄计算出生日期 if (resiRule != null) { resiRule.stream().forEach((r) -> { @@ -267,6 +264,9 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { Integer pageSize = 500; Integer pageNo = 1; + // 对特殊规则进行转换。 + specificRuleConvert(resiRule); + try { do { PageData resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId,