diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeDto.java b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeDto.java deleted file mode 100644 index efb3aa9..0000000 --- a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeDto.java +++ /dev/null @@ -1,26 +0,0 @@ -//package com.vetti.hotake.domain.dto; -// -//import com.vetti.common.utils.bean.BeanUtils; -//import com.vetti.hotake.domain.HotakeSysNoticeType; -//import lombok.Data; -// -//import java.util.List; -// -///** -// * @author ID -// * @date 2025/11/1 11:54 -// */ -//@Data -//public class HotakeSysNoticeTypeDto extends HotakeSysNoticeType { -// -// private List imgs; -// -// -// public static HotakeSysNoticeTypeDto build(List urls, HotakeSysNoticeType data) { -// HotakeSysNoticeTypeDto dto = new HotakeSysNoticeTypeDto(); -// BeanUtils.copyBeanProp(dto, data); -// dto.setImgs(urls); -// return dto; -// } -// -//} diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeNameDto.java b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeNameDto.java new file mode 100644 index 0000000..b686a11 --- /dev/null +++ b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeNameDto.java @@ -0,0 +1,72 @@ +package com.vetti.hotake.domain.dto; + +import com.vetti.common.utils.bean.BeanUtils; +import com.vetti.hotake.domain.HotakeSysNotice; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author ID + * @date 2025/11/1 16:50 + */ +@Data +public class HotakeSysNoticeTypeNameDto { + + @ApiModelProperty("通知类型名称") + private String noticeTypeName; + + @ApiModelProperty("数量") + private Integer num; + + @ApiModelProperty("通知") + private List list; + +// public static List build(List list) { +// List reList = new ArrayList<>(); +// Map> map = new HashMap<>(); +// list.forEach(e -> { +// String typeName = e.getNoticeTypeName(); +// if (!map.containsKey(typeName)) { +// map.put(typeName, new ArrayList<>()); +// } +// map.get(typeName).add(e); +// }); +// map.forEach((k, v) -> { +// HotakeSysNoticeTypeNameDto dto = new HotakeSysNoticeTypeNameDto(); +// dto.setNoticeTypeName(k); +// dto.setList(v); +// reList.add(dto); +// }); +// return reList; +// } + + // 优化后的分组转换方法 + public static List build(List list) { + // 处理空集合,避免NPE + if (list == null) { + return new ArrayList<>(); + } + // 1. 分组:按 noticeTypeName 分组,自动处理键不存在的情况 + // 2. 转换:将分组结果映射为 HotakeSysNoticeTypeNameDto 列表 + return list.stream() + // 分组:key为noticeTypeName,value为对应的HotakeSysNoticeDto列表 + .collect(Collectors.groupingBy(HotakeSysNoticeDto::getNoticeTypeName)) + // 遍历分组后的Map,转换为目标DTO + .entrySet().stream() + .map(entry -> { + HotakeSysNoticeTypeNameDto dto = new HotakeSysNoticeTypeNameDto(); + dto.setNoticeTypeName(entry.getKey()); + dto.setList(entry.getValue()); + dto.setNum(entry.getValue().size()); + return dto; + }) + // 收集为List返回 + .collect(Collectors.toList()); + } +} diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java index b9aaee8..dbeeb08 100644 --- a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java +++ b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeViewDto.java @@ -14,9 +14,15 @@ import java.util.List; public class HotakeSysNoticeViewDto { @ApiModelProperty("未查看") - private List unreadList; + private List unreadList; @ApiModelProperty("归档") - private List archiveList; + private List archiveList; + + @ApiModelProperty("未查看数量") + private Integer unreadNum; + + @ApiModelProperty("归档数量") + private Integer archiveNum; } diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java index 7ab72d2..aa3928c 100644 --- a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java +++ b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeServiceImpl.java @@ -10,6 +10,7 @@ import com.vetti.common.core.service.BaseServiceImpl; import com.vetti.common.enums.FillTypeEnum; import com.vetti.common.utils.DateUtils; import com.vetti.hotake.domain.dto.HotakeSysNoticeDto; +import com.vetti.hotake.domain.dto.HotakeSysNoticeTypeNameDto; import com.vetti.hotake.domain.dto.HotakeSysNoticeViewDto; import com.vetti.hotake.service.IHotakeSysFileService; import com.vetti.system.service.ISysDictDataService; @@ -149,8 +150,10 @@ public class HotakeSysNoticeServiceImpl extends BaseServiceImpl implements IHota archiveList.add(HotakeSysNoticeDto.build(e, typeNameMap, url(e))); } }); - data.setUnreadList(unreadList); - data.setArchiveList(archiveList); + data.setUnreadList(HotakeSysNoticeTypeNameDto.build(unreadList)); + data.setArchiveList(HotakeSysNoticeTypeNameDto.build(archiveList)); + data.setUnreadNum(unreadList.size()); + data.setArchiveNum(archiveList.size()); return data; }