From ade17e76514f9d8219f432ff4f24f64b5873fce3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 11 八月 2020 15:41:47 +0800
Subject: [PATCH] csv must use NewCarService
---
service/msgPush.go | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/service/msgPush.go b/service/msgPush.go
index f13e9a2..d957beb 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -238,37 +238,42 @@
}
}
if len(pushUserM) == 0 {
- return true,nil
+ return true,errors.New("len(pushUserM) == 0")
}
- carPersonM := make(map[string]string)
- var csv CarService
+ carPersonM := make(map[string]string) //浠ヨ溅鐗屽彿涓簁ey锛寁alue鏄痟ik鐨刾ersonId
+ csv := NewCarService()
carPersons := csv.GetVehicleListByPerson("")
if carPersons != nil {
for _, cp := range carPersons {
carPersonM[cp.PlateNo] = cp.PersonId
}
}
+ delPersonIdM := make(map[string]string)
spaceNos := csv.FindSpaceNo("")
for _,sn := range spaceNos {
if sn.State == 1 && sn.PlateNo != "" { //宸茬粡鎶婅溅鍋滃埌鍋滆溅鍦虹殑杞︿富锛屼笉鍐嶆帹閫佹秷鎭�
- if _,ok := carPersonM[sn.PlateNo];ok {
+ if pId,ok := carPersonM[sn.PlateNo];ok {
+ delPersonIdM[pId] = pId
delete(carPersonM, sn.PlateNo)
}
}
}
for _,personId := range carPersonM {
if phoneNum,ok := pushUserM[personId]; ok { //姝や汉宸叉敞鍐屽埌绯荤粺,骞朵笖杞︿笉鍦ㄥ仠杞﹀簱鍐�
- aliasArr = append(aliasArr, phoneNum)
+ if _,in := delPersonIdM[personId];!in {
+ aliasArr = append(aliasArr, phoneNum)
+ }
}
}
if len(aliasArr) == 0 {
- fmt.Println("娌℃湁鎺ㄩ�佺洰鏍�,aliasArr is empty")
- return true, nil
+ return true, errors.New("aliasArr is empty")
+ } else {
+ fmt.Println("PushByAlias arr:", aliasArr)
}
cResult, taskId, ce := createPushMsg(title, msg)
+ fmt.Println("createPushMsg taskId:", taskId, "cResult:",cResult, "err:", ce)
if !cResult {
- fmt.Println("createPushMsg taskId:", taskId, "err:", ce)
return false, errors.New("鍒涘缓鎺ㄩ�佸墠缃秷鎭け璐�")
}
@@ -286,7 +291,7 @@
"alias": aliasArr,
},
"taskid": taskId,
- "is_async": true,
+ "is_async": false,
}
header := map[string]string {
"token": token,
@@ -335,7 +340,7 @@
return true,nil
}
carPersonM := make(map[string]string)
- var csv CarService
+ csv := NewCarService()
carPersons := csv.GetVehicleListByPerson("")
if carPersons != nil {
for _, cp := range carPersons {
--
Gitblit v1.8.0