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

---
 service/msgPush.go |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/service/msgPush.go b/service/msgPush.go
index 252b74e..27d1201 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -246,7 +246,7 @@
 }
 
 //瀵瑰凡娉ㄥ唽鐨勭敤鎴疯繘琛屾秷鎭帹閫併�傝皟鐢ㄦ鎺ュ彛鍓嶉渶璋冪敤鍒涘缓娑堟伅鎺ュ彛璁剧疆娑堟伅鍐呭
-func PushByAlias(title string, msg string) (bool, error) {
+func PushByAlias(title string, msg string) (bool, error, []string) {
 	var aliasArr []string
 
 	pushUserM := make(map[string]string)
@@ -258,7 +258,7 @@
 		}
 	}
 	if len(pushUserM) == 0 {
-		return true,errors.New("len(pushUserM) == 0")
+		return false,errors.New("len(pushUserM) == 0"),aliasArr
 	}
 	carPersonM := make(map[string]string) //浠ヨ溅鐗屽彿涓簁ey锛寁alue鏄痟ik鐨刾ersonId
 	csv := NewCarService()
@@ -290,13 +290,13 @@
 	}
 	lenAS := len(aliasArr)
 	if  lenAS == 0 {
-		return true, errors.New("aliasArr is empty")
+		return false, errors.New("aliasArr is empty"),aliasArr
 	}
 
 	cResult, taskId, ce := createPushMsg(title, msg)
 	fmt.Println("createPushMsg taskId:", taskId, "cResult:",cResult, "err:", ce)
 	if !cResult {
-		return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�")
+		return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�"),aliasArr
 	}
 
 	//alias 鍗曟鎺ㄩ�侀暱搴︿笂闄愭槸200
@@ -330,10 +330,10 @@
 		}
 	}
 	if isSuccess {
-		return true, nil
+		return true, nil,aliasArr
 	}
 
-	return false, errors.New("鎺ㄩ�佸け璐�")
+	return false, errors.New("鎺ㄩ�佸け璐�"),aliasArr
 }
 
 func doPush(taskId string, aliasArr []string) (bool,error) {
@@ -384,7 +384,7 @@
 	return false, errors.New("鎺ㄩ�佸け璐�")
 }
 
-func NightPush(title string, msg string) (bool, error) {
+func NightPush(title string, msg string) (bool, error, []string) {
 	var aliasArr []string
 
 	pushUserM := make(map[string]string)
@@ -396,7 +396,7 @@
 		}
 	}
 	if len(pushUserM) == 0 {
-		return true,nil
+		return true,nil, aliasArr
 	}
 	carPersonM := make(map[string]string)
 	csv := NewCarService()
@@ -422,16 +422,17 @@
 
 	if len(aliasArr) == 0 {
 		fmt.Println("娌℃湁鎺ㄩ�佺洰鏍�,aliasArr is empty")
-		return true, nil
+		return true, nil, aliasArr
 	}
 
 	cResult, taskId, ce := createPushMsg(title, msg)
 	if !cResult {
 		fmt.Println("createPushMsg taskId:", taskId, "err:", ce)
-		return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�")
+		return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�"), aliasArr
 	}
 
-	return doPush(taskId, aliasArr)
+	b,e := doPush(taskId, aliasArr)
+	return b,e, aliasArr
 }
 
 func PushAll(title string, msg string) (bool,error) {

--
Gitblit v1.8.0