diff --git a/internal/app/repository/db.go b/internal/app/repository/db.go index 67ecc2a..e610bf4 100644 --- a/internal/app/repository/db.go +++ b/internal/app/repository/db.go @@ -9,6 +9,7 @@ import ( "github.com/lzh-1625/go_process_manager/internal/app/repository/query" "github.com/glebarez/sqlite" + "gorm.io/gen" "gorm.io/gorm" "gorm.io/gorm/logger" ) @@ -44,12 +45,12 @@ func InitDb() { // db = gdb.Session(&defaultConfig).Debug() db.AutoMigrate(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{}) - // g := gen.NewGenerator(gen.Config{ - // OutPath: "internal/app/repository/query", - // Mode: gen.WithoutContext | gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode - // }) - // g.UseDB(db) - // g.ApplyBasic(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{}) - // g.Execute() + g := gen.NewGenerator(gen.Config{ + OutPath: "internal/app/repository/query", + Mode: gen.WithoutContext | gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode + }) + g.UseDB(db) + g.ApplyBasic(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{}) + g.Execute() query.SetDefault(db) } diff --git a/internal/app/repository/query/ws_shares.gen.go b/internal/app/repository/query/ws_shares.gen.go index 989e498..64bc81e 100644 --- a/internal/app/repository/query/ws_shares.gen.go +++ b/internal/app/repository/query/ws_shares.gen.go @@ -27,7 +27,10 @@ func newWsShare(db *gorm.DB, opts ...gen.DOOption) wsShare { tableName := _wsShare.wsShareDo.TableName() _wsShare.ALL = field.NewAsterisk(tableName) - _wsShare.Id = field.NewInt(tableName, "id") + _wsShare.ID = field.NewUint(tableName, "id") + _wsShare.CreatedAt = field.NewTime(tableName, "created_at") + _wsShare.UpdatedAt = field.NewTime(tableName, "updated_at") + _wsShare.DeletedAt = field.NewField(tableName, "deleted_at") _wsShare.Pid = field.NewInt(tableName, "pid") _wsShare.Write = field.NewBool(tableName, "write") _wsShare.ExpireTime = field.NewTime(tableName, "expire_time") @@ -43,7 +46,10 @@ type wsShare struct { wsShareDo ALL field.Asterisk - Id field.Int + ID field.Uint + CreatedAt field.Time + UpdatedAt field.Time + DeletedAt field.Field Pid field.Int Write field.Bool ExpireTime field.Time @@ -65,7 +71,10 @@ func (w wsShare) As(alias string) *wsShare { func (w *wsShare) updateTableName(table string) *wsShare { w.ALL = field.NewAsterisk(table) - w.Id = field.NewInt(table, "id") + w.ID = field.NewUint(table, "id") + w.CreatedAt = field.NewTime(table, "created_at") + w.UpdatedAt = field.NewTime(table, "updated_at") + w.DeletedAt = field.NewField(table, "deleted_at") w.Pid = field.NewInt(table, "pid") w.Write = field.NewBool(table, "write") w.ExpireTime = field.NewTime(table, "expire_time") @@ -87,8 +96,11 @@ func (w *wsShare) GetFieldByName(fieldName string) (field.OrderExpr, bool) { } func (w *wsShare) fillFieldMap() { - w.fieldMap = make(map[string]field.Expr, 6) - w.fieldMap["id"] = w.Id + w.fieldMap = make(map[string]field.Expr, 9) + w.fieldMap["id"] = w.ID + w.fieldMap["created_at"] = w.CreatedAt + w.fieldMap["updated_at"] = w.UpdatedAt + w.fieldMap["deleted_at"] = w.DeletedAt w.fieldMap["pid"] = w.Pid w.fieldMap["write"] = w.Write w.fieldMap["expire_time"] = w.ExpireTime diff --git a/internal/app/repository/ws_share.go b/internal/app/repository/ws_share.go index 071ff79..ededce4 100644 --- a/internal/app/repository/ws_share.go +++ b/internal/app/repository/ws_share.go @@ -20,18 +20,18 @@ func (p *wsShare) AddShareData(data model.WsShare) error { func (p *wsShare) GetWsShareList() (data []*model.WsShare) { ws := query.WsShare - data, _ = ws.Find() + data, _ = ws.Order(ws.CreatedAt.Desc()).Find() return } func (p *wsShare) Delete(id int) error { ws := query.WsShare - _, err := ws.Where(ws.Id.Eq(id)).Delete() + _, err := ws.Where(ws.ID.Eq(uint(id))).Delete() return err } func (p *wsShare) Edit(data *model.WsShare) error { ws := query.WsShare - _, err := ws.Where(ws.Id.Eq(int(data.ID))).Updates(data) + _, err := ws.Where(ws.ID.Eq(uint(data.ID))).Updates(data) return err }