From c1ec604dc7ac57e5deaa101536e943d173e5f747 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 17:14:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E8=A1=A8=E5=86=B3?= =?UTF-8?q?=E4=B8=AD=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8=E3=80=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/GovProjectOpenFeignClient.java | 8 +++++++ .../GovProjectOpenFeignClientFallback.java | 12 +++++++++++ .../epmet/controller/IcEventController.java | 14 ++++++++++++- .../com/epmet/service/IcEventService.java | 7 +++++++ .../service/impl/IcEventServiceImpl.java | 12 +++++++++++ .../com/epmet/dto/result/HallIcEventDTO.java | 9 +++++++- .../dto/result/VotingIssueListResultDTO.java | 2 +- .../epmet/service/impl/IssueServiceImpl.java | 21 +++++++++++++++---- 8 files changed, 78 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 7907ac7ec5..c86a871a8a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; @@ -178,4 +179,11 @@ public interface GovProjectOpenFeignClient { @PostMapping("gov/project/project/staffpendingproject") Result> staffPendingProject(@RequestBody ProjectListFromDTO formDTO); + /** + * 批量查询事件信息 + * @param icEventIds + * @return + */ + @PostMapping("gov/project/icEvent/batchSelectById") + Result> batchSelectById(@RequestBody List icEventIds); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 51f7922ba5..5854347118 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; @@ -174,4 +175,15 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result> staffPendingProject(ProjectListFromDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "staffPendingProject",formDTO); } + + /** + * 批量查询事件信息 + * + * @param icEventIds + * @return + */ + @Override + public Result> batchSelectById(List icEventIds) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index d26aec98e5..c0a2924c84 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -542,6 +542,18 @@ public class IcEventController { return new Result>().ok(icEventService.icEventPageUserReported(formDTO)); } - + /** + * 批量查询事件信息 + * + * @param icEventIds + * @return + */ + @PostMapping("gov/project/icEvent/batchSelectById") + public Result> batchSelectById(@RequestBody List icEventIds) { + if (CollectionUtils.isEmpty(icEventIds)) { + return new Result<>(); + } + return new Result>().ok(icEventService.batchSelectById(icEventIds)); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index ede1854804..7421853c13 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -230,4 +230,11 @@ public interface IcEventService extends BaseService { * @param formDTO */ void icEventToIssue(IcEventToIssueFormDTO formDTO); + + /** + * 批量查询事件信息 + * @param icEventIds + * @return + */ + List batchSelectById(List icEventIds); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index ae897745f5..916b57661d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1803,4 +1803,16 @@ public class IcEventServiceImpl extends BaseServiceImpl batchSelectById(List icEventIds) { + Listlist=baseDao.selectBatchIds(icEventIds); + return ConvertUtils.sourceToTarget(list,IcEventDTO.class); + } + } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java index dba0b2cac3..37abb5cd03 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java @@ -12,6 +12,13 @@ import java.io.Serializable; @Data public class HallIcEventDTO implements Serializable { private static final long serialVersionUID = -6245586010939647194L; - // todo + /** + * 事件Id + */ + private String icEventId; + /** + * 事件内容 + */ + private String eventContent; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 807a98e55c..4025307ca0 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -73,7 +73,7 @@ public class VotingIssueListResultDTO implements Serializable { /** * 话题信息-2022.10.10 */ - private TopicInfoDTO topicInfoDTO; + private TopicInfoDTO topicInfo; /** * 事件信息-2022.10.10 */ diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 025349791a..528a7da03a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constat.HallConstat; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.IssueSuggestionDTO; import com.epmet.dto.TopicInfoDTO; import com.epmet.dto.form.*; @@ -443,14 +444,26 @@ public class IssueServiceImpl implements IssueService { topicInfoDTO.setTopicVoices(rr.getTopicVoices()); topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); topicInfoDTO.setReleaseTime(rr.getReleaseTime()); - vi.setTopicInfoDTO(topicInfoDTO); + vi.setTopicInfo(topicInfoDTO); }); } } - //来源于事件的 + // 来源于事件的 List icEventIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(icEventIds)){ - // todo 查询事件详情 + if (!CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) { + Map eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getId, o -> o, (o1, o2) -> o1)); + votingIssueList.forEach(vi -> { + IcEventDTO event = eventMap.get(vi.getSourceId()); + if (null != event) { + HallIcEventDTO hallIcEventDTO = new HallIcEventDTO(); + hallIcEventDTO.setIcEventId(event.getId()); + hallIcEventDTO.setEventContent(event.getEventContent()); + vi.setIcEventInfo(hallIcEventDTO); + } + }); + } } } return votingIssueList;