diff --git a/internal/db/models/node_log_dao.go b/internal/db/models/node_log_dao.go index 8b25e82f..1e117adc 100644 --- a/internal/db/models/node_log_dao.go +++ b/internal/db/models/node_log_dao.go @@ -281,3 +281,11 @@ func (this *NodeLogDAO) UpdateNodeLogsRead(tx *dbs.Tx, nodeLogIds []int64) error } return nil } + +// UpdateAllNodeLogsRead 设置所有日志为已读 +func (this *NodeLogDAO) UpdateAllNodeLogsRead(tx *dbs.Tx) error { + return this.Query(tx). + Attr("isRead", false). + Set("isRead", true). + UpdateQuickly() +} diff --git a/internal/rpc/services/service_ip_item.go b/internal/rpc/services/service_ip_item.go index d544e8c6..17373f78 100644 --- a/internal/rpc/services/service_ip_item.go +++ b/internal/rpc/services/service_ip_item.go @@ -190,6 +190,7 @@ func (this *IPItemService) ListIPItemsWithListId(ctx context.Context, req *pb.Li IpFrom: item.IpFrom, IpTo: item.IpTo, Version: int64(item.Version), + CreatedAt: int64(item.CreatedAt), ExpiredAt: int64(item.ExpiredAt), Reason: item.Reason, Type: item.Type, @@ -234,6 +235,7 @@ func (this *IPItemService) FindEnabledIPItem(ctx context.Context, req *pb.FindEn IpFrom: item.IpFrom, IpTo: item.IpTo, Version: int64(item.Version), + CreatedAt: int64(item.CreatedAt), ExpiredAt: int64(item.ExpiredAt), Reason: item.Reason, Type: item.Type, @@ -272,6 +274,7 @@ func (this *IPItemService) ListIPItemsAfterVersion(ctx context.Context, req *pb. IpFrom: item.IpFrom, IpTo: item.IpTo, Version: int64(item.Version), + CreatedAt: int64(item.CreatedAt), ExpiredAt: int64(item.ExpiredAt), Reason: "", // 这里我们不需要这个数据 ListId: int64(item.ListId), @@ -332,6 +335,7 @@ func (this *IPItemService) CheckIPItemStatus(ctx context.Context, req *pb.CheckI Id: int64(item.Id), IpFrom: item.IpFrom, IpTo: item.IpTo, + CreatedAt: int64(item.CreatedAt), ExpiredAt: int64(item.ExpiredAt), Reason: item.Reason, Type: item.Type, diff --git a/internal/rpc/services/service_node_log.go b/internal/rpc/services/service_node_log.go index d5b3e85f..63f9da98 100644 --- a/internal/rpc/services/service_node_log.go +++ b/internal/rpc/services/service_node_log.go @@ -136,3 +136,18 @@ func (this *NodeLogService) UpdateNodeLogsRead(ctx context.Context, req *pb.Upda } return this.Success() } + +// UpdateAllNodeLogsRead 设置所有日志未已读 +func (this *NodeLogService) UpdateAllNodeLogsRead(ctx context.Context, req *pb.UpdateAllNodeLogsReadRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx, 0) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + err = models.SharedNodeLogDAO.UpdateAllNodeLogsRead(tx) + if err != nil { + return nil, err + } + return this.Success() +}