From d5f1f86dfa846ee85dba741849a3f41cc7820950 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 01 九月 2020 10:31:19 +0800
Subject: [PATCH] after nightPush, push msg to manager
---
conf/app.conf | 1
service/msgPush.go | 28 ++++++++++++++
controllers/car.go | 33 ++++++++++++++++
3 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/conf/app.conf b/conf/app.conf
index 5ed0fc5..f303ef1 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -21,3 +21,4 @@
pushLowerLimit = 5
initPushLeft = 88
testPushPhones = 18601263339
+nightManagerPhones = 18601263339
diff --git a/controllers/car.go b/controllers/car.go
index f867877..15aed3d 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -119,6 +119,39 @@
logE.Insert()
fmt.Println("b:", b,"e:",e, "message:", message)
+ //濡傛灉鏈夋垚鍔熺粰杩囧杞︾殑杞︿富鎺ㄩ�侀�氱煡锛屽垯灏嗗叿浣撶殑杞︿富淇℃伅鎺ㄩ�佺粰绠＄悊鍛�
+ if b {
+ //鑾峰彇杞︿富濮撳悕
+ 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, " ")
+ managerMsg := fmt.Sprintf("%s 鏈┒绂昏溅涓�: %s", time.Now().Format("2006-01-02 15:04:05"), nameStr)
+ mb,me, managerArr := service.Push2Manager("鑲茶嫳涓鍋滆溅", nameStr)
+ mLogE := models.Log{
+ Id: uuid.NewV4().String(),
+ CreateTime: time.Now().Format("2006-01-02 15:04:05"),
+ Result: mb,
+ Phones: strings.Join(managerArr, ","),
+ }
+ if me != nil {
+ mLogE.Content = me.Error()
+ } else {
+ mLogE.Content = managerMsg
+ }
+ mLogE.Insert()
+ fmt.Println("mb:", mb, "me:", me, "message:", managerMsg)
+
+ }
}
var cacheSpaceLeft int
diff --git a/service/msgPush.go b/service/msgPush.go
index 3801326..2da943d 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -475,6 +475,34 @@
return b,e, aliasArr
}
+//濡傛灉澶滈棿鏈夌粰杞﹀簱鍐呯殑杞︿富鎺ㄩ�佲�滆灏藉揩椹剁鈥濈殑娑堟伅锛屽垯鍛婄煡绠＄悊鍛� 鏈夊摢浜涜溅灏氬仠鍦ㄨ溅搴撳唴
+func Push2Manager(title string, msg string) (bool, error, []string) {
+ if len(msg) > 256 {
+ fmt.Println("澶滈棿鍋滅暀杞﹀お澶氾紝message:", msg)
+
+ r := []rune(msg)
+ msg = string(r[:125])+"..."
+ }
+ managers := beego.AppConfig.String("nightManagerPhones")
+ if managers == "" {
+ return false, errors.New("澶滈棿鎺ㄩ�佺鐞嗗憳鎵嬫満鍙锋湭閰嶇疆"), []string{}
+ }
+ managerArr := strings.Split(managers, "")
+ if len(managerArr) == 0 {
+ fmt.Println("娌℃湁鎺ㄩ�佺洰鏍�,managerArr is empty")
+ return false, errors.New("绠＄悊鍛樻墜鏈哄彿鏈厤缃�"), managerArr
+ }
+
+ cResult, taskId, ce := createPushMsg(title, msg)
+ if !cResult {
+ fmt.Println("createPushMsg taskId:", taskId, "err:", ce)
+ return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�"), managerArr
+ }
+
+ b,e := doPush(taskId, managerArr)
+ return b,e, managerArr
+}
+
/*
func PushAll(title string, msg string) (bool,error) {
appId := beego.AppConfig.String("pushAppId")
--
Gitblit v1.8.0