This commit is contained in:
future
2026-06-23 22:47:35 +08:00
parent 8da58a8f51
commit 3586a7d74b
65 changed files with 2694 additions and 82 deletions
@@ -1,5 +1,6 @@
package cn.novalon.gym.manage.db.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.Id;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.Table;
@@ -21,10 +22,10 @@ public class SysUserMessageEntity {
@Column("user_id")
private Long userId;
@Column("title")
@Column("message_title")
private String title;
@Column("content")
@Column("message_content")
private String content;
@Column("message_type")
@@ -33,9 +34,13 @@ public class SysUserMessageEntity {
@Column("is_read")
private String isRead;
@Column("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column("created_at")
private LocalDateTime createTime;
@Column("deleted_at")
private LocalDateTime deletedAt;
public Long getId() {
return id;
}
@@ -91,4 +96,12 @@ public class SysUserMessageEntity {
public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
public LocalDateTime getDeletedAt() {
return deletedAt;
}
public void setDeletedAt(LocalDateTime deletedAt) {
this.deletedAt = deletedAt;
}
}
@@ -1,5 +1,7 @@
package cn.novalon.gym.manage.db.repository;
import cn.novalon.gym.manage.common.dto.PageRequest;
import cn.novalon.gym.manage.common.dto.PageResponse;
import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
import cn.novalon.gym.manage.notify.core.repository.ISysUserMessageRepository;
import cn.novalon.gym.manage.db.converter.SysUserMessageConverter;
@@ -13,6 +15,8 @@ import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.List;
/**
* 用户消息仓储实现类
*
@@ -75,6 +79,87 @@ public class SysUserMessageRepository implements ISysUserMessageRepository {
return r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class);
}
@Override
public Mono<PageResponse<SysUserMessage>> findByUserIdPage(Long userId, PageRequest pageRequest) {
int page = pageRequest.getPage();
int size = pageRequest.getSize();
String sort = pageRequest.getSort();
String order = pageRequest.getOrder();
Sort sortObj = Sort.unsorted();
if (sort != null && !sort.isEmpty()) {
sortObj = Sort.by(Sort.Direction.fromString(order), sort);
}
org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
criteria.setUserId(userId);
org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
.matching(dbQuery.with(pageable))
.all()
.collectList()
.zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
.map(tuple -> {
long total = tuple.getT2();
int totalPages = (int) Math.ceil((double) total / size);
List<SysUserMessage> messageList = tuple.getT1().stream()
.map(sysUserMessageConverter::toDomain)
.toList();
return new PageResponse<>(messageList, totalPages, total, page, size);
});
}
@Override
public Mono<PageResponse<SysUserMessage>> findByUserIdAndIsReadPage(Long userId, String isRead, PageRequest pageRequest) {
int page = pageRequest.getPage();
int size = pageRequest.getSize();
String sort = pageRequest.getSort();
String order = pageRequest.getOrder();
Sort sortObj = Sort.unsorted();
if (sort != null && !sort.isEmpty()) {
sortObj = Sort.by(Sort.Direction.fromString(order), sort);
}
org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
criteria.setUserId(userId);
criteria.setIsRead(isRead);
org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
.matching(dbQuery.with(pageable))
.all()
.collectList()
.zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
.map(tuple -> {
long total = tuple.getT2();
int totalPages = (int) Math.ceil((double) total / size);
List<SysUserMessage> messageList = tuple.getT1().stream()
.map(sysUserMessageConverter::toDomain)
.toList();
return new PageResponse<>(messageList, totalPages, total, page, size);
});
}
@Override
public Mono<Long> markAllAsReadByUserId(Long userId) {
org.springframework.data.relational.core.query.Update update = org.springframework.data.relational.core.query.Update.update("is_read", "1");
org.springframework.data.relational.core.query.Query query = org.springframework.data.relational.core.query.Query.query(
org.springframework.data.relational.core.query.Criteria.where("user_id").is(userId)
.and("deleted_at").isNull()
);
return r2dbcEntityTemplate.update(SysUserMessageEntity.class)
.matching(query)
.apply(update);
}
@Override
public Mono<SysUserMessage> save(SysUserMessage message) {
SysUserMessageEntity entity = sysUserMessageConverter.toEntity(message);