TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-03 16:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: 将数据库实例管理集成到数据库管理模块中

Browse Source
This commit is contained in:
kanzihuang
2023-08-30 22:41:42 +08:00
parent f7b685cfad
commit 86ad183c41
22 changed files with 446 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/internal/db/infrastructure/persistence/db.go
View File

@@ -16,12 +16,17 @@ func newDbRepo() repository.Db {
// 分页获取数据库信息列表
func (d *dbRepoImpl) GetDbList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) *model.PageResult[any] {
qd := gormx.NewQuery(new(entity.Db)).
Like("host", condition.Host).
Like("database", condition.Database).
In("tag_id", condition.TagIds).
RLike("tag_path", condition.TagPath).
OrderByAsc("tag_path")
qd := gormx.NewQueryWithTableName("t_db db").
Select("db.*, inst.name instance_name, inst.type instance_type").
Joins("JOIN t_instance inst ON db.instance_id = inst.id").
Eq("db.instance_id", condition.InstanceId).
Like("db.database", condition.Database).
In("db.tag_id", condition.TagIds).
RLike("db.tag_path", condition.TagPath).
Eq0("db."+model.DeletedColumn, model.ModelUndeleted).
Eq0("inst."+model.DeletedColumn, model.ModelUndeleted).
OrderByAsc("db.tag_path")
return gormx.PageQuery(qd, pageParam, toEntity)
}
@@ -30,6 +35,9 @@ func (d *dbRepoImpl) Count(condition *entity.DbQuery) int64 {
if len(condition.TagIds) > 0 {
where["tag_id"] = condition.TagIds
}
if condition.InstanceId > 0 {
where["instance_id"] = condition.InstanceId
}
return gormx.CountByCond(new(entity.Db), where)
}