public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-13 15:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] 任务异常抛出迁移到api层

Browse Source
This commit is contained in:
PandaX
2024-02-25 12:38:39 +08:00
parent fe38ec7143
commit 165e3e4989
4 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/job/api/job.go
View File

@@ -22,7 +22,8 @@ func (j *JobApi) CreateJob(rc *restfulx.ReqCtx) {
job.Id = model2.GenerateID()
job.Owner = rc.LoginAccount.UserName
job.OrgId = rc.LoginAccount.OrganizationId
j.JobApp.Insert(job)
_, err := j.JobApp.Insert(job)
biz.ErrIsNil(err, "添加任务失败")
}
func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) {
@@ -35,7 +36,8 @@ func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) {
job.RoleId = rc.LoginAccount.RoleId
job.Owner = rc.LoginAccount.UserName
list, total := j.JobApp.FindListPage(pageNum, pageSize, job)
list, total, err := j.JobApp.FindListPage(pageNum, pageSize, job)
biz.ErrIsNil(err, "查询任务列表失败")
rc.ResData = model.ResultPage{
Total: total,
PageNum: int64(pageNum),
@@ -46,35 +48,39 @@ func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) {
func (j *JobApi) GetJob(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParam(rc, "jobId")
rc.ResData = j.JobApp.FindOne(jobId)
data, err := j.JobApp.FindOne(jobId)
biz.ErrIsNil(err, "查询任务失败")
rc.ResData = data
}
func (l *JobApi) UpdateJob(rc *restfulx.ReqCtx) {
var job entity.SysJob
restfulx.BindQuery(rc, &job)
l.JobApp.Update(job)
_, err := l.JobApp.Update(job)
biz.ErrIsNil(err, "修改任务失败")
}
func (l *JobApi) DeleteJob(rc *restfulx.ReqCtx) {
jobIds := restfulx.PathParam(rc, "jobId")
group := strings.Split(jobIds, ",")
l.JobApp.Delete(group)
err := l.JobApp.Delete(group)
biz.ErrIsNil(err, "删除任务失败")
}
func (l *JobApi) StopJobForService(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParam(rc, "jobId")
job := l.JobApp.FindOne(jobId)
job, err := l.JobApp.FindOne(jobId)
biz.ErrIsNil(err, "任务不存在")
jobs.Remove(jobs.Crontab, job.EntryId)
}
func (l *JobApi) StartJobForService(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParam(rc, "jobId")
job := l.JobApp.FindOne(jobId)
job, err := l.JobApp.FindOne(jobId)
biz.ErrIsNil(err, "任务不存在")
biz.IsTrue(job.Status == "0", "以关闭的任务不能开启")
biz.IsTrue(job.EntryId == 0, "任务不能重复启动")
var err error
var j = &jobs.ExecJob{}
j.InvokeTarget = job.TargetInvoke
j.CronExpression = job.CronExpression
@@ -87,7 +93,8 @@ func (l *JobApi) StartJobForService(rc *restfulx.ReqCtx) {
job.EntryId, err = jobs.AddJob(jobs.Crontab, j)
biz.ErrIsNil(err, "添加任务失败，可能任务表达式错误")
l.JobApp.Update(*job)
_, err = l.JobApp.Update(*job)
biz.ErrIsNil(err, "修改任务失败")
}
func (l *JobApi) UpdateStatusJob(rc *restfulx.ReqCtx) {
@@ -96,5 +103,6 @@ func (l *JobApi) UpdateStatusJob(rc *restfulx.ReqCtx) {
sjob := entity.SysJob{}
sjob.Id = job.JobId
sjob.Status = job.Status
l.JobApp.Update(sjob)
_, err := l.JobApp.Update(sjob)
biz.ErrIsNil(err, "修改任务状态失败")
}

10
apps/job/api/log_job.go
View File

@@ -3,6 +3,7 @@ package api
import (
"pandax/apps/job/entity"
"pandax/apps/job/services"
"pandax/kit/biz"
"pandax/kit/model"
"pandax/kit/restfulx"
"strings"
@@ -23,7 +24,8 @@ func (l *JobLogApi) GetJobLogList(rc *restfulx.ReqCtx) {
job.RoleId = rc.LoginAccount.RoleId
job.Owner = rc.LoginAccount.UserName
list, total := l.JobLogApp.FindListPage(pageNum, pageSize, job)
list, total, err := l.JobLogApp.FindListPage(pageNum, pageSize, job)
biz.ErrIsNil(err, "查询任务列表失败")
rc.ResData = model.ResultPage{
Total: total,
PageNum: int64(pageNum),
@@ -36,10 +38,12 @@ func (l *JobLogApi) GetJobLogList(rc *restfulx.ReqCtx) {
func (l *JobLogApi) DeleteJobLog(rc *restfulx.ReqCtx) {
logIds := restfulx.PathParam(rc, "id")
group := strings.Split(logIds, ",")
l.JobLogApp.Delete(group)
err := l.JobLogApp.Delete(group)
biz.ErrIsNil(err, "删除失败")
}
// DeleteAll 清空登录日志
func (l *JobLogApi) DeleteAll(rc *restfulx.ReqCtx) {
l.JobLogApp.DeleteAll()
err := l.JobLogApp.DeleteAll()
biz.ErrIsNil(err, "清空失败")
}