diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java index 4a7efdb5ce..9d87df97a8 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java @@ -22,9 +22,9 @@ public class LatestIssueListResultDTO implements Serializable { */ private String issueTitle = ""; /** - * 话题内容 + * 话题转议题组长输入的建议 */ - private String topicContent = ""; + private String suggestion = ""; /** * 用户头像 */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index e16fbaaf6b..632d72b70e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -66,7 +66,6 @@ public interface IssueConstant { String REDIS_KEY = "epmet:issue:"; String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败"; - String SELECT_RESI_GROUP_EXCEPTION = "获取话题数据失败"; /** * 议题表决缓存属性值 supportAmount diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java index e58bb4eb81..26a4e01d16 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -62,14 +62,6 @@ public interface ResiGroupFeignClient { @PostMapping("/resi/group/topic/checktopicpublisher") Result checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO); - /** - * @param topicIdList - * @Author sun - * @Description 批量查询话题信息 - **/ - @PostMapping("/resi/group/topic/gettopiclist/{topicIdList}") - Result> getTopicList(@PathVariable("topicIdList") List topicIdList); - /** * @Description 得到一个网格下的应表数 * @param gridIdFormDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index b2e646ae20..93191c3b9b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -45,11 +45,6 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkTopicPublisher", formDTO); } - @Override - public Result> getTopicList(List topicIdList) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicList", topicIdList); - } - @Override public Result votableCount(CommonGridIdFormDTO gridIdFormDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "votableCount", gridIdFormDTO); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 64908c6f3c..07eabdef4d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -659,19 +659,12 @@ public class IssueServiceImpl extends BaseServiceImpl imp } List userInfoList = listResult.getData(); - //3:调用resi-group服务,批量查询话题内容 - List topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList()); - Result> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList); - if (!resultTopicList.success() || null == resultTopicList.getData()) { - throw new RenException(IssueConstant.SELECT_RESI_GROUP_EXCEPTION); - } - List topicList = resultTopicList.getData(); - - //4:遍历组装对象 + //3:遍历组装对象 entityList.forEach(issue -> { LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO(); resultDTO.setIssueId(issue.getId()); resultDTO.setIssueTitle(issue.getIssueTitle()); + resultDTO.setSuggestion(issue.getSuggestion()); resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000); userInfoList.forEach(user -> { if (issue.getCreatedBy().equals(user.getUserId())) { @@ -680,12 +673,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp resultDTO.setIssuePublisherName(user.getShowName()); } }); - topicList.forEach(topic -> { - if (issue.getSourceId().equals(topic.getId())) { - //话题内容 - resultDTO.setTopicContent(topic.getTopicContent()); - } - }); returnList.add(resultDTO); }); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index 2ed9de8661..bae7b455c8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -259,15 +259,4 @@ public class ResiTopicController { ValidatorUtils.validateEntity(formDTO); return new Result().ok(topicService.checkTopicPublisher(formDTO)); } - - /** - * @param topicIdList - * @return - * @Author sun - * @Description 批量查询话题信息 - **/ - @PostMapping(value = "gettopiclist/{topicIdList}") - public Result> getTopicList(@PathVariable("topicIdList") List topicIdList){ - return new Result>().ok(topicService.getTopicList(topicIdList)); - } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index f09e2b6d3f..9c3b87d48f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -153,11 +153,4 @@ public interface ResiTopicDao extends BaseDao { */ CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); - /** - * @param topicIdList - * @return - * @Author sun - * @Description 批量查询话题信息 - **/ - List selectTopicListById(@Param("topicIdList") List topicIdList); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 4fc298ad81..08b8e89fd9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -264,11 +264,4 @@ public interface ResiTopicService extends BaseService { */ CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); - /** - * @param topicIdList - * @return - * @Author sun - * @Description 批量查询话题信息 - **/ - List getTopicList(List topicIdList); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 9c6ecbc007..718fe179a5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1167,17 +1167,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicList(List topicIdList) { - return baseDao.selectTopicListById(topicIdList); - } - } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index e557f84fb5..c8420f242f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -446,17 +446,5 @@ AND created_by = #{createdBy} AND id = #{topicId} - -