rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

话题校验参数

dev
yinzuomei 3 years ago
parent
cadef48cfc
commit
ebfdb94f07
5 changed files with 47 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java
  2. 12
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java
  3. 11
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java
  4. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java
  5. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java

28
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateYtTopicFormDTO.java
View File

@ -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<String> imageList;
/**
* 文件附件
*/
private List<FileDTO> docList;
// /**
// * 文件附件
// */
// private List<FileDTO> docList;
/**
* 语音附件
*/
private List<FileDTO> voiceList;
// /**
// * 视频附件
// */
// private List<FileDTO> videoList;
/**
* 视频附件
* tokenDto.getUserId
*/
private List<FileDTO> videoList;
@NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class )
private String userId;
}

12
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/YtTopicDetailFormDTO.java
View File

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

11
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/YtTopicController.java
View File

@ -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<YtTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody YtTopicDetailFormDTO topicDetailFormDTO) {
ValidatorUtils.validateEntity(topicDetailFormDTO);
return new Result<YtTopicDetailResultDTO>().ok(ytTopicService.getTopicDetail(tokenDto, topicDetailFormDTO));
topicDetailFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(topicDetailFormDTO,YtTopicDetailFormDTO.AddUserShowGroup.class,YtTopicDetailFormDTO.AddUserInternalGroup.class);
return new Result<YtTopicDetailResultDTO>().ok(ytTopicService.getTopicDetail(topicDetailFormDTO));
}
/**

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/YtTopicService.java
View File

@ -26,7 +26,7 @@ public interface YtTopicService extends BaseService<YtTopicEntity> {
* @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<YtTopicEntity> {
* @Author zhaoqifeng
* @Date 2023/1/30 16:39
*/
YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO);
YtTopicDetailResultDTO getTopicDetail(YtTopicDetailFormDTO formDTO);
/**
* 话题列表

18
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java
View File

@ -68,18 +68,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void createTopic(TokenDto tokenDto, CreateYtTopicFormDTO formDTO) {
public void createTopic(CreateYtTopicFormDTO formDTO) {
if(StringUtils.isBlank(formDTO.getTopicContent()) && CollectionUtils.isEmpty(formDTO.getVoiceList())) {
//话题内容和语音不能同时为空
log.error(ModuleConstant.TOPIC_CONTENT_AND_VOICE_IS_NULL);
throw new EpmetException(ModuleConstant.TOPIC_CONTENT_AND_VOICE_IS_NULL);
}
if(formDTO.getTopicContent().length() > 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<YtTopicDao, YtTopicEntit
String msg = "获取网格信息失败";
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
}
ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(tokenDto.getUserId());
ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(formDTO.getUserId());
if (null == userInfo) {
String msg = "获取用户信息失败";
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
}
topic.setCustomerId(tokenDto.getCustomerId());
topic.setCustomerId(formDTO.getCustomerId());
topic.setStatus(TopicConstant.PUBLISHMENT);
topic.setPids(gridInfo.getPids());
topic.setUserName(userInfo.getRealName());
@ -125,7 +119,7 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
attachment.setCustomerId(formDTO.getCustomerId());
attachment.setAttachmentUrl(file.getUrl());
attachment.setTopicId(topic.getId());
attachment.setCreatedBy(tokenDto.getUserId());
attachment.setCreatedBy(formDTO.getUserId());
attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
attachment.setSort(sort++);
attachment.setAttachmentType(TopicConstant.VOICE);
@ -147,7 +141,7 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
* @Date 2023/1/30 16:39
*/
@Override
public YtTopicDetailResultDTO getTopicDetail(TokenDto tokenDto, YtTopicDetailFormDTO formDTO) {
public YtTopicDetailResultDTO getTopicDetail(YtTopicDetailFormDTO formDTO) {
//1.查询话题信息
YtTopicEntity entity = baseDao.selectById(formDTO.getTopicId());
if(null == entity){
@ -211,7 +205,7 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
result.setSupportCount(String.valueOf(voteMap.get(TopicConstant.SUPPORT)));
}
}
voteWrapper.eq(YtTopicVoteDetailEntity::getCreatedBy, tokenDto.getUserId());
voteWrapper.eq(YtTopicVoteDetailEntity::getCreatedBy, formDTO.getUserId());
voteList = ytTopicVoteDetailDao.selectList(voteWrapper);
if (CollectionUtils.isNotEmpty(voteList)) {
result.setVoteStatus(voteList.get(NumConstant.ZERO).getAttitude());

Write Preview
Loading…
Cancel
Save