From f38d8f4041f1807ecdad4ec202e87fda49e87841 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Fri, 22 Sep 2023 16:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=B8=E7=94=A8=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E3=80=81=E5=B8=B8=E7=94=A8=E9=9B=86=E7=BE=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=AF=E8=83=BD=E5=9B=A0=E4=B8=BAupdatedAt=E8=BF=87?= =?UTF-8?q?=E5=A4=A7=E5=AF=BC=E8=87=B4=E7=9A=84SQL=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_cluster_dao.go | 5 +++-- internal/db/models/server_dao.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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).