From 7163c1b0e0797d2e7a19fd3e0139e83f3c8d06d6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Dec 2021 14:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8map=20=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=87=8C=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 2 +- .../UserPointStatisticalDailyServiceImpl.java | 27 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 73b56ef7a0..047a16e87b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -335,7 +335,7 @@ public interface DataStatisticalOpenFeignClient { /** * 事件上报 * @Param formDTO - * @Return {@link Result>} + * @Return {@link Result>} * @Author zhaoqifeng * @Date 2021/10/15 16:50 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index e7b476d99d..45ac10f2ba 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -202,18 +203,22 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList()); //查询用户昵称 - Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); - boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); - - for (int i = NumConstant.ZERO; i < rankList.size(); i++) { - ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class); + Result> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + Map userInfoMap = new HashMap<>(); + if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){ + userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1,o2)->o1)); + } + for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) { + ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class); ResiPointRankingResultDTO target = new ResiPointRankingResultDTO(); - target.setRanking(rankList.get(i).getRank()); - target.setPoint(rankList.get(i).getTotalPoint()); - if(userRequestCallback) { - target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname()); - target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl()); + target.setRanking(resiPointRankResultDTO.getRank()); + target.setPoint(resiPointRankResultDTO.getTotalPoint()); + target.setNickname(StrConstant.EPMETY_STR); + target.setHeadImgUrl(StrConstant.EPMETY_STR); + UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId()); + if (infoResultDTO != null) { + target.setNickname(infoResultDTO.getNickname()); + target.setHeadImgUrl(infoResultDTO.getHeadImgUrl()); } resultObj.setRankList(target); result.add(resultObj);