From b4500939adc733efbaa4cecf4f8252172dcfb42c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 17 Nov 2020 16:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/IssueVoteDetailDao.java | 2 ++ .../impl/IssueVoteStatisticalServiceImpl.java | 15 ++++++++++++ .../resources/mapper/IssueVoteDetailDao.xml | 16 +++++++++++++ .../dto/topic/form/MyPartIssueFormDTO.java | 17 ++++++++++++++ .../topic/result/MyPartIssueResultDTO.java | 23 +++++++++++++++++++ .../group/feign/ResiGroupOpenFeignClient.java | 11 +++++++++ .../ResiGroupOpenFeignClientFallback.java | 7 ++++++ .../topic/controller/ResiTopicController.java | 11 +++++++++ .../epmet/modules/topic/dao/ResiTopicDao.java | 13 +++++++---- .../topic/service/ResiTopicService.java | 8 +++++++ .../service/impl/ResiTopicServiceImpl.java | 17 ++++++++++++++ .../resources/mapper/topic/ResiTopicDao.xml | 12 ++++++++++ 12 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/MyPartIssueFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyPartIssueResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java index e1d7cfbddf..e1779a1720 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java @@ -82,4 +82,6 @@ public interface IssueVoteDetailDao extends BaseDao { * @date 2020/11/10 10:01 上午 */ List myPartIssues(@Param("userId")String userId); + + List myPartIssuesByTopicId(@Param("topicIds")List topicIds); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 7f678ba465..bece3fd200 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -44,6 +44,9 @@ import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.redis.IssueVoteDetailRedis; import com.epmet.redis.IssueVoteStatisticalRedis; +import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO; +import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.IssueVoteDetailService; import com.epmet.service.IssueVoteStatisticalService; import com.epmet.utils.ModuleConstants; @@ -90,6 +93,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl page(Map params) { @@ -545,6 +550,16 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) { List myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId()); + MyPartIssueFormDTO formDTO = new MyPartIssueFormDTO(); + formDTO.setUserId(myPartIssuesFormDTO.getUserId()); + Result myPartIssueResult = resiGroupOpenFeignClient.selectMyPartTopic(formDTO); + if (!myPartIssueResult.success()){ + throw new RenException("查询我评论过的话题失败......"); + } + if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){ + List myPartIssuesResultDTOS = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); + myPartIssuesResult.addAll(myPartIssuesResultDTOS); + } if (CollectionUtils.isEmpty(myPartIssuesResult)){ return new ArrayList<>(); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml index 523dd1cb63..d5f4e8bc80 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml @@ -87,4 +87,20 @@ AND vd.CREATED_BY = #{userId} ORDER BY i.CREATED_TIME DESC + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/MyPartIssueFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/MyPartIssueFormDTO.java new file mode 100644 index 0000000000..98e5100d07 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/MyPartIssueFormDTO.java @@ -0,0 +1,17 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/11/17 3:29 下午 + */ +@Data +public class MyPartIssueFormDTO implements Serializable { + + private static final long serialVersionUID = -632199437101523924L; + + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyPartIssueResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyPartIssueResultDTO.java new file mode 100644 index 0000000000..35759b6bbc --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyPartIssueResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2020/11/17 3:30 下午 + */ +@Data +public class MyPartIssueResultDTO implements Serializable { + + private static final long serialVersionUID = -7726879551303168135L; + + private List topicIds; + + public MyPartIssueResultDTO() { + this.topicIds = new ArrayList<>(); + } +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index ba705a5893..18354eb21c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -6,9 +6,11 @@ import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO; import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO; +import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO; import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO; import com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO; +import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; @@ -71,4 +73,13 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/topic/select-my-create-topic") Result> selectMyCreateTopic(@RequestBody TopicIdListFormDTO topicIdListFormDTO); + + /** + * @Description 查询我评论过的话题 + * @Param myPartIssueFormDTO + * @author zxc + * @date 2020/11/17 3:34 下午 + */ + @PostMapping("resi/group/topic/myparttopic") + Result selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 636acafb0e..ab936aa96e 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -7,8 +7,10 @@ import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO; import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO; +import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO; import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO; +import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; @@ -49,4 +51,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyCreateTopic", topicIdListFormDTO); } + + @Override + public Result selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyPartTopic", myPartIssueFormDTO); + } } 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 4c7d08ba93..bb8a8d4b9d 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 @@ -296,5 +296,16 @@ public class ResiTopicController { return new Result>().ok(topicService.selectMyCreateTopic(topicIdListFormDTO)); } + /** + * @Description 查询我评论过的话题 + * @Param myPartIssueFormDTO + * @author zxc + * @date 2020/11/17 3:34 下午 + */ + @PostMapping("myparttopic") + public Result selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO){ + return new Result().ok(topicService.selectMyPartTopic(myPartIssueFormDTO)); + } + } 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 701661cac4..d0d50cea9a 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 @@ -22,11 +22,8 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.TopicInfoDTO; -import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO; -import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; -import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; +import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.*; -import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -179,4 +176,12 @@ public interface ResiTopicDao extends BaseDao { * @date 2020/11/13 4:32 下午 */ List selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO); + + /** + * @Description 查询我评论过的话题 + * @Param myPartIssueFormDTO + * @author zxc + * @date 2020/11/17 3:34 下午 + */ + List selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO); } \ 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 dbd533439e..fd1e965263 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 @@ -287,4 +287,12 @@ public interface ResiTopicService extends BaseService { * @date 2020/11/13 4:32 下午 */ List selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO); + + /** + * @Description 查询我评论过的话题 + * @Param myPartIssueFormDTO + * @author zxc + * @date 2020/11/17 3:34 下午 + */ + MyPartIssueResultDTO selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO); } \ 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 dbdfc2f200..c9aa730284 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 @@ -1487,6 +1487,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) { return baseDao.selectMyCreateTopic(topicIdListFormDTO); } + + /** + * @Description 查询我评论过的话题 + * @Param myPartIssueFormDTO + * @author zxc + * @date 2020/11/17 3:34 下午 + */ + @Override + public MyPartIssueResultDTO selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO) { + List topicIds = baseDao.selectMyPartTopic(myPartIssueFormDTO); + if (CollectionUtils.isEmpty(topicIds)){ + return new MyPartIssueResultDTO(); + } + MyPartIssueResultDTO myPartIssueResultDTO = new MyPartIssueResultDTO(); + myPartIssueResultDTO.setTopicIds(topicIds); + return myPartIssueResultDTO; + } } 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 5f68af2e92..16db55e31f 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 @@ -508,5 +508,17 @@ AND STATUS = 'discussing' AND created_by = #{userId} + + +