From 933df5a0efd3e2cbbbf3f0eb4bbcf8f85ed4f4c6 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 7 Apr 2020 15:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8Cgetlatesttentopics=E6=94=B9=E6=88=90getlatest?= =?UTF-8?q?topics=EF=BC=8C=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=B0=81?= =?UTF-8?q?=E8=A3=85=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResiTopicCancelHiddenFormDTO.java | 24 ++++++ .../topic/form/ResiTopicPublishFormDTO.java | 2 - .../result/ResiTopicDetailResultDTO.java | 10 +++ .../resi-group/resi-group-server/pom.xml | 2 +- .../modules/group/redis/ResiGroupRedis.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 2 - .../topic/controller/ResiTopicController.java | 10 +-- .../topic/service/ResiTopicService.java | 2 +- .../impl/ResiTopicCommentServiceImpl.java | 9 ++- .../service/impl/ResiTopicServiceImpl.java | 33 +++++--- .../epmet/modules/utils/ModuleConstant.java | 40 ++++++++++ .../mapper/topic/ResiTopicCommentDao.xml | 1 + .../resources/mapper/topic/ResiTopicDao.xml | 80 +++++++++++++------ 13 files changed, 164 insertions(+), 53 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java new file mode 100644 index 0000000000..70a52582e0 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @ClassName ResiTopicCancelHiddenFormDTO + * @Author wangc + * @date 2020.04.07 15:10 + */ +@Data +public class ResiTopicCancelHiddenFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 需要解除屏蔽的话题Id集合 + * */ + private List topicIds; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java index f1a449462a..fffdf92d53 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java @@ -32,13 +32,11 @@ public class ResiTopicPublishFormDTO implements Serializable { /** * 经度 * */ - @NotBlank(message = "缺失经纬度信息") private String longitude; /** * 纬度 * */ - @NotBlank(message = "缺失经纬度信息") private String dimension; /** diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java index 6080016569..167730aaab 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java @@ -36,11 +36,21 @@ public class ResiTopicDetailResultDTO implements Serializable { * */ private String releaseTime; + /** + * 发布地址 + * */ + private String releaseAddress; + /** * 话题内容 * */ private String topicContent; + /** + * 话题状态 + * */ + private String topicStatus; + /** * 图片访问地址 * */ diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 87ed95fe46..a7edadb707 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -122,7 +122,7 @@ test - diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java index b326a75e56..4ce9b643f2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.redis; +package com.epmet.modules.group.redis; import com.epmet.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index edf5bd4bb8..92fe240414 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -25,7 +25,6 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; -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.UserResiInfoDTO; @@ -45,7 +44,6 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.service.GroupMemeberOperationService; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.utils.ModuleConstant; -import com.epmet.redis.ResiGroupRedis; import com.epmet.resi.group.constant.EnterGroupTypeConstant; import com.epmet.resi.group.constant.GroupStateConstant; import com.epmet.resi.group.constant.LeaderFlagConstant; 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 b6746d07ad..9415d59760 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 @@ -78,10 +78,10 @@ public class ResiTopicController { * @Author wangc * @Date 2020.04.02 00:01 **/ - @PostMapping("getlatesttentopics") - Result> getLatestTenTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){ + @PostMapping("getlatesttopics") + Result> getLatestTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){ ValidatorUtils.validateEntity(topicDefaultPageFormDTO); - return topicService.getLatestTenTopics(tokenDto,topicDefaultPageFormDTO.getGroupId()); + return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId()); } /** @@ -121,8 +121,8 @@ public class ResiTopicController { * @Date 2020.04.01 14:17 **/ @PostMapping("cancelhiddentopics") - Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody List topicIds){ - return topicService.cancelHiddenTopics(tokenDto,topicIds); + Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicCancelHiddenFormDTO cancelHiddenFormDTO){ + return topicService.cancelHiddenTopics(tokenDto,cancelHiddenFormDTO.getTopicIds()); } /** 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 6784cab2e3..2c5b14fa8a 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 @@ -120,7 +120,7 @@ public interface ResiTopicService extends BaseService { * @Author wangc * @Date 2020.04.01 08:59 **/ - Result> getLatestTenTopics(TokenDto tokenDto,String groupId); + Result> getLatestTopics(TokenDto tokenDto,String groupId); /** * @Description 查看历史话题(分页,允许状态筛选) 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 c8f36d1194..513fd46fca 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 @@ -32,6 +32,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicCommentDao; import com.epmet.modules.topic.service.ResiTopicCommentService; import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; @@ -139,20 +140,20 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_COMMENT){ - return new Result().error(); + return new Result().error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED); } ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class); comment.setStatus(TopicConstant.PUBLISHMENT); 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 4c99c89a92..3c54ebb021 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 @@ -172,7 +172,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ //内容超过最大限制 - return new Result().error(); + return new Result().error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); } ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class); topic.setCreatedBy(tokenDto.getUserId()); @@ -180,7 +180,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 0){ ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity(); @@ -211,7 +211,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getLatestTenTopics(TokenDto tokenDto, String groupId) { + public Result> getLatestTopics(TokenDto tokenDto, String groupId) { if (null == tokenDto) { return new Result().error(ModuleConstant.USER_NOT_NULL); } @@ -314,6 +314,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topicIds) { + if(null == topicIds || topicIds.size() <= 0){ + return new Result().error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL); + } + //1.1拿到组Id ResiTopicEntity topic = baseDao.selectById(topicIds.get(0)); @@ -393,10 +397,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(TopicConstant.TOPIC_ID,topicId); @@ -409,8 +417,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 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 2f8bccd497..41d2df40f5 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 @@ -93,56 +93,86 @@