[fix]异常处理

This commit is contained in:
panda
2024-06-06 20:46:35 +08:00
parent 41b61ebf1e
commit 4cee5ae537
24 changed files with 801 additions and 600 deletions

View File

@@ -2,18 +2,17 @@ package services
import (
"pandax/apps/system/entity"
"pandax/kit/biz"
"pandax/pkg/global"
)
type (
SysDictDataModel interface {
Insert(data entity.SysDictData) *entity.SysDictData
FindOne(dictCode int64) *entity.SysDictData
FindListPage(page, pageSize int, data entity.SysDictData) (*[]entity.SysDictData, int64)
FindList(data entity.SysDictData) *[]entity.SysDictData
Update(data entity.SysDictData) *entity.SysDictData
Delete(dictCode []int64)
Insert(data entity.SysDictData) (*entity.SysDictData, error)
FindOne(dictCode int64) (*entity.SysDictData, error)
FindListPage(page, pageSize int, data entity.SysDictData) (*[]entity.SysDictData, int64, error)
FindList(data entity.SysDictData) (*[]entity.SysDictData, error)
Update(data entity.SysDictData) error
Delete(dictCode []int64) error
}
sysDictDataModelImpl struct {
@@ -25,20 +24,18 @@ var SysDictDataModelDao SysDictDataModel = &sysDictDataModelImpl{
table: `sys_dict_data`,
}
func (m *sysDictDataModelImpl) Insert(data entity.SysDictData) *entity.SysDictData {
func (m *sysDictDataModelImpl) Insert(data entity.SysDictData) (*entity.SysDictData, error) {
err := global.Db.Table(m.table).Create(&data).Error
biz.ErrIsNil(err, "新增字典数据失败")
return &data
return &data, err
}
func (m *sysDictDataModelImpl) FindOne(codeId int64) *entity.SysDictData {
func (m *sysDictDataModelImpl) FindOne(codeId int64) (*entity.SysDictData, error) {
resData := new(entity.SysDictData)
err := global.Db.Table(m.table).Where("dict_code = ?", codeId).First(resData).Error
biz.ErrIsNil(err, "查询字典数据信息失败")
return resData
return resData, err
}
func (m *sysDictDataModelImpl) FindListPage(page, pageSize int, data entity.SysDictData) (*[]entity.SysDictData, int64) {
func (m *sysDictDataModelImpl) FindListPage(page, pageSize int, data entity.SysDictData) (*[]entity.SysDictData, int64, error) {
list := make([]entity.SysDictData, 0)
var total int64 = 0
offset := pageSize * (page - 1)
@@ -56,12 +53,14 @@ func (m *sysDictDataModelImpl) FindListPage(page, pageSize int, data entity.SysD
}
db.Where("delete_time IS NULL")
err := db.Count(&total).Error
if err != nil {
return nil, 0, err
}
err = db.Order("dict_sort").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询字典数据分页列表信息失败")
return &list, total
return &list, total, err
}
func (m *sysDictDataModelImpl) FindList(data entity.SysDictData) *[]entity.SysDictData {
func (m *sysDictDataModelImpl) FindList(data entity.SysDictData) (*[]entity.SysDictData, error) {
list := make([]entity.SysDictData, 0)
db := global.Db.Table(m.table)
@@ -77,18 +76,13 @@ func (m *sysDictDataModelImpl) FindList(data entity.SysDictData) *[]entity.SysDi
}
db.Where("delete_time IS NULL")
err := db.Order("dict_sort").Find(&list).Error
biz.ErrIsNil(err, "查询字典数据列表信息失败")
return &list
return &list, err
}
func (m *sysDictDataModelImpl) Update(data entity.SysDictData) *entity.SysDictData {
err := global.Db.Table(m.table).Where("dict_code = ?", data.DictCode).Updates(&data).Error
biz.ErrIsNil(err, "修改字典数据信息失败")
return &data
func (m *sysDictDataModelImpl) Update(data entity.SysDictData) error {
return global.Db.Table(m.table).Where("dict_code = ?", data.DictCode).Updates(&data).Error
}
func (m *sysDictDataModelImpl) Delete(codeIds []int64) {
err := global.Db.Table(m.table).Delete(&entity.SysOrganization{}, "dict_code in (?)", codeIds).Error
biz.ErrIsNil(err, "删除字典数据信息失败")
return
func (m *sysDictDataModelImpl) Delete(codeIds []int64) error {
return global.Db.Table(m.table).Delete(&entity.SysOrganization{}, "dict_code in (?)", codeIds).Error
}