调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+11 -20
View File
@@ -5,7 +5,6 @@ import (
"go-admin/app/admin/models"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
"go-admin/app/admin/service/dto"
"go-admin/common/service"
"gorm.io/gorm"
@@ -19,7 +18,6 @@ type {{.ClassName}} struct {
func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -30,7 +28,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
return nil
@@ -40,7 +38,6 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a
func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -50,26 +47,23 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
// Insert{{.ClassName}} 创建{{.ClassName}}对象
func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) error {
func (e *{{.ClassName}}) Insert{{.ClassName}}(c *models.{{.ClassName}}) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Model(&data).
Create(model).Error
err = e.Orm.Create(c).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
return nil
@@ -78,15 +72,13 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) erro
// Update{{.ClassName}} 修改{{.ClassName}}对象
func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actions.DataPermission) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
db := e.Orm.Model(c).
Scopes(
actions.Permission(data.TableName(), p),
actions.Permission(c.TableName(), p),
).Where(c.GetId()).Updates(c)
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -100,7 +92,6 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actio
func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -108,7 +99,7 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti
).Delete(&data, d.GetId())
if db.Error != nil {
err = db.Error
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
e.Log.Errorf("Delete error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -116,4 +107,4 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti
return err
}
return nil
}
}