From 447e03afc0c6cefe4793ffdf64128dc2dd7f7dee Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 10 十月 2020 19:38:18 +0800
Subject: [PATCH] fix
---
service/carService.go | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 6d6d340..c0bf785 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -10,7 +10,6 @@
"sort"
"strconv"
"strings"
- "time"
)
type CarService struct {
hikUtil *reqUtil.HikHttpUtil
@@ -185,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 {
@@ -278,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 {
@@ -339,18 +316,31 @@
return resultList
}
-//1.鐧藉ぉ绠＄悊鍛樿兘鐪嬪埌鎵�鏈変汉鐨勮溅锛屽寘鎷瑅ip杞﹁締
-//2.澶滄櫄绠＄悊鍛樼湅涓嶅埌vip杞﹁締
-func isSpaceShow(vipPlateNoArr []string, spacePto string) bool {
- hour := time.Now().Hour()
- if hour >= 22 || hour <= 7 {
- if vipPlateNoArr != nil && len(vipPlateNoArr) >0 {
- targetPto := preDealPlateNo(spacePto)
- if isVipCar(targetPto, vipPlateNoArr) { //鏄痸ip杞﹁締
- return false
+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杞﹁締
+func isSpaceShow(vipPlateNoArr []string, spacePto string) bool {
+ if vipPlateNoArr != nil && len(vipPlateNoArr) >0 {
+ targetPto := preDealPlateNo(spacePto)
+ if isVipCar(targetPto, vipPlateNoArr) { //鏄痸ip杞﹁締
+ return false
+ }
+ }
+
return true
}
@@ -394,6 +384,7 @@
fmt.Println("unmarshal spaceNos err:",err)
return nil
}
+ vipPlateNoArr := getVipPlateNoArr()
for _,s := range spaceList {
pi := models.PosInfo {
SpaceNo: s.SpaceNo,
@@ -409,7 +400,13 @@
if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
pi.PosNo = v
}
- resultList = append(resultList, pi)
+ if 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