From d36e0b699b56d5b6fb0abf30508b94c98b4b28ca Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 07 九月 2020 10:34:19 +0800
Subject: [PATCH] push2Manager at 22:30,android msg use big_text
---
service/msgPush.go | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/service/msgPush.go b/service/msgPush.go
index 2bba79f..4b2d58d 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -186,6 +186,7 @@
"notification": {
"title": title,
"body": msg,
+ "big_text": msg,
"click_type": "intent",
"intent": intent,
},
@@ -450,6 +451,20 @@
}
}
}
+ //澶滈棿鏌愪簺棰嗗鐨勮溅鍙互鍋滃湪杞﹀簱鍐�
+ var vipPlateNoArr []string
+ vipArr := strings.Split(beego.AppConfig.String("nightVipPlateNos"), ",")
+ if vipArr != nil && len(vipArr) >0 {
+ for _,po := range vipArr {
+ if po != "" {
+ cnPo := preDealPlateNo(po)
+ if cnPo != "" {
+ vipPlateNoArr = append(vipPlateNoArr, cnPo)
+ }
+ }
+ }
+ }
+
hikPersonMap := csv.GetHikPersonMap()
spaceNos := csv.FindSpaceNo("")
@@ -458,15 +473,19 @@
if sn.State == 1 { //杞﹀皻鍦ㄥ仠杞﹀満鐨勮溅鐗�
inCnPlateNo := preDealPlateNo(sn.PlateNo)
if inCnPlateNo != "" {
- if personId,ok := carPersonM[inCnPlateNo];ok {
- if phoneNum,ok := pushUserM[personId]; ok {
- if uc.Exist(phoneNum) {
- aliasArr = append(aliasArr, phoneNum)
+ if !isVipCar(inCnPlateNo, vipPlateNoArr) {
+ if personId,ok := carPersonM[inCnPlateNo];ok {
+ if phoneNum,ok := pushUserM[personId]; ok {
+ if uc.Exist(phoneNum) {
+ aliasArr = append(aliasArr, phoneNum)
+ }
}
- }
- if v,ex := hikPersonMap[personId]; ex {
- carOwners = append(carOwners, v.PersonName)
+ if v,ex := hikPersonMap[personId]; ex {
+ carOwners = append(carOwners, v.PersonName)
+ }
+ } else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
+ carOwners = append(carOwners, sn.PlateNo)
}
}
}
@@ -488,6 +507,20 @@
return b,e, aliasArr, carOwners
}
+//vip杞︿富锛屼笉鎺ユ敹璇风寮�鐨勯�氱煡锛屼篃涓嶉�氱煡绠＄悊鍛樿繖涓溅杩樺湪杞﹀簱鍐�
+func isVipCar(targetPlateNo string, vipPlateNoArr []string) bool {
+ b := false
+ if vipPlateNoArr != nil {
+ for _,v := range vipPlateNoArr {
+ if targetPlateNo == v {
+ b = true
+ break
+ }
+ }
+ }
+ return b
+}
+
//濡傛灉澶滈棿鏈夌粰杞﹀簱鍐呯殑杞︿富鎺ㄩ�佲�滆灏藉揩椹剁鈥濈殑娑堟伅锛屽垯鍛婄煡绠＄悊鍛� 鏈夊摢浜涜溅灏氬仠鍦ㄨ溅搴撳唴
func Push2Manager(title string, msg string) (bool, error, []string) {
if len(msg) > 256 {
--
Gitblit v1.8.0