diff --git a/API/DealyMessage.go b/API/DealyMessage.go
index 7ff1919..938c35c 100644
--- a/API/DealyMessage.go
+++ b/API/DealyMessage.go
@@ -77,6 +77,15 @@ func RemoveDealyMessage(c *gin.Context) {
c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin"))
c.Header("Access-Control-Allow-Credentials", "true")
+
+ if bson.IsObjectIdHex(c.PostForm("id")) == false {
+ c.JSON(200, tools.ResponseError{
+ 1,
+ "id不正确",
+ })
+ return
+ }
+
DelayMessage.GlobalDM.DelTaskForId(c.PostForm("id"))
c.JSON(200, tools.ResponseSeccess{
diff --git a/API/Item.go b/API/Item.go
index 6c7f790..b73c402 100644
--- a/API/Item.go
+++ b/API/Item.go
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"gopkg.in/mgo.v2/bson"
"letu/DB"
+ "time"
)
// @Title 查询设备信息
@@ -129,19 +130,41 @@ func UpdateItemTime(c *gin.Context) {
var ItemTime []ItemTime
json.Unmarshal([]byte(c.PostForm("items")), &ItemTime)
+ var RedisData = make(map[string]string)
for _, v := range ItemTime {
-
- DB.CItem.Update(
- bson.M{"_id": bson.ObjectIdHex(v.Id)},
- bson.M{"$set": bson.M{
- "Time": v.Time,
- }},
- )
+ RedisData[v.Id] = v.Time
}
+
+ DB.Redis.Set("AllItemTime", RedisData, time.Second*60*60*24*7)
c.JSON(200, tools.ResponseSeccess{
0,
"ok",
})
}
+
+
+// @Title 获得所有设备的等待时间
+// @Description 获得所有设备的等待时间
+// @Accept json
+// @Produce json
+// @Success 200 {object} tools.ResponseSeccess "{5df864740a9ac17ac7a7feb8: '20',.....}"
+// @Failure 500 {object} tools.ResponseError "{"errcode":1,"errmsg":"错误原因"}"
+// @Router /AllItemTime? [get]
+func AllItemTime(c *gin.Context) {
+ c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin"))
+ c.Header("Access-Control-Allow-Credentials", "true")
+
+ var ItemTime map[string]string
+ json.Unmarshal([]byte(c.PostForm("items")), &ItemTime)
+
+ allteim := DB.Redis.Get("AllItemTime")
+ if allteim != nil{
+ c.JSON(200, allteim)
+ }else{
+ c.String(200, "{}")
+ }
+
+
+}
diff --git a/README.md b/README.md
index d975827..1e95499 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
### API List
1. [查询所有商品](#allcommodity-get)
+1. [获得所有设备的等待时间](#allitemtime-get)
1. [查询所有游玩项目](#allitems-get)
1. [查询所有线路](#allline-get)
1. [所有景区基础信息](#allscenic-get)
@@ -51,6 +52,20 @@
+
+
+#### /AllItemTime (GET)
+
+
+获得所有设备的等待时间
+
+| Code | Type | Model | Message |
+|-----|-----|-----|-----|
+| 200 | object | [ResponseSeccess](#github.com.aarongao.tools.ResponseSeccess) | {5df864740a9ac17ac7a7feb8: '20',.....} |
+| 500 | object | [ResponseError](#github.com.aarongao.tools.ResponseError) | {"errcode":1,"errmsg":"错误原因"} |
+
+
+
#### /AllItems (GET)
diff --git a/main.go b/main.go
index 99428db..0598724 100644
--- a/main.go
+++ b/main.go
@@ -68,6 +68,7 @@ func main() {
//r.Static("/tiles", dir+"/tiles")
r.GET("/Tiles", Api.Tiles)
r.GET("/AllItems", Api.AllItems)
+ r.GET("/AllItemTime", Api.AllItemTime)
r.GET("/AllCommodity", Api.AllCommodity)
r.GET("/AllLine", Api.AllLine)
r.GET("/ItemInfo", Api.ItemInfo)
@@ -94,7 +95,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.POST("/DealyMessage/Remove", Api.RemoveDealyMessage)
//r.GET("/ws", Api.WsPage)
r.Static("/Upload", "./Upload")
--
libgit2 0.21.0