From 0494779a1de00553ee8a47ca712ffdcafaea9381 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期一, 17 八月 2020 16:09:59 +0800 Subject: [PATCH] save push log and add spaceInfo,pushLog --- controllers/car.go | 96 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 6 deletions(-) diff --git a/controllers/car.go b/controllers/car.go index 732fcff..f576697 100644 --- a/controllers/car.go +++ b/controllers/car.go @@ -6,8 +6,10 @@ "car-service/service" "fmt" "github.com/astaxie/beego" + "github.com/satori/go.uuid" "net/http" "sort" + "strings" "sync" "time" ) @@ -41,9 +43,22 @@ if left <=lowerLimit && left != prePushLeft { go func() { - message := fmt.Sprintf("%s 鍓╀綑杞︿綅锛�%d涓�", time.Now().Format("2006-01-02 15:04:05"), left) - b, e := service.PushByAlias("鑲茶嫳涓鍋滆溅", message) - + t := time.Now().Format("2006-01-02 15:04:05") + message := fmt.Sprintf("%s 鍓╀綑杞︿綅锛�%d涓�", t, left) + b, e, aliasArr := service.PushByAlias("鑲茶嫳涓鍋滆溅", message) + //璁板綍鎺ㄩ�佹棩蹇� + logE := models.Log{ + Id: uuid.NewV4().String(), + CreateTime: t, + Result: b, + Phones: strings.Join(aliasArr, ","), + } + if e != nil { + logE.Content = e.Error() + } else { + logE.Content = message + } + logE.Insert() prePushLeft = left fmt.Println("b:", b,"e:",e, "message:", message) @@ -88,8 +103,20 @@ func nightPush(){ message := fmt.Sprintf("%s 璇峰敖蹇┒鍑哄仠杞﹀満", time.Now().Format("2006-01-02 15:04:05")) - b, e := service.NightPush("鑲茶嫳涓鍋滆溅", message) - + b, e, aliasArr := service.NightPush("鑲茶嫳涓鍋滆溅", message) + //璁板綍鎺ㄩ�佹棩蹇� + logE := models.Log{ + Id: uuid.NewV4().String(), + CreateTime: time.Now().Format("2006-01-02 15:04:05"), + Result: b, + Phones: strings.Join(aliasArr, ","), + } + if e != nil { + logE.Content = e.Error() + } else { + logE.Content = message + } + logE.Insert() fmt.Println("b:", b,"e:",e, "message:", message) } @@ -164,7 +191,20 @@ func (c *CarController) TestPush() { left := getSpaceLeft() message := fmt.Sprintf("%s 鍓╀綑杞︿綅锛�%d涓�", time.Now().Format("2006-01-02 15:04:05"), left) - b, e := service.PushByAlias("鑲茶嫳涓鍋滆溅", message) + b, e, aliasArr := service.PushByAlias("鑲茶嫳涓鍋滆溅", message) + //璁板綍鎺ㄩ�佹棩蹇� + logE := models.Log{ + Id: uuid.NewV4().String(), + CreateTime: time.Now().Format("2006-01-02 15:04:05"), + Result: b, + Phones: strings.Join(aliasArr, ","), + } + if e != nil { + logE.Content = e.Error() + } else { + logE.Content = message + } + logE.Insert() fmt.Println("b:", b,"e:",e, "message:", message) resp := code.Code{} @@ -181,6 +221,50 @@ c.ServeJSON() } +// @router /spaceInfo [get] +func (c *CarController) SpaceInfo() { + sv := service.NewCarService() + spaceInfo := sv.FindHikSpaceInfo() + c.Data["json"] = code.Code{ + Success: true, + Status: http.StatusOK, + Data: spaceInfo, + } + c.ServeJSON() +} + +// @router /pushLog [get] +func (c *CarController) PushLog() { + st := c.GetString("startTime") + et := c.GetString("endTime") + if st == "" { + st = time.Now().Format("2006-01-02") + } + if et == "" { + et = time.Now().AddDate(0,0,1).Format("2006-01-02") + } + curPage, err := c.GetInt("curPage") + if err != nil { + curPage = 1 + } + pageSize, err := c.GetInt("pageSize") + if err != nil { + pageSize = 20 + } + var l models.Log + total, logs := l.Find(curPage, pageSize, st, et) + resp := code.Code{ + Success: true, + Status: http.StatusOK, + Data: map[string]interface{}{ + "total": total, + "list": logs, + }, + } + c.Data["json"] = resp + c.ServeJSON() +} + // @router /crossRecord [get] func (c *CarController) CrossRecord() { sv := service.NewCarService() -- Gitblit v1.8.0