From 78177cc89c8340302bb0f3eb29504b1f62d8b00c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 11 一月 2021 11:40:42 +0800
Subject: [PATCH] 无车牌不推送，表格中和车位数都不占用
---
service/carService.go | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 19b61d7..b78deec 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -195,7 +195,7 @@
var resultArr []SpaceNo
for _,si := range spaceList {
- if si.State == 1 { //鏈夎溅
+ if si.State == 1 &&si.PlateNo != "" && si.PlateNo != "鏃犺溅鐗�" { //鏈夎溅
if isSuper {
resultArr = append(resultArr, si)
} else {
@@ -276,7 +276,7 @@
vipPlateNoArr := getVipPlateNoArr()
for _,sp := range spaceList {
- if sp.State == 1 {
+ if sp.State == 1 && sp.PlateNo != "" && sp.PlateNo != "鏃犺溅鐗�"{
su := SpaceUser{
SpaceNo: sp.SpaceNo,
PlateNo: sp.PlateNo,
@@ -358,7 +358,7 @@
vehicles := sv.GetVehicleListByPerson(userId)
if vehicles != nil {
for _,veh := range vehicles {
- if veh.PlateNo != "" {
+ if veh.PlateNo != ""{
r := []rune(veh.PlateNo)
ncStr := string(r[1:]) //鎶婄涓�浣嶆眽瀛楀墧闄ゆ帀
myPlateNosMap[ncStr] = ncStr
@@ -403,17 +403,23 @@
} else if s.PlateNos != "" {
pi.PlateNo = s.PlateNos
}
- pi.IsMine = isMyPlateNo(myPlateNosMap, pi.PlateNo)
- if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
- pi.PosNo = v
- }
- if isSpaceShow(vipPlateNoArr, pi.PlateNo) {
- resultList = append(resultList, pi)
- } else {
+ if pi.PlateNo == "鏃犺溅鐗�" {
pi.State = 0
pi.PlateNo = ""
resultList = append(resultList, pi)
- }
+ } else {
+ pi.IsMine = isMyPlateNo(myPlateNosMap, pi.PlateNo)
+ if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
+ pi.PosNo = v
+ }
+ if isSpaceShow(vipPlateNoArr, pi.PlateNo) {
+ resultList = append(resultList, pi)
+ } else {
+ pi.State = 0
+ pi.PlateNo = ""
+ resultList = append(resultList, pi)
+ }
+ }
}
}
if len(resultList) == 0 {
@@ -726,4 +732,4 @@
}
return nil
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0