From ca10e9d776509f54cb0251b7eae44cee74d94b2c Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 01 九月 2020 20:09:50 +0800
Subject: [PATCH] findHikSpaceUser add state=1
---
service/carService.go | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 3d3ca03..5d79f47 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -220,33 +220,35 @@
personMap := sv.GetHikPersonMap()
vehicleMap := sv.GetHikVehicleMap()
for _,sp := range spaceList {
- su := SpaceUser{
- SpaceNo: sp.SpaceNo,
- PlateNo: sp.PlateNo,
- }
- if sp.PlateNo != "" {
- r := []rune(sp.PlateNo)
- ncStr := string(r[1:]) //鎶婄涓�浣嶆眽瀛楀墧闄ゆ帀
- newK := strings.ReplaceAll(ncStr, "D", "*")
- newK = strings.ReplaceAll(newK, "0", "*")
- personId := ""
- if v,exist := vehicleMap[newK]; exist {
- personId = v.PersonId
+ if sp.State == 1 {
+ su := SpaceUser{
+ SpaceNo: sp.SpaceNo,
+ PlateNo: sp.PlateNo,
}
+ if sp.PlateNo != "" {
+ r := []rune(sp.PlateNo)
+ ncStr := string(r[1:]) //鎶婄涓�浣嶆眽瀛楀墧闄ゆ帀
+ newK := strings.ReplaceAll(ncStr, "D", "*")
+ newK = strings.ReplaceAll(newK, "0", "*")
+ personId := ""
+ if v,exist := vehicleMap[newK]; exist {
+ personId = v.PersonId
+ }
- if personId != "" {
- su.CarType = "澶囨杞�"
- if person, in := personMap[personId]; in {
- su.Username = person.PersonName
- su.PhoneNum = person.PhoneNo
+ if personId != "" {
+ su.CarType = "澶囨杞�"
+ if person, in := personMap[personId]; in {
+ su.Username = person.PersonName
+ su.PhoneNum = person.PhoneNo
+ }
+ } else {
+ su.CarType = "涓存椂杞�"
}
} else {
- su.CarType = "涓存椂杞�"
+ su.PlateNo = "鏃犺溅鐗�"
}
- } else {
- su.PlateNo = "鏃犺溅鐗�"
+ resultList = append(resultList, su)
}
- resultList = append(resultList, su)
}
}
}
--
Gitblit v1.8.0