Merge remote-tracking branch 'origin/dev_bugfix' into dev

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.*;
-import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 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<ApplyingGroupDetailResultDTO> applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){
+	public Result<ApplyingGroupDetailResult2DTO> applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){
 		groupIdFromDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(groupIdFromDTO);
 		return resiGroupService.applyGroupDetail(groupIdFromDTO);

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<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId);
+	Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId);
 
 	/**
 	 * @Description 建组申请-审核通过

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<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId) {
+	public Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId) {
 		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getApplyingGroupDetail", groupId);
 	}
 

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<ApplyingGroupDetailResultDTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO);
+	Result<ApplyingGroupDetailResult2DTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO);
 
 	/**
 	 * @Description 建组申请-审核通过-调用resi-group服务

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<ApplyingGroupDetailResultDTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO) {
+	public Result<ApplyingGroupDetailResult2DTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO) {
 		return resiGroupFeignClient.getApplyingGroupDetail(groupIdFromDTO);
 	}
 

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 = "";
 
 
     /**

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;
 }

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<List<ResiCommentResultDTO>> getCommentListOfTopicGov(@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
         ValidatorUtils.validateEntity(queryCommentFormDTO);
-        return commentService.getCommentList(null,queryCommentFormDTO);
+        return commentService.getCommentListGov(queryCommentFormDTO);
     }
 }

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<List<ResiTopicInfoResultDTO>> 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<List<ResiTopicInfoResultDTO>> 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<List<ResiTopicInfoResultDTO>> 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<List<ResiTopicInfoResultDTO>> 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<ResiTopicDetailResultDTO> getTopicDetailGov( @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
         ValidatorUtils.validateEntity(topicDetailFormDTO);
-        return topicService.getTopicDetail(null,topicDetailFormDTO.getTopicId());
+        return topicService.getTopicDetailGov(topicDetailFormDTO.getTopicId());
     }
 
 }

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<ResiTopicCommentEnt
      **/
     Result<List<ResiCommentResultDTO>> getCommentList(TokenDto tokenDto,ResiQueryCommentFormDTO commentFormDTO);
 
+    /**
+     * @Description 政府端得到某个话题的评论列表 分页
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 17:15
+     **/
+    Result<List<ResiCommentResultDTO>> getCommentListGov(ResiQueryCommentFormDTO commentFormDTO);
+
 }

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<ResiTopicEntity> {
      * @Author sun
      **/
     Result upResiTopic(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity entity);
+
+    /**
+     * @return Result<List < ResiTopicInfoResultDTO>>
+     * @Description 政府端 查看历史话题(分页, 允许状态筛选)
+     * @Param ResiTopicPageFormDTO.class
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO);
+
+    /**
+     * @return List<ResiTopicInfoResultDTO>
+     * @Description 政府端屏蔽话题列表查询
+     * @Param ResiTopicPageFormDTO.class
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    Result<List<ResiTopicInfoResultDTO>> getHiddenTopicsGov(ResiTopicPageFormDTO topicPageFormDTO);
+
+    /**
+     * @return ResiTopicDetailResultDTO
+     * @Description 查看话题详情
+     * @Param topicId
+     * @Author wangc
+     * @Date 2020.04.01 15:56
+     **/
+    Result<ResiTopicDetailResultDTO> getTopicDetailGov(String topicId);
+
 }

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<ResiTopicCommen
 
     }
 
+    /**
+     * @Description 政府端得到某个话题的评论列表 分页
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 17:15
+     **/
+    @Override
+    public Result<List<ResiCommentResultDTO>> getCommentListGov(ResiQueryCommentFormDTO commentFormDTO) {
+        return getCommentList(null,commentFormDTO);
+    }
+
 
 }

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<ResiTopicDao, ResiTopi
     public Result<List<ResiTopicInfoResultDTO>> 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<ResiTopicDao, ResiTopi
     public Result<List<ResiTopicInfoResultDTO>> 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<ResiTopicDao, ResiTopi
         return result;
     }
 
+    /**
+     * @return Result<List < ResiTopicInfoResultDTO>>
+     * @Description 政府端 查看历史话题(分页, 允许状态筛选)
+     * @Param ResiTopicPageFormDTO.class
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    @Override
+    public Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO) {
+        return getPastTopicList(null,topicPageFormDTO);
+    }
+
+    /**
+     * @return List<ResiTopicInfoResultDTO>
+     * @Description 政府端屏蔽话题列表查询
+     * @Param ResiTopicPageFormDTO.class
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    @Override
+    public Result<List<ResiTopicInfoResultDTO>> getHiddenTopicsGov(ResiTopicPageFormDTO topicPageFormDTO) {
+        return getHiddenTopics(null,topicPageFormDTO);
+    }
+
+    @Override
+    public Result<ResiTopicDetailResultDTO> getTopicDetailGov(String topicId) {
+        return getTopicDetail(null,topicId);
+    }
+
     /**
      * @Description 将缓存中的用户信息存放到话题列表当中
      * @Param  groupId