调整整体架构写法

调整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

+8 -16
View File
@@ -5,7 +5,6 @@ import (
"go-admin/app/admin/models/system"
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/service"
"gorm.io/gorm"
)
@@ -14,12 +13,10 @@ type SysConfig struct {
service.Service
}
// GetSysConfigPage 获取SysConfig列表
func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error {
var err error
var data system.SysConfig
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -29,7 +26,7 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
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
@@ -39,18 +36,17 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error {
var err error
var data system.SysConfig
msgID := e.MsgID
db := e.Orm.Model(&data).
First(model, d.GetId())
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
@@ -60,12 +56,11 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig)
func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
var err error
var data system.SysConfig
msgID := e.MsgID
err = e.Orm.Model(&data).
Create(model).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
@@ -75,12 +70,11 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
var err error
var data system.SysConfig
msgID := e.MsgID
db := e.Orm.Model(&data).
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 {
@@ -91,16 +85,15 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
}
// RemoveSysConfig 删除SysConfig
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById,c *system.SysConfig) error {
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error {
var err error
var data system.SysConfig
msgID := e.MsgID
db := e.Orm.Model(&data).
Where(d.GetId()).Delete(c)
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 {
@@ -114,11 +107,10 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById,c *system.SysConfig) er
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
var err error
var data system.SysConfig
msgID := e.MsgID
data.ConfigKey = c.ConfigKey
err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}