From c0f75fbb52aa973aa13a15bb42b3669e245ed8bd Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 18 Apr 2024 14:08:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E6=97=A5=E5=BF=97=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=86=85=E5=AE=B9=E6=8B=BC=E6=8E=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/PageBannerOperationLogResp.java | 7 +++++- .../impl/BannerOperationLogServiceImpl.java | 22 +------------------ 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageBannerOperationLogResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageBannerOperationLogResp.java index 4bdafede..79e1a00a 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageBannerOperationLogResp.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageBannerOperationLogResp.java @@ -42,7 +42,12 @@ public class PageBannerOperationLogResp { /** * 操作人 */ - private String updateBy; + private Long updateBy; + + /** + * 操作人名称 + */ + private String updateByName; /** * 操作类型 diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerOperationLogServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerOperationLogServiceImpl.java index 74564d62..cea28cb0 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerOperationLogServiceImpl.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerOperationLogServiceImpl.java @@ -1,14 +1,10 @@ package cn.axzo.nanopart.server.service.impl; -import cn.axzo.basics.common.BeanMapper; -import cn.axzo.basics.profiles.dto.basic.BasicDto; -import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.axzo.nanopart.api.request.CreateBannerOperationLogReq; import cn.axzo.nanopart.api.request.PageBannerOperationLogReq; import cn.axzo.nanopart.api.response.PageBannerOperationLogResp; import cn.axzo.nanopart.server.domain.BannerOperationLog; import cn.axzo.nanopart.server.mapper.BannerOperationLogDao; -import cn.axzo.nanopart.server.rpc.ProfileGateway; import cn.axzo.nanopart.server.service.BannerOperationLogService; import cn.axzo.pokonyan.dao.converter.PageConverter; import cn.hutool.core.bean.BeanUtil; @@ -19,11 +15,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; /** * @author chenwenjian @@ -35,8 +27,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class BannerOperationLogServiceImpl extends ServiceImpl implements BannerOperationLogService { - private final ProfileGateway profileGateway; - @Override public Long create(CreateBannerOperationLogReq req) { BannerOperationLog bannerOperationLog = BeanUtil.copyProperties(req, BannerOperationLog.class); @@ -57,17 +47,7 @@ public class BannerOperationLogServiceImpl extends ServiceImpl(); } - List personIds = logPage.getRecords().stream() - .map(BannerOperationLog::getUpdateBy) - .distinct() - .collect(Collectors.toList()); - - List profiles = profileGateway.getProfiles(personIds); - Map personProfileDtoMap = profiles.stream().collect(Collectors.toMap(BasicDto::getId, Function.identity())); - return PageConverter.convert(logPage, record -> BeanMapper.copyBean(record, PageBannerOperationLogResp.class, (source, target) -> { - PersonProfileDto person = personProfileDtoMap.get(source.getUpdateBy()); - target.setUpdateBy(Objects.isNull(person.getRealName())? "-" : person.getRealName()); - })); + return PageConverter.convert(logPage, record -> BeanUtil.copyProperties(record, PageBannerOperationLogResp.class)); } /**