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/msgPush.go | 5 +++--
service/carService.go | 30 ++++++++++++++++++------------
controllers/car.go | 16 ++++++++++++----
3 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/controllers/car.go b/controllers/car.go
index 9cccaff..b0e33b4 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -101,7 +101,6 @@
}
func nightPush(curTimes int){
-
message := fmt.Sprintf("%s 璇峰敖蹇┒鍑哄仠杞﹀満", time.Now().Format("2006-01-02 15:04:05"))
b, e, aliasArr,carOwnNames := service.NightPush("娓╅Θ鎻愮ず", message)
//璁板綍鎺ㄩ�佹棩蹇�
@@ -122,8 +121,17 @@
if curTimes == 3 { //鍙粰绠＄悊鍛樻帹閫佷竴娆¤繖涓秷鎭�
//灏嗗叿浣撶殑杞︿富淇℃伅鎺ㄩ�佺粰绠＄悊鍛�
if carOwnNames != nil && len(carOwnNames) >0 {
- //鑾峰彇杞︿富濮撳悕
- managerMsg := strings.Join(carOwnNames, ",")
+ var filterdNames []string
+ for _,con := range carOwnNames {
+ if con != "鏃犺溅鐗�" {
+ filterdNames = append(filterdNames, con)
+ }
+ }
+ if len(filterdNames) == 0 {
+ return
+ }
+ //鑾峰彇杞︿富濮撳悕,鏃犵墝杞︾殑娑堟伅涓嶇粰绠＄悊鍛樻帹閫�
+ managerMsg := strings.Join(filterdNames, ",")
mb,me, managerArr := service.Push2Manager(fmt.Sprintf("%s 鏈┒绂昏溅杈�", time.Now().Format("2006-01-02 15:04:05")), managerMsg, false)
mLogE := models.Log{
Id: uuid.NewV4().String(),
@@ -355,4 +363,4 @@
}
c.Data["json"] = resp
c.ServeJSON()
-}
\ No newline at end of file
+}
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
+}
diff --git a/service/msgPush.go b/service/msgPush.go
index 52c7578..d07d3de 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -492,7 +492,8 @@
}
} else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
if sn.PlateNo == "鏃犺溅鐗�" {
- carOwners = append(carOwners, sn.PlateNo)
+ //鏃犺溅鐗岀殑涓嶆帹閫�
+ //carOwners = append(carOwners, sn.PlateNo)
} else {
carOwners = append(carOwners, sn.PlateNo+"()")
}
@@ -769,4 +770,4 @@
return &t, nil
}
return nil, errors.New("鑾峰彇unipush骞冲彴token澶辫触")
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0