public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] 修复清空删除任务日志

Browse Source
This commit is contained in:
PandaX
2023-11-22 08:05:51 +08:00
parent a1b9bf081c
commit e7b050f59b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ func (l *JobApi) StartJobForService(rc *restfulx.ReqCtx) {
j.OrgId = job.OrgId j.OrgId = job.OrgId
j.Owner = job.Owner j.Owner = job.Owner
job.EntryId, err = jobs.AddJob(jobs.Crontab, j) job.EntryId, err = jobs.AddJob(jobs.Crontab, j)
biz.ErrIsNil(err, "添加JOB失败") biz.ErrIsNil(err, "添加任务失败，可能任务表达式错误")
l.JobApp.Update(*job) l.JobApp.Update(*job)
} }

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

@@ -3,9 +3,9 @@ package api
import ( import (
"github.com/PandaXGO/PandaKit/model" "github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx" "github.com/PandaXGO/PandaKit/restfulx"
"github.com/PandaXGO/PandaKit/utils"
"pandax/apps/job/entity" "pandax/apps/job/entity"
"pandax/apps/job/services" "pandax/apps/job/services"
"strings"
) )
type JobLogApi struct { type JobLogApi struct {
@@ -34,8 +34,8 @@ func (l *JobLogApi) GetJobLogList(rc *restfulx.ReqCtx) {
// DeleteJobLog 批量删除登录日志 // DeleteJobLog 批量删除登录日志
func (l *JobLogApi) DeleteJobLog(rc *restfulx.ReqCtx) { func (l *JobLogApi) DeleteJobLog(rc *restfulx.ReqCtx) {
logIds := restfulx.QueryParam(rc, "logId") logIds := restfulx.PathParam(rc, "id")
group := utils.IdsStrToIdsIntGroup(logIds) group := strings.Split(logIds, ",")
l.JobLogApp.Delete(group) l.JobLogApp.Delete(group)
} }

4
apps/job/router/job_log.go
View File

@@ -31,12 +31,12 @@ func InitJobLogRouter(container *restful.Container) {
Writes(model.ResultPage{}). Writes(model.ResultPage{}).
Returns(200, "OK", model.ResultPage{})) Returns(200, "OK", model.ResultPage{}))
ws.Route(ws.DELETE("/{logId}").To(func(request *restful.Request, response *restful.Response) { ws.Route(ws.DELETE("/{id}").To(func(request *restful.Request, response *restful.Response) {
restfulx.NewReqCtx(request, response).WithLog("删除操作日志信息").Handle(s.DeleteJobLog) restfulx.NewReqCtx(request, response).WithLog("删除操作日志信息").Handle(s.DeleteJobLog)
}). }).
Doc("删除操作日志信息"). Doc("删除操作日志信息").
Metadata(restfulspec.KeyOpenAPITags, tags). Metadata(restfulspec.KeyOpenAPITags, tags).
Param(ws.PathParameter("logId", "多id 1,2,3").DataType("string"))) Param(ws.PathParameter("id", "多id 1,2,3").DataType("string")))
ws.Route(ws.DELETE("/all").To(func(request *restful.Request, response *restful.Response) { ws.Route(ws.DELETE("/all").To(func(request *restful.Request, response *restful.Response) {
restfulx.NewReqCtx(request, response).WithLog("清空操作日志信息").Handle(s.DeleteAll) restfulx.NewReqCtx(request, response).WithLog("清空操作日志信息").Handle(s.DeleteAll)

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

@@ -11,7 +11,7 @@ type (
JobLogModel interface { JobLogModel interface {
Insert(data entity.JobLog) *entity.JobLog Insert(data entity.JobLog) *entity.JobLog
FindListPage(page, pageSize int, data entity.JobLog) (*[]entity.JobLog, int64) FindListPage(page, pageSize int, data entity.JobLog) (*[]entity.JobLog, int64)
Delete(infoId []int64) Delete(infoId []string)
DeleteAll() DeleteAll()
} }
@@ -48,16 +48,16 @@ func (m *JobLogModelImpl) FindListPage(page, pageSize int, data entity.JobLog) (
err := db.Count(&total).Error err := db.Count(&total).Error
err = db.Order("create_time desc").Limit(pageSize).Offset(offset).Find(&list).Error err = db.Order("create_time desc").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询登录分页日志信息失败") biz.ErrIsNil(err, "查询任务分页日志信息失败")
return &list, total return &list, total
} }
func (m *JobLogModelImpl) Delete(logIds []int64) { func (m *JobLogModelImpl) Delete(logIds []string) {
err := global.Db.Table(m.table).Delete(&entity.JobLog{}, "id in (?)", logIds).Error err := global.Db.Table(m.table).Delete(&entity.JobLog{}, "id in (?)", logIds).Error
biz.ErrIsNil(err, "删除登录日志信息失败") biz.ErrIsNil(err, "删除任务日志信息失败")
return return
} }
func (m *JobLogModelImpl) DeleteAll() { func (m *JobLogModelImpl) DeleteAll() {
global.Db.Exec("DELETE FROM log_jobs") global.Db.Exec("DELETE FROM job_logs")
} }