From 352fac4096ea302935694cc9f3717db1cbd4f4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 2 Sep 2019 20:49:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4spider=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4task=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/model/task.go    | 17 ++++++++++++++++-
 backend/routes/spider.go |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/backend/model/task.go b/backend/model/task.go
index 8ae782b5..968055a6 100644
--- a/backend/model/task.go
+++ b/backend/model/task.go
@@ -190,6 +190,21 @@ func RemoveTask(id string) error {
 	return nil
 }
 
+func RemoveTaskBySpiderId(id string) error {
+	tasks, err := GetTaskList(bson.M{"spider_id": id}, 0, constants.Infinite, "-create_ts")
+	if err != nil {
+		log.Error("get tasks error:" + err.Error())
+	}
+
+	for _, task := range tasks {
+		if err := RemoveTask(task.Id); err != nil {
+			log.Error("remove task error:" + err.Error())
+			continue
+		}
+	}
+	return nil
+}
+
 func GetTaskCount(query interface{}) (int, error) {
 	s, c := database.GetCol("tasks")
 	defer s.Close()
@@ -207,7 +222,7 @@ func GetDailyTaskStats(query bson.M) ([]TaskDailyItem, error) {
 	defer s.Close()
 
 	// 起始日期
-	startDate := time.Now().Add(- 30 * 24 * time.Hour)
+	startDate := time.Now().Add(-30 * 24 * time.Hour)
 	endDate := time.Now()
 
 	// query
diff --git a/backend/routes/spider.go b/backend/routes/spider.go
index dceb2651..f1a3c9e5 100644
--- a/backend/routes/spider.go
+++ b/backend/routes/spider.go
@@ -229,6 +229,12 @@ func DeleteSpider(c *gin.Context) {
 		return
 	}
 
+	// 删除爬虫对应的task任务
+	if err := model.RemoveTaskBySpiderId(spider.Id.Hex()); err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+
 	c.JSON(http.StatusOK, Response{
 		Status:  "ok",
 		Message: "success",