操作日志查询增加错误,关键字,同步错误返回显示平台名

This commit is contained in:
苏尹岚
2020-02-03 11:49:14 +08:00
parent daabd0ed3f
commit 4439135bbd
14 changed files with 108 additions and 67 deletions

View File

@@ -29,7 +29,7 @@ type CheckCookie struct {
Status string `json:"status"`
}
func AddOperateEvent(ctx *jxcontext.Context, accessUUID, jsonData string) (err error) {
func AddOperateEvent(ctx *jxcontext.Context, accessUUID, jsonData string, errCode, errMsg string, useTime int) (err error) {
var (
apiFunction string
db = dao.GetDB()
@@ -54,6 +54,9 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID, jsonData string) (err e
UserID: ctx.GetUserID(),
AccessUUID: accessUUID,
JsonData: jsonData,
ErrCode: errCode,
ErrMsg: errMsg,
UseTime: useTime,
}
dao.Begin(db)
defer func() {
@@ -95,7 +98,7 @@ func DeleteOperateEventAndDetail(ctx *jxcontext.Context, deleteTime time.Time) (
return err
}
func GetOperateEvents(ctx *jxcontext.Context, name string, apiFunctions []string, operateTypes, skuIDs, storeIDs []int, fromTime, toTime string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
func GetOperateEvents(ctx *jxcontext.Context, name string, apiFunctions []string, operateTypes, skuIDs, storeIDs []int, fromTime, toTime, keyword string, errType, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
var (
fromTimeP time.Time
toTimeP time.Time
@@ -109,7 +112,7 @@ func GetOperateEvents(ctx *jxcontext.Context, name string, apiFunctions []string
}
pageSize = jxutils.FormalizePageSize(pageSize)
offset = jxutils.FormalizePageOffset(offset)
operateEventExt, totalCount, err := dao.GetOperateEvents(db, name, apiFunctions, operateTypes, skuIDs, storeIDs, fromTimeP, toTimeP, offset, pageSize)
operateEventExt, totalCount, err := dao.GetOperateEvents(db, name, apiFunctions, operateTypes, skuIDs, storeIDs, fromTimeP, toTimeP, keyword, errType, offset, pageSize)
if err != nil {
return pageInfo, err
}