Merge branch 'prod/20260330' into test

This commit is contained in:
曹鹏飞 2026-03-30 17:10:27 +08:00
commit 8c4f59f37d
1 changed files with 15 additions and 0 deletions

View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.common.pojo.dto; package com.nflg.mobilebroken.common.pojo.dto;
import cn.hutool.core.collection.CollectionUtil;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nflg.mobilebroken.common.pojo.request.RemindUserRequest; import com.nflg.mobilebroken.common.pojo.request.RemindUserRequest;
import com.nflg.mobilebroken.common.pojo.vo.FileUploadVO; import com.nflg.mobilebroken.common.pojo.vo.FileUploadVO;
@ -8,6 +9,8 @@ import lombok.experimental.Accessors;
import java.time.Instant; import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ -36,9 +39,21 @@ public class ChatMessageDTO {
// 附件列表 // 附件列表
private List<FileUploadVO> attachments; private List<FileUploadVO> attachments;
public List<FileUploadVO> getAttachments() {
return CollectionUtil.isEmpty(attachments)
? null
: attachments.stream().filter(Objects::nonNull).collect(Collectors.toList());
}
//图片列表 //图片列表
private List<FileUploadVO> images; private List<FileUploadVO> images;
public List<FileUploadVO> getImages() {
return CollectionUtil.isEmpty(images)
? null
: images.stream().filter(Objects::nonNull).collect(Collectors.toList());
}
// 创建时间 // 创建时间
private Instant createTime; private Instant createTime;