diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index ebf1a76e..30b28fd0 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -950,11 +950,12 @@ func (this *NodeClusterDAO) GenUniqueId(tx *dbs.Tx) (string, error) { // FindLatestNodeClusters 查询最近访问的集群 func (this *NodeClusterDAO) FindLatestNodeClusters(tx *dbs.Tx, size int64) (result []*NodeCluster, err error) { - itemTable := SharedLatestItemDAO.Table - itemType := LatestItemTypeCluster + var itemTable = SharedLatestItemDAO.Table + var itemType = LatestItemTypeCluster _, err = this.Query(tx). Result(this.Table+".id", this.Table+".name"). Join(SharedLatestItemDAO, dbs.QueryJoinRight, this.Table+".id="+itemTable+".itemId AND "+itemTable+".itemType='"+itemType+"'"). + Where(itemTable + ".updatedAt<=UNIX_TIMESTAMP()"). // VERY IMPORTANT Asc("CEIL((UNIX_TIMESTAMP() - " + itemTable + ".updatedAt) / (7 * 86400))"). // 优先一个星期以内的 Desc(itemTable + ".count"). State(NodeClusterStateEnabled). diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go index d84a113f..bef1052f 100644 --- a/internal/db/models/server_dao.go +++ b/internal/db/models/server_dao.go @@ -2045,11 +2045,12 @@ func (this *ServerDAO) GenDNSName(tx *dbs.Tx) (string, error) { // FindLatestServers 查询最近访问的服务 func (this *ServerDAO) FindLatestServers(tx *dbs.Tx, size int64) (result []*Server, err error) { - itemTable := SharedLatestItemDAO.Table - itemType := LatestItemTypeServer + var itemTable = SharedLatestItemDAO.Table + var itemType = LatestItemTypeServer _, err = this.Query(tx). Result(this.Table+".id", this.Table+".name"). Join(SharedLatestItemDAO, dbs.QueryJoinRight, this.Table+".id="+itemTable+".itemId AND "+itemTable+".itemType='"+itemType+"'"). + Where(itemTable + ".updatedAt<=UNIX_TIMESTAMP()"). // VERY IMPORTANT Asc("CEIL((UNIX_TIMESTAMP() - " + itemTable + ".updatedAt) / (7 * 86400))"). // 优先一个星期以内的 Desc(itemTable + ".count"). State(NodeClusterStateEnabled).