From b2525a9036742f74e799d656d68668dec208dd3a Mon Sep 17 00:00:00 2001 From: samwaf Date: Tue, 3 Jun 2025 11:12:21 +0800 Subject: [PATCH] feat:add batch-task trigger_type default cron #337 --- service/waf_service/waf_batchtask.go | 5 +++-- waftask/task_batch.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service/waf_service/waf_batchtask.go b/service/waf_service/waf_batchtask.go index ed3a021..c713658 100644 --- a/service/waf_service/waf_batchtask.go +++ b/service/waf_service/waf_batchtask.go @@ -98,11 +98,12 @@ func (receiver *WafBatchTaskService) GetListApi(req request.BatchTaskSearchReq) return list, total, nil } -func (receiver *WafBatchTaskService) GetAllListInner() ([]model.BatchTask, int64, error) { +func (receiver *WafBatchTaskService) GetAllCronListInner() ([]model.BatchTask, int64, error) { var list []model.BatchTask var total int64 = 0 - var whereField = "" + var whereField = "batch_trigger_type = ?" var whereValues []interface{} + whereValues = append(whereValues, "cron") global.GWAF_LOCAL_DB.Model(&model.BatchTask{}).Where(whereField, whereValues...).Find(&list) global.GWAF_LOCAL_DB.Model(&model.BatchTask{}).Where(whereField, whereValues...).Count(&total) diff --git a/waftask/task_batch.go b/waftask/task_batch.go index abd2945..2425afc 100644 --- a/waftask/task_batch.go +++ b/waftask/task_batch.go @@ -20,7 +20,7 @@ func BatchTask() { innerLogName := "BatchTask" zlog.Info(innerLogName, "准备进行自动执行批量任务") - batchTaskList, size, err := wafBatchTaskService.GetAllListInner() + batchTaskList, size, err := wafBatchTaskService.GetAllCronListInner() if err != nil { zlog.Error(innerLogName, "批量任务:", err) return