From 50c3437ec2e1874df6468bb83a9d5acf40482e6a Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 08 九月 2020 11:08:29 +0800
Subject: [PATCH] rm push msg title and nightMsg for manger
---
service/msgPush.go | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/service/msgPush.go b/service/msgPush.go
index 4b2d58d..7f19c39 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -184,7 +184,6 @@
androidPush := map[string]map[string]map[string]string {
"ups": {
"notification": {
- "title": title,
"body": msg,
"big_text": msg,
"click_type": "intent",
@@ -194,10 +193,8 @@
}
iosPush := map[string]interface{}{
"type":"notify",
- "payload":"鑲茶嫳涓鍋滆溅",
"aps":map[string]interface{}{
"alert":map[string]string{
- "title": title,
"body": msg,
},
"content-available":0,
@@ -210,7 +207,6 @@
},
"push_message": map[string]map[string]string {
"notification": {
- "title": title,
"body": msg,
"click_type": "intent",
"intent": intent,
@@ -482,10 +478,14 @@
}
if v,ex := hikPersonMap[personId]; ex {
- carOwners = append(carOwners, v.PersonName)
+ carOwners = append(carOwners, sn.PlateNo+"("+v.PersonName+")")
}
} else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
- carOwners = append(carOwners, sn.PlateNo)
+ if sn.PlateNo == "鏃犺溅鐗�" {
+ carOwners = append(carOwners, sn.PlateNo)
+ } else {
+ carOwners = append(carOwners, sn.PlateNo+"()")
+ }
}
}
}
@@ -507,6 +507,69 @@
return b,e, aliasArr, carOwners
}
+
+//姝ゆ柟娉曞仛娴嬭瘯浣跨敤
+//鑾峰彇鍋滅暀鍦ㄨ溅搴撳唴杞︿富鐨勫鍚嶏紝鎵句笉鍒板鍚嶈繑鍥炶繖鐗�
+func GetLeftCarOwners() []string {
+ var carOwners []string
+ pushUserM := make(map[string]string)
+ var userE models.User
+ allUsers, _ := userE.GetAllUsers()
+ if allUsers != nil {
+ for _,u := range allUsers {
+ pushUserM[u.Id] = u.PhoneNum
+ }
+ }
+
+ carPersonM := make(map[string]string)
+ csv := NewCarService()
+ carPersons := csv.GetVehicleListByPerson("")
+ if carPersons != nil {
+ for _, cp := range carPersons {
+ cnPlateNo := preDealPlateNo(cp.PlateNo)
+ if cnPlateNo != "" {
+ carPersonM[cnPlateNo] = cp.PersonId
+ }
+ }
+ }
+ //澶滈棿鏌愪簺棰嗗鐨勮溅鍙互鍋滃湪杞﹀簱鍐�
+ 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("")
+ for _,sn := range spaceNos {
+ if sn.State == 1 { //杞﹀皻鍦ㄥ仠杞﹀満鐨勮溅鐗�
+ inCnPlateNo := preDealPlateNo(sn.PlateNo)
+ if inCnPlateNo != "" {
+ if !isVipCar(inCnPlateNo, vipPlateNoArr) {
+ if personId,ok := carPersonM[inCnPlateNo];ok {
+
+ if v,ex := hikPersonMap[personId]; ex {
+ carOwners = append(carOwners, v.PersonName)
+ }
+ } else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
+ carOwners = append(carOwners, sn.PlateNo)
+ }
+ }
+ }
+ }
+ }
+
+ return carOwners
+}
+
//vip杞︿富锛屼笉鎺ユ敹璇风寮�鐨勯�氱煡锛屼篃涓嶉�氱煡绠＄悊鍛樿繖涓溅杩樺湪杞﹀簱鍐�
func isVipCar(targetPlateNo string, vipPlateNoArr []string) bool {
b := false
--
Gitblit v1.8.0