diff --git a/server/controller/runresult.go b/server/controller/runresult.go index c54c0f19eeeea8bb215c5fc950b443d3db1712f8..c08d3bfdcde856ae4e8ffef8e5bffaba710604b3 100644 --- a/server/controller/runresult.go +++ b/server/controller/runresult.go @@ -6,6 +6,17 @@ import ( "openeuler.org/PilotGo/atune-plugin/service" ) +func QueryResults(c *gin.Context) { + taskId := c.Query("taskId") + + data, err := service.SearchResultByTaskId(taskId) + if err != nil { + response.Fail(c, nil, err.Error()) + return + } + response.Success(c, data, "获取到结果详情") +} + func DeleteResult(c *gin.Context) { resultdel := struct { ResultID []int `json:"ids"` @@ -21,20 +32,3 @@ func DeleteResult(c *gin.Context) { } response.Success(c, nil, "已删除") } - -func SearchResult(c *gin.Context) { - searchKey := c.Query("searchKey") - - query := &response.PaginationQ{} - if err := c.ShouldBindQuery(query); err != nil { - response.Fail(c, nil, err.Error()) - return - } - - data, total, err := service.SearchResult(searchKey, query) - if err != nil { - response.Fail(c, nil, err.Error()) - return - } - response.DataPagination(c, data, total, query) -} diff --git a/server/dao/runresultdao.go b/server/dao/runresultdao.go index d20fcfe460f14ae8013ff10af86cafe653ab4a4e..58a085eb29c850c4d9d315528c58c2d4de4b39a6 100644 --- a/server/dao/runresultdao.go +++ b/server/dao/runresultdao.go @@ -3,24 +3,10 @@ package dao import ( "time" - "gitee.com/openeuler/PilotGo/sdk/response" "openeuler.org/PilotGo/atune-plugin/db" "openeuler.org/PilotGo/atune-plugin/model" ) -func QueryResults(query *response.PaginationQ) ([]*model.RunResult, int64, error) { - var results []*model.RunResult - if err := db.MySQL().Order("id desc").Limit(query.PageSize).Offset((query.Page - 1) * query.PageSize).Find(&results).Error; err != nil { - return nil, 0, err - } - - var total int64 - if err := db.MySQL().Model(&results).Count(&total).Error; err != nil { - return nil, 0, err - } - return results, total, nil -} - func SaveRusult(result *model.RunResult) error { if err := db.MySQL().Create(&result).Error; err != nil { return err @@ -51,20 +37,6 @@ func UpdateResult(dbtaskid int, machine_uuid string, commandType string, result return nil } -// 列中包含false,是false,表明远程命令未更新完成 -func IsUpdateAll() (bool, error) { - var count int64 - if err := db.MySQL().Model(&model.RunResult{}).Where("is_update = ?", false).Count(&count).Error; err != nil { - return false, err - } - - if count > 0 { - return false, nil - } else { - return true, nil - } -} - func DeleteResult(resultId int) error { var r model.RunResult if err := db.MySQL().Where("id = ?", resultId).Unscoped().Delete(&r).Error; err != nil { @@ -73,15 +45,11 @@ func DeleteResult(resultId int) error { return nil } -func SearchResult(searchKey string, query *response.PaginationQ) ([]*model.RunResult, int64, error) { +func SearchResult(taskId string) ([]*model.RunResult, error) { var result []*model.RunResult - if err := db.MySQL().Order("id desc").Limit(query.PageSize).Offset((query.Page-1)*query.PageSize).Where("machine_ip LIKE ?", "%"+searchKey+"%").Find(&result).Error; err != nil { - return nil, 0, nil + if err := db.MySQL().Where("task_id = ?", taskId).Find(&result).Error; err != nil { + return []*model.RunResult{}, nil } - var total int64 - if err := db.MySQL().Where("machine_ip LIKE ?", "%"+searchKey+"%").Model(&result).Count(&total).Error; err != nil { - return nil, 0, err - } - return result, total, nil + return result, nil } diff --git a/server/router/router.go b/server/router/router.go index 5c1b442ffddeacce60285a3d5b9a0f1a61d82ada..03bc3fd81deb7a3db9a78afd8686f33e96513f39 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -68,8 +68,8 @@ func registerAPIs(router *gin.Engine) { restune := router.Group("/plugin/" + plugin.GlobalClient.PluginInfo.Name) { + restune.GET("result", controller.QueryResults) restune.DELETE("result_delete", controller.DeleteResult) - restune.GET("result_search", controller.SearchResult) } } diff --git a/server/service/resultservice.go b/server/service/resultservice.go index ab42c9d03304246ad5be47398aecb5e9e4cd58e7..8523defad3931014d18ed8cfb3d48092eb259d61 100644 --- a/server/service/resultservice.go +++ b/server/service/resultservice.go @@ -6,7 +6,6 @@ import ( "gitee.com/openeuler/PilotGo/sdk/common" "gitee.com/openeuler/PilotGo/sdk/logger" - "gitee.com/openeuler/PilotGo/sdk/response" "openeuler.org/PilotGo/atune-plugin/dao" "openeuler.org/PilotGo/atune-plugin/model" ) @@ -125,10 +124,10 @@ func UpdateResultStatus(dbtaskid int, uuid string, commandType string, resultSta } return nil } -func SearchResult(searchKey string, query *response.PaginationQ) ([]*model.RunResult, int, error) { - if data, total, err := dao.SearchResult(searchKey, query); err != nil { - return nil, 0, err +func SearchResultByTaskId(taskId string) ([]*model.RunResult, error) { + if data, err := dao.SearchResult(taskId); err != nil { + return nil, err } else { - return data, int(total), nil + return data, nil } }