From 6e44a46c6165c3e0d4d1d334137cba0b6b6c12ee Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 04 九月 2020 19:47:23 +0800
Subject: [PATCH] add vip,fix manager msg
---
conf/app.conf | 1 +
service/msgPush.go | 48 +++++++++++++++++++++++++++++++++++++++---------
controllers/user.go | 3 ++-
controllers/car.go | 5 ++---
4 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/conf/app.conf b/conf/app.conf
index 7f05f50..eae1450 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -22,3 +22,4 @@
initPushLeft = 88
testPushPhones = 18601263339
nightManagerPhones = 15210613764
+nightVipPlateNos = 浜琇AK619,浜琋K00M0,浜琈R5102,浜琀94985
\ No newline at end of file
diff --git a/controllers/car.go b/controllers/car.go
index e552f90..5dd901c 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -122,9 +122,8 @@
//灏嗗叿浣撶殑杞︿富淇℃伅鎺ㄩ�佺粰绠＄悊鍛�
if carOwnNames != nil && len(carOwnNames) >0 {
//鑾峰彇杞︿富濮撳悕
- nameStr := strings.Join(carOwnNames, " ")
- managerMsg := fmt.Sprintf("%s 鏈┒绂昏溅涓�: %s", time.Now().Format("2006-01-02 15:04:05"), nameStr)
- mb,me, managerArr := service.Push2Manager("鑲茶嫳涓鍋滆溅", nameStr)
+ managerMsg := fmt.Sprintf("%s 鏈┒绂昏溅涓�: %s", time.Now().Format("2006-01-02 15:04:05"), strings.Join(carOwnNames, " "))
+ mb,me, managerArr := service.Push2Manager("鑲茶嫳涓鍋滆溅", managerMsg)
mLogE := models.Log{
Id: uuid.NewV4().String(),
CreateTime: time.Now().Format("2006-01-02 15:04:05"),
diff --git a/controllers/user.go b/controllers/user.go
index a906ae3..ec7df28 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -102,7 +102,8 @@
unbindB, unE := service.UnbindAlias(cid)
fmt.Println("unbind result:", unbindB, "err:", unE)
var uc models.UserClient
- uc.DeleteByCid(cid)
+ i, e := uc.DeleteByCid(cid)
+ fmt.Println("deleteByCid affected:", i, "err:", e)
}()
}
resp := code.Code{}
diff --git a/service/msgPush.go b/service/msgPush.go
index 9257495..b87dd58 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -450,6 +450,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,18 +472,20 @@
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)
}
- } else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
- carOwners = append(carOwners, sn.PlateNo)
}
}
}
@@ -490,6 +506,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