From c57915202544b9e7940f81943c4a398954077dac Mon Sep 17 00:00:00 2001
From: aarongao <aaron.gao@imagchina.com>
Date: Wed, 5 Feb 2020 09:59:50 +0800
Subject: [PATCH] 删定时任务接口

---
 API/DealyMessage.go              | 23 ++++++++++++++++++++++-
 Lib/DelayMessage/delaymessage.go |  2 +-
 README.md                        | 19 +++++++++++++++++++
 main.go                          |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/API/DealyMessage.go b/API/DealyMessage.go
index 3f7494f..7ff1919 100644
--- a/API/DealyMessage.go
+++ b/API/DealyMessage.go
@@ -20,7 +20,7 @@ func DealyMessageInfo(c *gin.Context) {
 	c.Header("Access-Control-Allow-Credentials", "true")
 
 	var aDelayMessage []DelayMessage.Message
-	DelayMessage.CDelayMessage.Find(bson.M{"UserId": c.Query("userid")}).All(&aDelayMessage)
+	DelayMessage.CDelayMessage.Find(bson.M{"UserId": c.Query("UserId")}).All(&aDelayMessage)
 
 	if aDelayMessage == nil {
 		aDelayMessage = []DelayMessage.Message{}
@@ -64,3 +64,24 @@ func CreateDealyMessage(c *gin.Context) {
 	}
 
 }
+
+// @Title 删除提醒
+// @Description 删除提醒
+// @Accept  json
+// @Produce  json
+// @Param   id     5dfb03070a9ac17ac7a82054    string     true        "提醒id"
+// @Success 200 {object} tools.ResponseSeccess "{"errcode":0,"result":"ok"}"
+// @Failure 500 {object} tools.ResponseError "{"errcode":1,"errmsg":"错误原因"}"
+// @Router /DealyMessage/Remove? [post]
+func RemoveDealyMessage(c *gin.Context) {
+	c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin"))
+	c.Header("Access-Control-Allow-Credentials", "true")
+
+	DelayMessage.GlobalDM.DelTaskForId(c.PostForm("id"))
+
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		"ok",
+	})
+
+}
diff --git a/Lib/DelayMessage/delaymessage.go b/Lib/DelayMessage/delaymessage.go
index 95e85ab..e51d593 100644
--- a/Lib/DelayMessage/delaymessage.go
+++ b/Lib/DelayMessage/delaymessage.go
@@ -112,7 +112,7 @@ func (dm *DelayMessage) DelTaskForId(id string) {
 
 	CDelayMessage.Remove(bson.M{"_id": bson.ObjectIdHex(id)})
 	i := dm.DelTask(id)
-	println(strconv.Itoa(i))
+	println("删除定时任务:",strconv.Itoa(i))
 }
 
 func (dm *DelayMessage) Show() {
diff --git a/README.md b/README.md
index a2e0cd0..d975827 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
 1. [增加投诉](#createcomplaint-post)
 1. [查询用户的定时提醒](#dealymessage-info-get)
 1. [创建提醒](#dealymessage-create-post)
+1. [删除提醒](#dealymessage-remove-post)
 1. [增加访问日志](#eventlog-post)
 1. [增加调查](#investigation-save-post)
 1. [查询设备信息](#iteminfo-get)
@@ -177,6 +178,24 @@
 | 500 | object | [ResponseError](#github.com.aarongao.tools.ResponseError) | {"errcode":1,"errmsg":"错误原因"} |
 
 
+<a name="dealymessage-remove-post"></a>
+
+#### /DealyMessage/Remove (POST)
+
+
+删除提醒
+
+| Param Name | Example | Data Type | Description | Required? |
+|-----|-----|-----|-----|-----|
+| id | 5dfb03070a9ac17ac7a82054    | string | 提醒id | Yes |
+
+
+| Code | Type | Model | Message |
+|-----|-----|-----|-----|
+| 200 | object | [ResponseSeccess](#github.com.aarongao.tools.ResponseSeccess) | {"errcode":0,"result":"ok"} |
+| 500 | object | [ResponseError](#github.com.aarongao.tools.ResponseError) | {"errcode":1,"errmsg":"错误原因"} |
+
+
 
 <a name="eventlog-post"></a>
 
diff --git a/main.go b/main.go
index c1ca003..99428db 100644
--- a/main.go
+++ b/main.go
@@ -94,6 +94,7 @@ func main() {
 	r.POST("/Trajectory/Save", Api.SaveTrajectory)
 	r.POST("/DealyMessage/Create", Api.CreateDealyMessage)
 	r.GET("/DealyMessage/Info", Api.DealyMessageInfo)
+	r.GET("/DealyMessage/Remove", Api.RemoveDealyMessage)
 	//r.GET("/ws", Api.WsPage)
 
 	r.Static("/Upload", "./Upload")
--
libgit2 0.21.0