From bf4ca3fdb8c0f0c1f99a4a871ad39436cefc6ab6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 10 十月 2020 19:37:05 +0800
Subject: [PATCH] 在地图上不显示vip车辆
---
service/carService.go | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 9eb2391..5f600b3 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -184,18 +184,7 @@
}
}
- 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)
- }
- }
- }
- }
+ vipPlateNoArr := getVipPlateNoArr()
var resultArr []SpaceNo
for _,si := range spaceList {
@@ -277,18 +266,7 @@
}
}
- 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)
- }
- }
- }
- }
+ vipPlateNoArr := getVipPlateNoArr()
for _,sp := range spaceList {
if sp.State == 1 {
@@ -336,6 +314,22 @@
sort.Sort(resultList)
return resultList
+}
+
+func getVipPlateNoArr() []string {
+ 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)
+ }
+ }
+ }
+ }
+ return vipPlateNoArr
}
//鐧藉ぉ鍜屽鏅氱鐞嗗憳閮界湅涓嶅埌vip杞﹁締
@@ -390,6 +384,7 @@
fmt.Println("unmarshal spaceNos err:",err)
return nil
}
+ vipPlateNoArr := getVipPlateNoArr()
for _,s := range spaceList {
pi := models.PosInfo {
SpaceNo: s.SpaceNo,
@@ -405,7 +400,13 @@
if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
pi.PosNo = v
}
- resultList = append(resultList, pi)
+ if pi.IsMine || isSpaceShow(vipPlateNoArr, pi.PlateNo) {
+ resultList = append(resultList, pi)
+ } else {
+ pi.State = 0
+ pi.PlateNo = ""
+ resultList = append(resultList, pi)
+ }
}
}
if len(resultList) == 0 {
--
Gitblit v1.8.0