TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-03 15:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询集群列表API增加ID排序

Browse Source
This commit is contained in:
GoEdgeLab
2024-01-21 16:57:17 +08:00
parent 8253321cbc
commit 3ff8af3a5a
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/db/models/node_cluster_dao.go
View File

@@ -264,13 +264,22 @@ func (this *NodeClusterDAO) CountAllEnabledClusters(tx *dbs.Tx, keyword string)
} }
// ListEnabledClusters 列出单页集群 // ListEnabledClusters 列出单页集群
func (this *NodeClusterDAO) ListEnabledClusters(tx *dbs.Tx, keyword string, offset, size int64) (result []*NodeCluster, err error) { func (this *NodeClusterDAO) ListEnabledClusters(tx *dbs.Tx, keyword string, idDesc bool, idAsc bool, offset, size int64) (result []*NodeCluster, err error) {
var query = this.Query(tx). var query = this.Query(tx).
State(NodeClusterStateEnabled) State(NodeClusterStateEnabled)
if len(keyword) > 0 { if len(keyword) > 0 {
query.Where("(name LIKE :keyword OR dnsName like :keyword OR (dnsDomainId > 0 AND dnsDomainId IN (SELECT id FROM "+dns.SharedDNSDomainDAO.Table+" WHERE name LIKE :keyword AND state=1)))"). query.Where("(name LIKE :keyword OR dnsName like :keyword OR (dnsDomainId > 0 AND dnsDomainId IN (SELECT id FROM "+dns.SharedDNSDomainDAO.Table+" WHERE name LIKE :keyword AND state=1)))").
Param("keyword", dbutils.QuoteLike(keyword)) Param("keyword", dbutils.QuoteLike(keyword))
} }
if idDesc {
query.DescPk()
} else if idAsc {
query.AscPk()
} else {
query.Desc("isPinned").DescPk()
}
_, err = query. _, err = query.
Result( Result(
NodeClusterField_Id, NodeClusterField_Id,
@@ -295,8 +304,6 @@ func (this *NodeClusterDAO) ListEnabledClusters(tx *dbs.Tx, keyword string, offs
Offset(offset). Offset(offset).
Limit(size). Limit(size).
Slice(&result). Slice(&result).
Desc("isPinned").
DescPk().
FindAll() FindAll()
return return

2
internal/rpc/services/service_admin.go
View File

@@ -503,7 +503,7 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
// 默认集群 // 默认集群
this.BeginTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters") this.BeginTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters")
nodeClusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, "", 0, 1) nodeClusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, "", true, false, 0, 1)
this.EndTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters") this.EndTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters")
if err != nil { if err != nil {
return nil, err return nil, err

4
internal/rpc/services/service_node_cluster.go
View File

@@ -349,12 +349,12 @@ func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req
var tx = this.NullTx() var tx = this.NullTx()
clusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, req.Keyword, req.Offset, req.Size) clusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, req.Keyword, req.IdDesc, req.IdAsc, req.Offset, req.Size)
if err != nil { if err != nil {
return nil, err return nil, err
} }
result := []*pb.NodeCluster{} var result = []*pb.NodeCluster{}
for _, cluster := range clusters { for _, cluster := range clusters {
result = append(result, &pb.NodeCluster{ result = append(result, &pb.NodeCluster{
Id: int64(cluster.Id), Id: int64(cluster.Id),