bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

消息管理

This commit is contained in:
liang.chao 2024-12-23 19:01:32 +08:00
parent 6e2b957cce
commit f9545167b8
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java
View File

@ -60,7 +60,7 @@ public class BmMessage extends BaseEntity {
/** 来自companyName */
@Excel(name = "来自companyName")
@ApiModelProperty(value = "来自companyName")
private Long fromCompanyName;
private String fromCompanyName;
/** 发给companyId */
@Excel(name = "发给companyId")
@ -70,7 +70,7 @@ public class BmMessage extends BaseEntity {
/** 发给companyName */
@Excel(name = "发给companyName")
@ApiModelProperty(value = "发给companyName")
private Long toCompanyName;
private String toCompanyName;
@ApiModelProperty(value = "是否已读(0:未读 1:已读)")
private Integer isRead;

23
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
View File

@ -68,17 +68,10 @@ public class BmMessageServiceImpl implements IBmMessageService {
list.addAll(arrayCache.toList(BmMessage.class));
});
List<BmMessage> result = list.stream().filter(o -> companyId.equals(o.getFromCompany()) || companyId.equals(o.getToCompany())).collect(Collectors.toList());
// Optional<BmMessage> result2 = result.stream().min(Comparator.comparing(BmMessage::getCreateTime).reversed());
// if (result2.isPresent()) {
// BmMessage message = result2.get();
// // 现在你可以使用message对象
// // 如果你真的需要一个List，尽管这里只有一个元素，你可以这样做：
// List<BmMessage> singleElementList = Collections.singletonList(message);
// return singleElementList;
// }else {
// return new ArrayList<>();
// }
return result;
List<BmMessage> sortedList = result.stream()
.sorted(Comparator.comparing(BmMessage::getCreateTime))
.collect(Collectors.toList());
return sortedList.subList(0,1);
}
public List<BmMessage> selectBmMessageListFromCacheOne(BmMessage bmMessage) {
@ -93,7 +86,10 @@ public class BmMessageServiceImpl implements IBmMessageService {
JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(t);
list.addAll(arrayCache.toList(BmMessage.class));
});
return list;
List<BmMessage> sortedList = list.stream()
.sorted(Comparator.comparing(t -> t.getCreateTime()))
.collect(Collectors.toList());
return sortedList;
}
/**
@ -112,6 +108,9 @@ public class BmMessageServiceImpl implements IBmMessageService {
bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + bmMessage.getToCompany();
JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(msgKey);
if (arrayCache == null){
arrayCache = new JSONArray();
}
List<BmMessage> list = arrayCache.toList(BmMessage.class);
list.add(bmMessage);
(SpringUtils.getBean(RedisService.class)).setCacheObject(msgKey, list, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS);