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

实现节点分组管理

Browse Source
This commit is contained in:
刘祥超
2020-10-28 18:21:15 +08:00
parent 5810fd9144
commit 531e0fa0a7
6 changed files with 231 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/rpc/services/service_node.go
View File

@@ -102,7 +102,7 @@ func (this *NodeService) CountAllEnabledNodesMatch(ctx context.Context, req *pb.
if err != nil {
return nil, err
}
count, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(req.ClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState))
count, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(req.ClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState), req.Keyword, req.GroupId)
if err != nil {
return nil, err
}
@@ -115,7 +115,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List
if err != nil {
return nil, err
}
nodes, err := models.SharedNodeDAO.ListEnabledNodesMatch(req.Offset, req.Size, req.ClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState))
nodes, err := models.SharedNodeDAO.ListEnabledNodesMatch(req.Offset, req.Size, req.ClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState), req.Keyword, req.GroupId)
if err != nil {
return nil, err
}
@@ -790,3 +790,18 @@ func (this *NodeService) UpdateNodeLogin(ctx context.Context, req *pb.UpdateNode
return rpcutils.RPCUpdateSuccess()
}
// 计算某个节点分组内的节点数量
func (this *NodeService) CountAllEnabledNodesWithGroupId(ctx context.Context, req *pb.CountAllEnabledNodesWithGroupIdRequest) (*pb.CountAllEnabledNodesWithGroupIdResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
count, err := models.SharedNodeDAO.CountAllEnabledNodesWithGroupId(req.GroupId)
if err != nil {
return nil, err
}
return &pb.CountAllEnabledNodesWithGroupIdResponse{Count: count}, nil
}