From 3e9cf4df58f5d8266e606fff63cb9da1105a4dcf Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 02 九月 2020 11:54:44 +0800
Subject: [PATCH] fix night push,push to manager if car left
---
controllers/car.go | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/controllers/car.go b/controllers/car.go
index 63cf1a7..e552f90 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -103,7 +103,7 @@
func nightPush(){
message := fmt.Sprintf("%s 璇峰敖蹇┒鍑哄仠杞﹀満", time.Now().Format("2006-01-02 15:04:05"))
- b, e, aliasArr := service.NightPush("鑲茶嫳涓鍋滆溅", message)
+ b, e, aliasArr,carOwnNames := service.NightPush("鑲茶嫳涓鍋滆溅", message)
//璁板綍鎺ㄩ�佹棩蹇�
logE := models.Log{
Id: uuid.NewV4().String(),
@@ -119,22 +119,10 @@
logE.Insert()
fmt.Println("b:", b,"e:",e, "message:", message)
- //濡傛灉鏈夋垚鍔熺粰杩囧杞︾殑杞︿富鎺ㄩ�侀�氱煡锛屽垯灏嗗叿浣撶殑杞︿富淇℃伅鎺ㄩ�佺粰绠＄悊鍛�
- if b {
+ //灏嗗叿浣撶殑杞︿富淇℃伅鎺ㄩ�佺粰绠＄悊鍛�
+ if carOwnNames != nil && len(carOwnNames) >0 {
//鑾峰彇杞︿富濮撳悕
- var leftUserNames []string
- carSv := service.NewCarService()
- hikPersons := carSv.GetHikPersonList()
- hikPersonM := make(map[string]string)
- for _,hikP := range hikPersons {
- hikPersonM[hikP.PhoneNo] = hikP.PersonName
- }
- for _, pushedPhone := range aliasArr {
- if name,in := hikPersonM[pushedPhone]; in {
- leftUserNames = append(leftUserNames, name)
- }
- }
- nameStr := strings.Join(leftUserNames, " ")
+ nameStr := strings.Join(carOwnNames, " ")
managerMsg := fmt.Sprintf("%s 鏈┒绂昏溅涓�: %s", time.Now().Format("2006-01-02 15:04:05"), nameStr)
mb,me, managerArr := service.Push2Manager("鑲茶嫳涓鍋滆溅", nameStr)
mLogE := models.Log{
@@ -150,7 +138,6 @@
}
mLogE.Insert()
fmt.Println("mb:", mb, "me:", me, "message:", managerMsg)
-
}
}
--
Gitblit v1.8.0