From bd762ad10bba2174236d1b657a1dec9af4e7c497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 15 Mar 2023 17:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E8=8A=82=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E5=8F=AF=E4=BB=A5=E6=8C=89=E7=85=A7=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=95=B0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_dao.go | 10 ++++++++++ internal/rpc/services/service_node.go | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index 3ffb0f89..60f0ab73 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -435,6 +435,16 @@ func (this *NodeDAO) ListEnabledNodesMatch(tx *dbs.Tx, valueField = "load1m" isAsc = false ifNullValue = -1 + case "connectionsAsc": + valueItem = "connections" + valueField = "total" + isAsc = true + ifNullValue = 1000 + case "connectionsDesc": + valueItem = "connections" + valueField = "total" + isAsc = false + ifNullValue = -1 default: query.Desc("level") } diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index cd593685..f1e53288 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -225,6 +225,10 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List order = "loadAsc" } else if req.LoadDesc { order = "loadDesc" + } else if req.ConnectionsAsc { + order = "connectionsAsc" + } else if req.ConnectionsDesc { + order = "connectionsDesc" } nodes, err := models.SharedNodeDAO.ListEnabledNodesMatch(tx, req.NodeClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState), req.Keyword, req.NodeGroupId, req.NodeRegionId, req.Level, true, order, req.Offset, req.Size)