调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang
2021-03-04 23:45:16 +08:00
parent 734a48dbb8
commit e2952fa393
137 changed files with 3638 additions and 3544 deletions
+9 -13
View File
@@ -2,13 +2,14 @@ package service
import (
"errors"
"gorm.io/gorm"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
"go-admin/common/log"
common "go-admin/common/models"
"go-admin/common/service"
"gorm.io/gorm"
)
type SysLoginLog struct {
@@ -19,7 +20,6 @@ type SysLoginLog struct {
func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error {
var err error
var data system.SysLoginLog
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -29,7 +29,7 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste
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 +39,17 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste
func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLoginLog) error {
var err error
var data system.SysLoginLog
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 +59,11 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo
func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error {
var err error
var data system.SysLoginLog
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 +73,11 @@ func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error {
func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error {
var err error
var data system.SysLoginLog
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 {
@@ -94,13 +91,12 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error {
func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error {
var err error
var data system.SysLoginLog
msgID := e.MsgID
db := e.Orm.Model(&data).
Where(d.Ids).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 {