Merge branch 'dev'

This commit is contained in:
zhangwenjian committed 2021-06-13 23:07:37 +08:00
commit 372248c819
219 files changed
+9367 -8029

No files matched your search

+102 -53
View File
@@ -2,11 +2,12 @@ package service
import (
"errors"
"go-admin/app/admin/models/system"
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
common "go-admin/common/models"
"go-admin/common/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
)
@@ -14,12 +15,9 @@ 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
err = e.Orm.Model(&data).
// GetPage 获取SysConfig列表
func (e *SysConfig) GetPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
err := e.Orm.
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
@@ -33,28 +31,9 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
return nil
}
func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error {
var err error
var data system.SysConfig
err = e.Orm.Model(&data).
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
).
Find(list).Error
if err != nil {
e.Log.Errorf("Service GetSysConfigByKey error:%s", err)
return err
}
return nil
}
// GetSysConfig 获取SysConfig对象
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error {
var data system.SysConfig
err := e.Orm.Model(&data).
First(model, d.GetId()).Error
// Get 获取SysConfig对象
func (e *SysConfig) Get(d *dto.SysConfigById, model *models.SysConfig) error {
err := e.Orm.First(model, d.GetId()).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetSysConfigPage error:%s", err)
@@ -67,13 +46,12 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig)
return nil
}
// InsertSysConfig 创建SysConfig对象
func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
// Insert 创建SysConfig对象
func (e *SysConfig) Insert(c *dto.SysConfigControl) error {
var err error
var data system.SysConfig
err = e.Orm.Model(&data).
Create(model).Error
var data models.SysConfig
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("Service InsertSysConfig error:%s", err)
return err
@@ -81,13 +59,13 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
return nil
}
// UpdateSysConfig 修改SysConfig对象
func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
// Update 修改SysConfig对象
func (e *SysConfig) Update(c *dto.SysConfigControl) error {
var err error
db := e.Orm.Model(&system.SysConfig{Model: common.Model{
Id: c.GetId().(int),
}}).Updates(c)
var model = models.SysConfig{}
e.Orm.First(&model, c.GetId())
c.Generate(&model)
db := e.Orm.Save(&model)
err = db.Error
if err != nil {
e.Log.Errorf("Service UpdateSysConfig error:%s", err)
@@ -100,12 +78,70 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
return nil
}
// RemoveSysConfig 删除SysConfig
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error {
// SetSysConfig 修改SysConfig对象
func (e *SysConfig) SetSysConfig(c *[]dto.GetSetSysConfigReq) error {
var err error
var data system.SysConfig
for _, req := range *c {
var model = models.SysConfig{}
e.Orm.Where("config_key = ?", req.ConfigKey).First(&model)
if model.Id != 0 {
req.Generate(&model)
db := e.Orm.Save(&model)
err = db.Error
if err != nil {
e.Log.Errorf("Service SetSysConfig error:%s", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
}
}
return nil
}
db := e.Orm.Model(&data).Delete(c, d.Ids)
func (e *SysConfig) GetForSet(c *[]dto.GetSetSysConfigReq) error {
var err error
var data models.SysConfig
err = e.Orm.Model(&data).
Find(c).Error
if err != nil {
e.Log.Errorf("Service GetSysConfigPage error:%s", err)
return err
}
return nil
}
func (e *SysConfig) UpdateForSet(c *[]dto.GetSetSysConfigReq) error {
m := *c
for _, req := range m {
var data models.SysConfig
if err := e.Orm.Where("config_key = ?", req.ConfigKey).
First(&data).Error; err != nil {
e.Log.Errorf("Service GetSysConfigPage error:%s", err)
return err
}
if data.ConfigValue != req.ConfigValue {
data.ConfigValue = req.ConfigValue
if err := e.Orm.Save(&data).Error; err != nil {
e.Log.Errorf("Service GetSysConfigPage error:%s", err)
return err
}
}
}
return nil
}
// Remove 删除SysConfig
func (e *SysConfig) Remove(d *dto.SysConfigById) error {
var err error
var data models.SysConfig
db := e.Orm.Delete(&data, d.Ids)
if db.Error != nil {
err = db.Error
e.Log.Errorf("Service RemoveSysConfig error:%s", err)
@@ -118,16 +154,29 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e
return nil
}
// GetSysConfigByKEY 根据Key获取SysConfig
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
// GetWithKey 根据Key获取SysConfig
func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigByKEYForServiceResp) error {
var err error
var data system.SysConfig
data.ConfigKey = c.ConfigKey
err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error
var data models.SysConfig
err = e.Orm.Table(data.TableName()).Where("config_key = ?", c.ConfigKey).First(resp).Error
if err != nil {
e.Log.Errorf("Service GetSysConfigByKEY error:%s", err)
e.Log.Errorf("At Service GetSysConfigByKEY Error:%s", err)
return err
}
return nil
}
func (e *SysConfig) GetWithKeyList(c *dto.SysConfigSearch, list *[]models.SysConfig) error {
var err error
err = e.Orm.
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
).
Find(list).Error
if err != nil {
e.Log.Errorf("Service GetSysConfigByKey error:%s", err)
return err
}
return nil
}