From ebfdb94f078c40e5b6b678515a2f4b5e7ac5ebfb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Feb 2023 15:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=A0=A1=E9=AA=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/topic/form/CreateYtTopicFormDTO.java | 28 ++++++++++++++----- .../dto/topic/form/YtTopicDetailFormDTO.java | 12 +++++++- .../topic/controller/YtTopicController.java | 11 +++++--- .../modules/topic/service/YtTopicService.java | 4 +-- .../service/impl/YtTopicServiceImpl.java | 18 ++++-------- 5 files changed, 47 insertions(+), 26 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java index 83e899f647..de00da7503 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java @@ -1,6 +1,8 @@ package com.epmet.resi.group.dto.topic.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -13,12 +15,19 @@ import java.util.List; @Data public class CreateYtTopicFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空",groups =AddUserInternalGroup.class ) private String customerId; + @NotBlank(message ="网格不能为空",groups =AddUserShowGroup.class ) private String gridId; - + @Length(max=3000,message ="话题内容最多输入3000字",groups =AddUserShowGroup.class ) private String topicContent; /** @@ -71,16 +80,21 @@ public class CreateYtTopicFormDTO implements Serializable { * 图片附件 */ private List imageList; - /** - * 文件附件 - */ - private List docList; + // /** + // * 文件附件 + // */ + // private List docList; /** * 语音附件 */ private List voiceList; + // /** + // * 视频附件 + // */ + // private List videoList; /** - * 视频附件 + * tokenDto.getUserId */ - private List videoList; + @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java index 058b5049be..61b03690ba 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.resi.group.dto.topic.form; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -16,11 +17,20 @@ import java.io.Serializable; public class YtTopicDetailFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 话题Id * */ - @NotBlank(message = "话题Id不能为空") + @NotBlank(message = "话题Id不能为空",groups = AddUserShowGroup.class) private String topicId; + /** + * tokenDto.getUserId + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class ) + private String userId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java index ab324cb1b3..d7ac74fd3b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java @@ -48,8 +48,10 @@ public class YtTopicController { @PostMapping("createTopic") @NoRepeatSubmit public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody CreateYtTopicFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - ytTopicService.createTopic(tokenDto, formDTO); + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,CreateYtTopicFormDTO.AddUserShowGroup.class,CreateYtTopicFormDTO.AddUserInternalGroup.class); + ytTopicService.createTopic(formDTO); return new Result(); } @@ -64,8 +66,9 @@ public class YtTopicController { */ @PostMapping("topicDetail") public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO topicDetailFormDTO) { - ValidatorUtils.validateEntity(topicDetailFormDTO); - return new Result().ok(ytTopicService.getTopicDetail(tokenDto, topicDetailFormDTO)); + topicDetailFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(topicDetailFormDTO,YtTopicDetailFormDTO.AddUserShowGroup.class,YtTopicDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(ytTopicService.getTopicDetail(topicDetailFormDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java index b0412edfb7..23741a8a09 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java @@ -26,7 +26,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:18 */ - void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO); + void createTopic(CreateYtTopicFormDTO formDTO); /** * 话题详情 @@ -37,7 +37,7 @@ public interface YtTopicService extends BaseService { * @Author zhaoqifeng * @Date 2023/1/30 16:39 */ - YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO); + YtTopicDetailResultDTO getTopicDetail(YtTopicDetailFormDTO formDTO); /** * 话题列表 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java index 04576f0480..acbb9d0c62 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java @@ -68,18 +68,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ - //内容超过最大限制 - log.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - throw new EpmetException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); - } //1.保存话题 YtTopicEntity topic = ConvertUtils.sourceToTarget(formDTO, YtTopicEntity.class); //如果只有语音，则话题内容为语音话题 @@ -91,12 +85,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl