From aa7706f2abf0f29b24b92893898a1a5f53ab2532 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 18 Jul 2020 21:16:28 +0800
Subject: [PATCH] added batch enable/disable schedules

---
 backend/main.go              | 20 ++++++++++----------
 backend/routes/schedule.go   |  2 +-
 backend/services/schedule.go |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 7a0b6ba0..b636d3fd 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -256,16 +256,16 @@ func main() {
 			}
 			// 定时任务
 			{
-				authGroup.GET("/schedules", routes.GetScheduleList)                // 定时任务列表
-				authGroup.GET("/schedules/:id", routes.GetSchedule)                // 定时任务详情
-				authGroup.PUT("/schedules", routes.PutSchedule)                    // 创建定时任务
-				authGroup.PUT("/schedules/batch", routes.PutBatchSchedules)        // 批量创建定时任务
-				authGroup.POST("/schedules/:id", routes.PostSchedule)              // 修改定时任务
-				authGroup.DELETE("/schedules/:id", routes.DeleteSchedule)          // 删除定时任务
-				authGroup.DELETE("/schedules", routes.DeleteBatchSchedules)        // 批量删除定时任务
-				authGroup.POST("/schedules/:id/disable", routes.DisableSchedule)   // 禁用定时任务
-				authGroup.POST("/schedules/:id/enable", routes.EnableSchedule)     // 启用定时任务
-				authGroup.POST("/schedules-set-status", routes.SetStatusSchedules) // 批量设置定时任务状态
+				authGroup.GET("/schedules", routes.GetScheduleList)                  // 定时任务列表
+				authGroup.GET("/schedules/:id", routes.GetSchedule)                  // 定时任务详情
+				authGroup.PUT("/schedules", routes.PutSchedule)                      // 创建定时任务
+				authGroup.PUT("/schedules/batch", routes.PutBatchSchedules)          // 批量创建定时任务
+				authGroup.POST("/schedules/:id", routes.PostSchedule)                // 修改定时任务
+				authGroup.DELETE("/schedules/:id", routes.DeleteSchedule)            // 删除定时任务
+				authGroup.DELETE("/schedules", routes.DeleteBatchSchedules)          // 批量删除定时任务
+				authGroup.POST("/schedules/:id/disable", routes.DisableSchedule)     // 禁用定时任务
+				authGroup.POST("/schedules/:id/enable", routes.EnableSchedule)       // 启用定时任务
+				authGroup.POST("/schedules-set-enabled", routes.SetEnabledSchedules) // 批量设置定时任务状态
 			}
 			// 用户
 			{
diff --git a/backend/routes/schedule.go b/backend/routes/schedule.go
index 9009fae5..61672c96 100644
--- a/backend/routes/schedule.go
+++ b/backend/routes/schedule.go
@@ -283,7 +283,7 @@ func DeleteBatchSchedules(c *gin.Context) {
 	HandleSuccess(c)
 }
 
-func SetStatusSchedules(c *gin.Context) {
+func SetEnabledSchedules(c *gin.Context) {
 	type ReqBody struct {
 		ScheduleIds []bson.ObjectId `json:"schedule_ids"`
 		Enabled     bool            `json:"enabled"`
diff --git a/backend/services/schedule.go b/backend/services/schedule.go
index 78d430b1..591fe4fb 100644
--- a/backend/services/schedule.go
+++ b/backend/services/schedule.go
@@ -220,7 +220,7 @@ func (s *Scheduler) Update() error {
 	s.RemoveAll()
 
 	// 获取所有定时任务
-	sList, err := model.GetScheduleList(nil)
+	sList, err := model.GetScheduleList(bson.M{"enabled": true})
 	if err != nil {
 		log.Errorf("get scheduler list error: %s", err.Error())
 		debug.PrintStack()