From 4645862566b8228c43d694b0441caadb151325c7 Mon Sep 17 00:00:00 2001 From: PandaX <18610165312@163.com> Date: Sun, 25 Feb 2024 12:51:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8A=9B=E5=87=BA=E8=BF=81=E7=A7=BB=E5=88=B0?= =?UTF-8?q?api=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/log/api/log_login.go | 17 ++++++++---- apps/log/api/log_oper.go | 12 ++++++--- apps/log/services/log_login.go | 47 ++++++++++++++++------------------ apps/log/services/log_oper.go | 40 ++++++++++++++--------------- 4 files changed, 61 insertions(+), 55 deletions(-) diff --git a/apps/log/api/log_login.go b/apps/log/api/log_login.go index c339b4e..08fc976 100644 --- a/apps/log/api/log_login.go +++ b/apps/log/api/log_login.go @@ -3,6 +3,7 @@ package api import ( "pandax/apps/log/entity" "pandax/apps/log/services" + "pandax/kit/biz" "pandax/kit/model" "pandax/kit/restfulx" "pandax/kit/utils" @@ -17,7 +18,8 @@ func (l *LogLoginApi) GetLoginLogList(rc *restfulx.ReqCtx) { pageSize := restfulx.QueryInt(rc, "pageSize", 10) loginLocation := restfulx.QueryParam(rc, "loginLocation") username := restfulx.QueryParam(rc, "username") - list, total := l.LogLoginApp.FindListPage(pageNum, pageSize, entity.LogLogin{LoginLocation: loginLocation, Username: username}) + list, total, err := l.LogLoginApp.FindListPage(pageNum, pageSize, entity.LogLogin{LoginLocation: loginLocation, Username: username}) + biz.ErrIsNil(err, "查询任务日志失败") rc.ResData = model.ResultPage{ Total: total, PageNum: int64(pageNum), @@ -28,21 +30,26 @@ func (l *LogLoginApi) GetLoginLogList(rc *restfulx.ReqCtx) { func (l *LogLoginApi) GetLoginLog(rc *restfulx.ReqCtx) { infoId := restfulx.PathParamInt(rc, "infoId") - rc.ResData = l.LogLoginApp.FindOne(int64(infoId)) + data, err := l.LogLoginApp.FindOne(int64(infoId)) + biz.ErrIsNil(err, "查询日志信息失败") + rc.ResData = data } func (l *LogLoginApi) UpdateLoginLog(rc *restfulx.ReqCtx) { var log entity.LogLogin restfulx.BindQuery(rc, &log) - l.LogLoginApp.Update(log) + _, err := l.LogLoginApp.Update(log) + biz.ErrIsNil(err, "修改日志信息失败") } func (l *LogLoginApi) DeleteLoginLog(rc *restfulx.ReqCtx) { infoIds := restfulx.PathParam(rc, "infoId") group := utils.IdsStrToIdsIntGroup(infoIds) - l.LogLoginApp.Delete(group) + err := l.LogLoginApp.Delete(group) + biz.ErrIsNil(err, "删除日志失败") } func (l *LogLoginApi) DeleteAll(rc *restfulx.ReqCtx) { - l.LogLoginApp.DeleteAll() + err := l.LogLoginApp.DeleteAll() + biz.ErrIsNil(err, "清空日志失败") } diff --git a/apps/log/api/log_oper.go b/apps/log/api/log_oper.go index ca17053..aed6f7b 100644 --- a/apps/log/api/log_oper.go +++ b/apps/log/api/log_oper.go @@ -3,6 +3,7 @@ package api import ( "pandax/apps/log/entity" "pandax/apps/log/services" + "pandax/kit/biz" "pandax/kit/model" "pandax/kit/restfulx" "pandax/kit/utils" @@ -18,7 +19,8 @@ func (l *LogOperApi) GetOperLogList(rc *restfulx.ReqCtx) { businessType := restfulx.QueryParam(rc, "businessType") operName := restfulx.QueryParam(rc, "operName") title := restfulx.QueryParam(rc, "title") - list, total := l.LogOperApp.FindListPage(pageNum, pageSize, entity.LogOper{BusinessType: businessType, OperName: operName, Title: title}) + list, total, err := l.LogOperApp.FindListPage(pageNum, pageSize, entity.LogOper{BusinessType: businessType, OperName: operName, Title: title}) + biz.ErrIsNil(err, "查询操作日志列表失败") rc.ResData = model.ResultPage{ Total: total, PageNum: int64(pageNum), @@ -29,15 +31,17 @@ func (l *LogOperApi) GetOperLogList(rc *restfulx.ReqCtx) { func (l *LogOperApi) GetOperLog(rc *restfulx.ReqCtx) { operId := restfulx.PathParamInt(rc, "operId") - rc.ResData = l.LogOperApp.FindOne(int64(operId)) + data, err := l.LogOperApp.FindOne(int64(operId)) + biz.ErrIsNil(err, "查询操作日志失败") + rc.ResData = data } func (l *LogOperApi) DeleteOperLog(rc *restfulx.ReqCtx) { operIds := restfulx.PathParam(rc, "operId") group := utils.IdsStrToIdsIntGroup(operIds) - l.LogOperApp.Delete(group) + biz.ErrIsNil(l.LogOperApp.Delete(group), "删除操作日志失败") } func (l *LogOperApi) DeleteAll(rc *restfulx.ReqCtx) { - l.LogOperApp.DeleteAll() + biz.ErrIsNil(l.LogOperApp.DeleteAll(), "清空操作日志失败") } diff --git a/apps/log/services/log_login.go b/apps/log/services/log_login.go index 474a5df..5fb07db 100644 --- a/apps/log/services/log_login.go +++ b/apps/log/services/log_login.go @@ -2,18 +2,17 @@ package services import ( "pandax/apps/log/entity" - "pandax/kit/biz" "pandax/pkg/global" ) type ( LogLoginModel interface { - Insert(data entity.LogLogin) *entity.LogLogin - FindOne(infoId int64) *entity.LogLogin - FindListPage(page, pageSize int, data entity.LogLogin) (*[]entity.LogLogin, int64) - Update(data entity.LogLogin) *entity.LogLogin - Delete(infoId []int64) - DeleteAll() + Insert(data entity.LogLogin) (*entity.LogLogin, error) + FindOne(infoId int64) (*entity.LogLogin, error) + FindListPage(page, pageSize int, data entity.LogLogin) (*[]entity.LogLogin, int64, error) + Update(data entity.LogLogin) (*entity.LogLogin, error) + Delete(infoId []int64) error + DeleteAll() error } logLoginModelImpl struct { @@ -25,19 +24,18 @@ var LogLoginModelDao LogLoginModel = &logLoginModelImpl{ table: `log_logins`, } -func (m *logLoginModelImpl) Insert(data entity.LogLogin) *entity.LogLogin { - global.Db.Table(m.table).Create(&data) - return &data +func (m *logLoginModelImpl) Insert(data entity.LogLogin) (*entity.LogLogin, error) { + err := global.Db.Table(m.table).Create(&data).Error + return &data, err } -func (m *logLoginModelImpl) FindOne(infoId int64) *entity.LogLogin { +func (m *logLoginModelImpl) FindOne(infoId int64) (*entity.LogLogin, error) { resData := new(entity.LogLogin) err := global.Db.Table(m.table).Where("info_id = ?", infoId).First(resData).Error - biz.ErrIsNil(err, "查询登录日志信息失败") - return resData + return resData, err } -func (m *logLoginModelImpl) FindListPage(page, pageSize int, data entity.LogLogin) (*[]entity.LogLogin, int64) { +func (m *logLoginModelImpl) FindListPage(page, pageSize int, data entity.LogLogin) (*[]entity.LogLogin, int64, error) { list := make([]entity.LogLogin, 0) var total int64 = 0 offset := pageSize * (page - 1) @@ -53,24 +51,23 @@ func (m *logLoginModelImpl) FindListPage(page, pageSize int, data entity.LogLogi db = db.Where("username like ?", "%"+data.Username+"%") } err := db.Where("delete_time IS NULL").Count(&total).Error + if err != nil { + return &list, total, err + } err = db.Order("info_id desc").Limit(pageSize).Offset(offset).Find(&list).Error - - biz.ErrIsNil(err, "查询登录分页日志信息失败") - return &list, total + return &list, total, err } -func (m *logLoginModelImpl) Update(data entity.LogLogin) *entity.LogLogin { +func (m *logLoginModelImpl) Update(data entity.LogLogin) (*entity.LogLogin, error) { err := global.Db.Table(m.table).Updates(&data).Error - biz.ErrIsNil(err, "修改登录日志信息失败") - return &data + return &data, err } -func (m *logLoginModelImpl) Delete(infoIds []int64) { +func (m *logLoginModelImpl) Delete(infoIds []int64) error { err := global.Db.Table(m.table).Delete(&entity.LogLogin{}, "info_id in (?)", infoIds).Error - biz.ErrIsNil(err, "删除登录日志信息失败") - return + return err } -func (m *logLoginModelImpl) DeleteAll() { - global.Db.Exec("DELETE FROM log_logins") +func (m *logLoginModelImpl) DeleteAll() error { + return global.Db.Exec("DELETE FROM log_logins").Error } diff --git a/apps/log/services/log_oper.go b/apps/log/services/log_oper.go index 33d8938..b7f7b81 100644 --- a/apps/log/services/log_oper.go +++ b/apps/log/services/log_oper.go @@ -2,17 +2,16 @@ package services import ( "pandax/apps/log/entity" - "pandax/kit/biz" "pandax/pkg/global" ) type ( LogOperModel interface { - Insert(data entity.LogOper) *entity.LogOper - FindOne(infoId int64) *entity.LogOper - FindListPage(page, pageSize int, data entity.LogOper) (*[]entity.LogOper, int64) - Delete(infoId []int64) - DeleteAll() + Insert(data entity.LogOper) (*entity.LogOper, error) + FindOne(infoId int64) (*entity.LogOper, error) + FindListPage(page, pageSize int, data entity.LogOper) (*[]entity.LogOper, int64, error) + Delete(infoId []int64) error + DeleteAll() error } logLogOperModelImpl struct { @@ -24,19 +23,18 @@ var LogOperModelDao LogOperModel = &logLogOperModelImpl{ table: `log_opers`, } -func (m *logLogOperModelImpl) Insert(data entity.LogOper) *entity.LogOper { - global.Db.Table(m.table).Create(&data) - return &data +func (m *logLogOperModelImpl) Insert(data entity.LogOper) (*entity.LogOper, error) { + err := global.Db.Table(m.table).Create(&data).Error + return &data, err } -func (m *logLogOperModelImpl) FindOne(operId int64) *entity.LogOper { +func (m *logLogOperModelImpl) FindOne(operId int64) (*entity.LogOper, error) { resData := new(entity.LogOper) err := global.Db.Table(m.table).Where("oper_id = ?", operId).First(resData).Error - biz.ErrIsNil(err, "查询操作日志信息失败") - return resData + return resData, err } -func (m *logLogOperModelImpl) FindListPage(page, pageSize int, data entity.LogOper) (*[]entity.LogOper, int64) { +func (m *logLogOperModelImpl) FindListPage(page, pageSize int, data entity.LogOper) (*[]entity.LogOper, int64, error) { list := make([]entity.LogOper, 0) var total int64 = 0 offset := pageSize * (page - 1) @@ -55,18 +53,18 @@ func (m *logLogOperModelImpl) FindListPage(page, pageSize int, data entity.LogOp db = db.Where("oper_name like ?", "%"+data.OperName+"%") } err := db.Where("delete_time IS NULL").Count(&total).Error + if err != nil { + return &list, total, err + } err = db.Order("create_time desc").Limit(pageSize).Offset(offset).Find(&list).Error - - biz.ErrIsNil(err, "查询操作分页日志信息失败") - return &list, total + return &list, total, err } -func (m *logLogOperModelImpl) Delete(operIds []int64) { +func (m *logLogOperModelImpl) Delete(operIds []int64) error { err := global.Db.Table(m.table).Delete(&entity.LogOper{}, "oper_id in (?)", operIds).Error - biz.ErrIsNil(err, "删除操作日志信息失败") - return + return err } -func (m *logLogOperModelImpl) DeleteAll() { - global.Db.Exec("DELETE FROM log_opers") +func (m *logLogOperModelImpl) DeleteAll() error { + return global.Db.Exec("DELETE FROM log_opers").Error }