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

节点任务查询时增加排除的任务类型

Browse Source
This commit is contained in:
GoEdgeLab
2021-11-27 17:07:01 +08:00
parent d4c9bd524a
commit de63ae8911
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/db/models/node_task_dao.go
View File

@@ -311,20 +311,30 @@ func (this *NodeTaskDAO) FindAllDoingNodeIds(tx *dbs.Tx, role string) ([]int64,
} }
// ExistsDoingNodeTasks 检查是否有正在执行的任务 // ExistsDoingNodeTasks 检查是否有正在执行的任务
func (this *NodeTaskDAO) ExistsDoingNodeTasks(tx *dbs.Tx, role string) (bool, error) { func (this *NodeTaskDAO) ExistsDoingNodeTasks(tx *dbs.Tx, role string, excludeTypes []NodeTaskType) (bool, error) {
return this.Query(tx). var query = this.Query(tx).
Attr("role", role). Attr("role", role).
Where("(isDone=0 OR (isDone=1 AND isOk=0))"). Where("(isDone=0 OR (isDone=1 AND isOk=0))").
Gt("nodeId", 0). Gt("nodeId", 0)
Exist() if len(excludeTypes) > 0 {
for _, excludeType := range excludeTypes {
query.Neq("type", excludeType)
}
}
return query.Exist()
} }
// ExistsErrorNodeTasks 是否有错误的任务 // ExistsErrorNodeTasks 是否有错误的任务
func (this *NodeTaskDAO) ExistsErrorNodeTasks(tx *dbs.Tx, role string) (bool, error) { func (this *NodeTaskDAO) ExistsErrorNodeTasks(tx *dbs.Tx, role string, excludeTypes []NodeTaskType) (bool, error) {
return this.Query(tx). var query = this.Query(tx).
Attr("role", role). Attr("role", role).
Where("(isDone=1 AND isOk=0)"). Where("(isDone=1 AND isOk=0)")
Exist() if len(excludeTypes) > 0 {
for _, excludeType := range excludeTypes {
query.Neq("type", excludeType)
}
}
return query.Exist()
} }
// DeleteNodeTask 删除任务 // DeleteNodeTask 删除任务

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

@@ -163,13 +163,13 @@ func (this *NodeTaskService) ExistsNodeTasks(ctx context.Context, req *pb.Exists
var tx = this.NullTx() var tx = this.NullTx()
// 是否有任务 // 是否有任务
existTask, err := models.SharedNodeTaskDAO.ExistsDoingNodeTasks(tx, nodeconfigs.NodeRoleNode) existTask, err := models.SharedNodeTaskDAO.ExistsDoingNodeTasks(tx, nodeconfigs.NodeRoleNode, req.ExcludeTypes)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 是否有错误 // 是否有错误
existError, err := models.SharedNodeTaskDAO.ExistsErrorNodeTasks(tx, nodeconfigs.NodeRoleNode) existError, err := models.SharedNodeTaskDAO.ExistsErrorNodeTasks(tx, nodeconfigs.NodeRoleNode, req.ExcludeTypes)
if err != nil { if err != nil {
return nil, err return nil, err
} }