From 8b513b3bee9cf64199556ea91cad3b2d62aabdb3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 12:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B0=86=E5=B1=85=E6=B0=91=E7=AB=AF=E5=92=8C=E6=94=BF?= =?UTF-8?q?=E5=BA=9C=E7=AB=AF=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiGroupController.java | 8 ++--- .../com/epmet/feign/ResiGroupFeignClient.java | 10 ++---- .../ResiGroupFeignClientFallBack.java | 8 ++--- .../com/epmet/service/ResiGroupService.java | 8 ++--- .../service/impl/ResiGroupServiceImpl.java | 8 ++--- .../result/ApplyingGroupDetailResult2DTO.java | 2 +- .../dto/topic/form/ResiTopicPageFormDTO.java | 1 + .../controller/ResiCommentController.java | 2 +- .../topic/controller/ResiTopicController.java | 8 +++-- .../service/ResiTopicCommentService.java | 9 +++++ .../topic/service/ResiTopicService.java | 28 +++++++++++++++ .../impl/ResiTopicCommentServiceImpl.java | 12 +++++++ .../service/impl/ResiTopicServiceImpl.java | 34 +++++++++++++++++-- 13 files changed, 99 insertions(+), 39 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index e28a91d374..967e9776dd 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -5,14 +5,10 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; -import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; -import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; import com.epmet.service.ResiGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -90,7 +86,7 @@ public class ResiGroupController { * @Date 2020.04.20 14:08 **/ @PostMapping("applygroupdetail") - public Result applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){ + public Result applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){ groupIdFromDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(groupIdFromDTO); return resiGroupService.applyGroupDetail(groupIdFromDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java index 2978f72a86..4449e64962 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -7,19 +7,15 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; -import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; + import java.util.List; @@ -75,7 +71,7 @@ public interface ResiGroupFeignClient { * @Date 2020.04.20 14:08 **/ @PostMapping("/resi/group/group/getapplyinggroupdetail") - Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId); + Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId); /** * @Description 建组申请-审核通过 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index 8cae519fd5..b4fe70ea34 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -8,12 +8,8 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; -import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; @@ -64,7 +60,7 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { * @Date 2020.04.20 14:08 **/ @Override - public Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId) { + public Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getApplyingGroupDetail", groupId); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java index bc605971c0..02dc4e458d 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java @@ -3,12 +3,8 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; -import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; import java.util.List; @@ -58,7 +54,7 @@ public interface ResiGroupService { * @Author wangc * @Date 2020.04.20 14:08 **/ - Result applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO); + Result applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO); /** * @Description 建组申请-审核通过-调用resi-group服务 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java index f05619c012..28cb001f5e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java @@ -4,12 +4,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; -import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; import com.epmet.service.ResiGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,7 +43,7 @@ public class ResiGroupServiceImpl implements ResiGroupService{ } @Override - public Result applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO) { + public Result applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO) { return resiGroupFeignClient.getApplyingGroupDetail(groupIdFromDTO); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java index c07869dbe4..bb48e14b91 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java @@ -55,7 +55,7 @@ public class ApplyingGroupDetailResult2DTO implements Serializable { /** * 驳回理由 * */ - private String rejectReason; + private String rejectReason = ""; /** diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java index 13b1904122..aa4a9c6398 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java @@ -42,5 +42,6 @@ public class ResiTopicPageFormDTO implements Serializable{ /** * 用户Id * */ + @NotBlank(message = "用户Id不能为空") private String userId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java index bbb8188665..3c214ff828 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java @@ -68,6 +68,6 @@ public class ResiCommentController { @PostMapping("getcommentlistoftopicgov") public Result> getCommentListOfTopicGov(@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ ValidatorUtils.validateEntity(queryCommentFormDTO); - return commentService.getCommentList(null,queryCommentFormDTO); + return commentService.getCommentListGov(queryCommentFormDTO); } } 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 3114599050..4bc5da215b 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 @@ -69,6 +69,7 @@ public class ResiTopicController { **/ @PostMapping("getpasttopiclist") public Result> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return topicService.getPastTopicList(tokenDto,topicPageFormDTO); } @@ -111,6 +112,7 @@ public class ResiTopicController { **/ @PostMapping("gethiddentopic") Result> getHiddenTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return topicService.getHiddenTopics(tokenDto,topicPageFormDTO); } @@ -153,7 +155,7 @@ public class ResiTopicController { @PostMapping("gethiddentopicgov") public Result> getHiddenTopicGov(@RequestBody ResiTopicPageFormDTO topicPageFormDTO){ ValidatorUtils.validateEntity(topicPageFormDTO); - return topicService.getHiddenTopics(null,topicPageFormDTO); + return topicService.getHiddenTopicsGov(topicPageFormDTO); } /** @@ -167,7 +169,7 @@ public class ResiTopicController { @PostMapping("getpasttopiclistgov") public Result> getPastTopicListGov(@RequestBody ResiTopicPageFormDTO topicPageFormDTO){ ValidatorUtils.validateEntity(topicPageFormDTO); - return topicService.getPastTopicList(null,topicPageFormDTO); + return topicService.getPastTopicListGov(topicPageFormDTO); } /** * @Description 政府端群组管理-获取话题详情 @@ -180,7 +182,7 @@ public class ResiTopicController { @PostMapping("gettopicdetailgov") public Result getTopicDetailGov( @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){ ValidatorUtils.validateEntity(topicDetailFormDTO); - return topicService.getTopicDetail(null,topicDetailFormDTO.getTopicId()); + return topicService.getTopicDetailGov(topicDetailFormDTO.getTopicId()); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java index f0656d3d93..107fffcc73 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java @@ -119,4 +119,13 @@ public interface ResiTopicCommentService extends BaseService> getCommentList(TokenDto tokenDto,ResiQueryCommentFormDTO commentFormDTO); + /** + * @Description 政府端得到某个话题的评论列表 分页 + * @Param ResiQueryCommentFormDTO + * @return Result> + * @Author wangc + * @Date 2020.04.01 17:15 + **/ + Result> getCommentListGov(ResiQueryCommentFormDTO commentFormDTO); + } \ 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 9bfd82fe86..b15e4b6b44 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 @@ -189,4 +189,32 @@ public interface ResiTopicService extends BaseService { * @Author sun **/ Result upResiTopic(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity entity); + + /** + * @return Result> + * @Description 政府端 查看历史话题(分页, 允许状态筛选) + * @Param ResiTopicPageFormDTO.class + * @Author wangc + * @Date 2020.04.01 10:36 + **/ + Result> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO); + + /** + * @return List + * @Description 政府端屏蔽话题列表查询 + * @Param ResiTopicPageFormDTO.class + * @Author wangc + * @Date 2020.04.01 16:45 + **/ + Result> getHiddenTopicsGov(ResiTopicPageFormDTO topicPageFormDTO); + + /** + * @return ResiTopicDetailResultDTO + * @Description 查看话题详情 + * @Param topicId + * @Author wangc + * @Date 2020.04.01 15:56 + **/ + Result getTopicDetailGov(String topicId); + } \ 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/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index 9fc3289632..81a4500ca8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -220,5 +220,17 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl> + * @Author wangc + * @Date 2020.04.01 17:15 + **/ + @Override + public Result> getCommentListGov(ResiQueryCommentFormDTO commentFormDTO) { + return getCommentList(null,commentFormDTO); + } + } \ 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 376619f004..0733a02226 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 @@ -29,7 +29,6 @@ import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.constant.GroupMemberConstant; @@ -319,7 +318,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { //1.查询历史话题列表 - topicPageFormDTO.setUserId(tokenDto.getUserId()); + topicPageFormDTO.setUserId(topicPageFormDTO.getUserId()); topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); @@ -557,7 +556,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getHiddenTopics(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { //1.查询屏蔽话题列表 - topicPageFormDTO.setUserId(tokenDto.getUserId()); + topicPageFormDTO.setUserId(topicPageFormDTO.getUserId()); topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); topicPageFormDTO.setStatus(TopicConstant.HIDDEN); @@ -695,6 +694,35 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> + * @Description 政府端 查看历史话题(分页, 允许状态筛选) + * @Param ResiTopicPageFormDTO.class + * @Author wangc + * @Date 2020.04.01 10:36 + **/ + @Override + public Result> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO) { + return getPastTopicList(null,topicPageFormDTO); + } + + /** + * @return List + * @Description 政府端屏蔽话题列表查询 + * @Param ResiTopicPageFormDTO.class + * @Author wangc + * @Date 2020.04.01 16:45 + **/ + @Override + public Result> getHiddenTopicsGov(ResiTopicPageFormDTO topicPageFormDTO) { + return getHiddenTopics(null,topicPageFormDTO); + } + + @Override + public Result getTopicDetailGov(String topicId) { + return getTopicDetail(null,topicId); + } + /** * @Description 将缓存中的用户信息存放到话题列表当中 * @Param groupId