diff --git a/atune/server/controller/runresult.go b/atune/server/controller/runresult.go index 79d7f215433e434c9a13476001fcac302ee0d2f6..f8a1e80d166806f0bb59740d7461c77542199db1 100644 --- a/atune/server/controller/runresult.go +++ b/atune/server/controller/runresult.go @@ -67,3 +67,20 @@ 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/atune/server/dao/runresultdao.go b/atune/server/dao/runresultdao.go index 4ff941d9794ce0c8a7a4dd45bb5a9932bb0846ec..714b4be73a03e11379e7d4ca6841c5a56c509982 100644 --- a/atune/server/dao/runresultdao.go +++ b/atune/server/dao/runresultdao.go @@ -42,6 +42,19 @@ func DeleteResult(resultId int) error { return nil } +func SearchResult(searchKey string, query *response.PaginationQ) ([]*model.RunResult, int64, 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 + } + + 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 +} + func IsExistCommandResult(machine_uuid string, command string) (bool, error) { var r model.RunResult err := db.MySQL().Where("machine_uuid = ? AND command = ?", machine_uuid, command).Find(&r).Error diff --git a/atune/server/router/router.go b/atune/server/router/router.go index 01210fd12c6c740986a780739887d8bc45ffb8ed..c8b61334cf4d7961b0ef6917049b29fa38021da6 100644 --- a/atune/server/router/router.go +++ b/atune/server/router/router.go @@ -56,5 +56,6 @@ func registerAPIs(router *gin.Engine) { restune.POST("run", controller.RunCommand) restune.GET("results", controller.QueryResults) restune.DELETE("result_delete", controller.DeleteResult) + restune.GET("result_search", controller.SearchResult) } } diff --git a/atune/server/service/resultservice.go b/atune/server/service/resultservice.go index 9f5a37003df48b6c460d584c4f550ad6328d3c1e..ca420e6ca2d843455b41de5e058cfbac34d95dd7 100644 --- a/atune/server/service/resultservice.go +++ b/atune/server/service/resultservice.go @@ -55,3 +55,11 @@ func ProcessResult(res *common.RunResult, command string) error { } 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 + } else { + return data, int(total), nil + } +} diff --git a/configmanage/server/router/router.go b/configmanage/server/router/router.go index dbf6b0db6a70aa3c46272a2668a8d4c05d513ddd..1d39666e1bcbcec17fe837ae28009efbbbbd5729 100644 --- a/configmanage/server/router/router.go +++ b/configmanage/server/router/router.go @@ -18,6 +18,6 @@ func RegisterAPIs(router *gin.Engine) { global.GlobalClient.RegisterHandlers(router) pg := router.Group("/plugin/" + global.GlobalClient.PluginInfo.Name) { - //pg.POST("/install") + pg.POST("/install") } } diff --git a/container/server/main.go b/container/server/main.go index 923ed1359e7d695b3455b6487a9bdda5387edfce..b02a2fe65391dccf852525aa5ee7bd3c3a9e83a9 100644 --- a/container/server/main.go +++ b/container/server/main.go @@ -37,8 +37,6 @@ func main() { server := gin.Default() GlobalClient := client.DefaultClient(PluginInfo) - // 临时给server赋值 - GlobalClient.Server = "http://192.168.75.100:8888" GlobalClient.RegisterHandlers(server) InitRouter(server)