diff --git a/src/modules/monitor/controller/sys_job_log.go b/src/modules/monitor/controller/sys_job_log.go index 6223f884..85a8a823 100644 --- a/src/modules/monitor/controller/sys_job_log.go +++ b/src/modules/monitor/controller/sys_job_log.go @@ -43,25 +43,9 @@ func (s *SysJobLogController) List(c *gin.Context) { querys := ctx.QueryMap(c) data := s.sysJobLogService.SelectJobLogPage(querys) - language := ctx.AcceptLanguage(c) - - // 反查多语言key - if v, ok := querys["jobName"]; ok && v != "" { - querys["jobName"] = i18n.ValueKey(language, querys["jobName"].(string)) - } - - dataI18n := s.sysJobLogService.SelectJobLogPage(querys) - totalI18n := parse.Number(dataI18n["total"]) - if totalI18n != 0 { - rows := data["rows"].([]model.SysJobLog) - total := parse.Number(data["total"]) - rowsI18n := dataI18n["rows"].([]model.SysJobLog) - data["rows"] = append(rows, rowsI18n...) - data["total"] = total + totalI18n - } - rows := data["rows"].([]model.SysJobLog) // 闭包函数处理多语言 + language := ctx.AcceptLanguage(c) converI18n := func(language string, arr *[]model.SysJobLog) { for i := range *arr { (*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName) diff --git a/src/modules/monitor/repository/sys_job.impl.go b/src/modules/monitor/repository/sys_job.impl.go index 19040fab..196601fb 100644 --- a/src/modules/monitor/repository/sys_job.impl.go +++ b/src/modules/monitor/repository/sys_job.impl.go @@ -234,9 +234,7 @@ func (r *SysJobImpl) InsertJob(sysJob model.SysJob) string { if sysJob.InvokeTarget != "" { params["invoke_target"] = sysJob.InvokeTarget } - if sysJob.TargetParams != "" { - params["target_params"] = sysJob.TargetParams - } + params["target_params"] = sysJob.TargetParams if sysJob.CronExpression != "" { params["cron_expression"] = sysJob.CronExpression } @@ -252,9 +250,7 @@ func (r *SysJobImpl) InsertJob(sysJob model.SysJob) string { if sysJob.SaveLog != "" { params["save_log"] = sysJob.SaveLog } - if sysJob.Remark != "" { - params["remark"] = sysJob.Remark - } + params["remark"] = sysJob.Remark if sysJob.CreateBy != "" { params["create_by"] = sysJob.CreateBy params["create_time"] = time.Now().UnixMilli() @@ -300,9 +296,7 @@ func (r *SysJobImpl) UpdateJob(sysJob model.SysJob) int64 { if sysJob.InvokeTarget != "" { params["invoke_target"] = sysJob.InvokeTarget } - if sysJob.TargetParams != "" { - params["target_params"] = sysJob.TargetParams - } + params["target_params"] = sysJob.TargetParams if sysJob.CronExpression != "" { params["cron_expression"] = sysJob.CronExpression } @@ -318,9 +312,7 @@ func (r *SysJobImpl) UpdateJob(sysJob model.SysJob) int64 { if sysJob.SaveLog != "" { params["save_log"] = sysJob.SaveLog } - if sysJob.Remark != "" { - params["remark"] = sysJob.Remark - } + params["remark"] = sysJob.Remark if sysJob.UpdateBy != "" { params["update_by"] = sysJob.UpdateBy params["update_time"] = time.Now().UnixMilli()