diff --git a/src/bean/vo/response/host_manage.go b/src/bean/vo/response/host_manage.go index 701b962ea02ecedcf4c452b9b444e7e5cb009a43..4b6c211a186291c6e413807ec8fc7b5f6373b60f 100644 --- a/src/bean/vo/response/host_manage.go +++ b/src/bean/vo/response/host_manage.go @@ -49,6 +49,11 @@ type HostManagesRes struct { IpCnt int `json:"ip_cnt"` // ip数量(全部) } +type HostManagesListRes struct { + Id int `json:"id"` // id + HostName string `json:"host_name"` // 主机分组名称 +} + type HostManageListRes struct { Id int `json:"id"` // id Ip string `json:"ip"` // ip diff --git a/src/controller/host_manage.go b/src/controller/host_manage.go index 7fd76d08dd2f9acf37fa7ded82f96ac790734fc6..6cc8e66965370c4ccb1a2f5f1b3a3c9029c0d3fd 100644 --- a/src/controller/host_manage.go +++ b/src/controller/host_manage.go @@ -179,8 +179,8 @@ func DetailsHostManage(c *gin.Context) { SendJsonResponse(c, resp.OK, data) } -// ListHostManage 列表 -func ListHostManage(c *gin.Context) { +// PageListHostManage 列表-分页 +func PageListHostManage(c *gin.Context) { var req request.ListHostManageReq if err := c.ShouldBindJSON(&req); err != nil { SendJsonResponse(c, resp.InvalidParam.WithError(err), nil) @@ -188,7 +188,7 @@ func ListHostManage(c *gin.Context) { } hostManageSvc := service.HostManageSvc{} - total, list, err := hostManageSvc.ListHostManage(req) + total, list, err := hostManageSvc.PageListHostManage(req) if err != nil { SendJsonPageResponse(c, err, nil, 0) return @@ -344,3 +344,15 @@ func ExportIp(c *gin.Context) { c.File(conf.Options.TempDirPrefix + fileName) } + +// ListHostManage 列表 +func ListHostManage(c *gin.Context) { + + hostManageSvc := service.HostManageSvc{} + list, err := hostManageSvc.ListHostManage() + if err != nil { + SendJsonResponse(c, err, nil) + return + } + SendJsonResponse(c, resp.OK, list) +} diff --git a/src/router/automatedmaintenrouter.go b/src/router/automatedmaintenrouter.go index 019f0fdff16bd0e2dde0acb2e76a345710a342b1..c9ed75e2aaedabe7158f608bedc1d32a9ec22d1a 100644 --- a/src/router/automatedmaintenrouter.go +++ b/src/router/automatedmaintenrouter.go @@ -27,9 +27,10 @@ func InitAutomatedMaintenRouter(e *gin.Engine) { host.PUT("/edit", controller.EditHostManage) // 编辑 host.DELETE("/del", controller.DelHostManage) // 删除 host.GET("/details", controller.DetailsHostManage) // 详情 - host.GET("/list", controller.ListHostManage) // 列表 + host.GET("/page_list", controller.PageListHostManage) // 列表-分页 host.POST("/state", controller.StateHostManage) // 状态检测 host.GET("/ip_exception_list", controller.HostIpExceptionList) // 主机ip异常列表 host.GET("/export", controller.ExportIp) // 导出ip列表 + host.GET("/list", controller.ListHostManage) // 主机分组列表 } } diff --git a/src/service/host_manage.go b/src/service/host_manage.go index 2f9f00dfb00855aec7fb09cfa64a872b47617eec..c72e3c775e20fd5564580460c3a4346311805cc9 100644 --- a/src/service/host_manage.go +++ b/src/service/host_manage.go @@ -294,8 +294,8 @@ func (h *HostManageSvc) DetailsHostManage(id int) (hostManageRes response.HostMa return } -// ListHostManage 列表 -func (h *HostManageSvc) ListHostManage(req request.ListHostManageReq) (total int64, hostManageListRes []response.HostManagesRes, err error) { +// PageListHostManage 列表-分页 +func (h *HostManageSvc) PageListHostManage(req request.ListHostManageReq) (total int64, hostManageListRes []response.HostManagesRes, err error) { db, err := client.GetDbClient() if err != nil { err = resp.DbConnectError.WithError(err) @@ -634,3 +634,23 @@ func generatePushExportXlsx(push []ExportIpStr) (string, error) { err := file.Save(conf.Options.TempDirPrefix + saveFileName) return saveFileName, err } + +// ListHostManage 列表 +func (h *HostManageSvc) ListHostManage() (hostManagesListRes []response.HostManagesListRes, err error) { + db, err := client.GetDbClient() + if err != nil { + err = resp.DbConnectError.WithError(err) + return + } + + finder := db.Table("host_manage").Where("is_delete = 0") + + finder.OrderBy("id") + //查询任务 + err = finder.Select("id,host_name").Find(&hostManagesListRes) + if err != nil { + err = resp.DbSelectError.WithError(err) + return + } + return +}