simonzhangsz/omc_api
1
0
Fork 0
Code Activity

marge: 合并代码

Browse Source
This commit is contained in:
TsMask
2023-12-29 20:22:43 +08:00
parent 615ab2eb2e
commit 3c5c77b881
39 changed files with 1571 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/monitor/controller/sys_job_log.go
View File

@@ -43,22 +43,9 @@ func (s *SysJobLogController) List(c *gin.Context) {
querys := ctx.QueryMap(c)
data := s.sysJobLogService.SelectJobLogPage(querys)
language := ctx.AcceptLanguage(c)
// 反查多语言key
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)

16
src/modules/monitor/repository/sys_job.impl.go
View File

@@ -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()