From 27f1012d2fecda7bcc3d9f44c5dd4c10a7cf38a4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 18 八月 2020 12:13:54 +0800
Subject: [PATCH] add log
---
service/carService.go | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index a3c45e0..9a2c6a1 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -8,6 +8,7 @@
"fmt"
"github.com/astaxie/beego"
"strconv"
+ "strings"
)
type CarService struct {
hikUtil *reqUtil.HikHttpUtil
@@ -142,6 +143,38 @@
SpaceType string `json:"spaceType"`
}
+func (sv *CarService) FindHikSpaceInfo() []SpaceNo {
+ url := "/artemis/api/pms/v1/parkingSpace/spaceNo"
+
+ reqBody := map[string]interface{} {
+ "pageNo": 1,
+ "pageSize": 1000,
+ }
+ pageResult := sv.getHikPageResult(url, reqBody)
+ if pageResult != nil {
+ rb, err := json.Marshal(pageResult.List)
+ if err != nil {
+ fmt.Println("marshal pageResult.List err:", err)
+ return nil
+ }
+ var spaceList []SpaceNo
+ err = json.Unmarshal(rb, &spaceList)
+ if err != nil {
+ fmt.Println("unmarshal spaceNos err:", err)
+ return nil
+ } else {
+ var resultArr []SpaceNo
+ for _,si := range spaceList {
+ if si.State == 1 { //鏈夎溅
+ resultArr = append(resultArr, si)
+ }
+ }
+ return resultArr
+ }
+ }
+ return nil
+}
+
func (sv *CarService) FindSpaceNo(userId string) models.PosResult {
resultList := make(models.PosResult,0)
var myPlateNosMap = make(map[string]string)
@@ -149,8 +182,11 @@
vehicles := sv.GetVehicleListByPerson(userId)
if vehicles != nil {
for _,veh := range vehicles {
- myPlateNosMap[veh.PlateNo] = veh.PlateNo
- //myPlateNos = append(myPlateNos, veh.PlateNo)
+ if veh.PlateNo != "" {
+ ncStr := veh.PlateNo[1:] //鎶婄涓�浣嶆眽瀛楀墧闄ゆ帀
+ myPlateNosMap[ncStr] = ncStr
+ }
+ //myPlateNosMap[veh.PlateNo] = veh.PlateNo
}
}
}
@@ -179,7 +215,6 @@
return nil
}
for _,s := range spaceList {
-
pi := models.PosInfo {
SpaceNo: s.SpaceNo,
PosNo: "",
@@ -190,11 +225,7 @@
} else if s.PlateNos != "" {
pi.PlateNo = s.PlateNos
}
- isMine := false
- if _,exist := myPlateNosMap[pi.PlateNo]; exist {
- isMine = true
- }
- pi.IsMine = isMine
+ pi.IsMine = isMyPlateNo(myPlateNosMap, pi.PlateNo)
if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
pi.PosNo = v
}
@@ -215,6 +246,36 @@
}
return resultList
+}
+
+//鍒ゆ柇鏄笉鏄嚜宸辩殑杞︾墝鍙�
+//1.鐩墠鏈夎璇嗗埆鐨勯棶棰橈紝浼氭妸D璇嗗埆鎴�0,D鍜�0涓嶅垎
+//2.姹夊瓧璇瘑鍒殑鍑犵巼姣旇緝楂�
+func isMyPlateNo(plateNoM map[string]string, targetPlateNo string) bool {
+ if targetPlateNo == "浜琋34809"{
+ fmt.Println("isMyPlateNo plateNoM:", plateNoM)
+ }
+ if targetPlateNo != "" {
+ nctPlateNo := targetPlateNo[1:]
+ if _,exist := plateNoM[nctPlateNo];exist {
+ return true
+ } else {
+ match := false
+ for k,_ := range plateNoM {
+ newK := strings.ReplaceAll(k, "D", "*")
+ newK = strings.ReplaceAll(newK, "0", "*")
+
+ tt := strings.ReplaceAll(targetPlateNo,"D", "*")
+ tt = strings.ReplaceAll(tt,"0", "*")
+ if newK == tt {
+ match = true
+ break
+ }
+ }
+ return match
+ }
+ }
+ return false
}
func (sv *CarService) BindCarSpace() bool {
@@ -309,13 +370,13 @@
hikPersons := sv.GetHikPersonList()
if hikPersons != nil && len(hikPersons) >0 {
var u models.User
- uMap,idMap := u.GetAllMapByPhone()
+ idMap := u.GetAllMap()
hikPM := make(map[string]string)
for _,hp := range hikPersons {
- hikPM[hp.PersonId] = hp.PersonId
- if sp,ok := uMap[hp.PhoneNo];ok {
- if sp.Id != hp.PersonId {
- u.SyncHikPersonId(hp.PhoneNo, hp.PersonId)
+ hikPM[hp.PersonId] = hp.PhoneNo
+ if sp,ok := idMap[hp.PersonId];ok {
+ if sp.PhoneNum != hp.PhoneNo {
+ u.UpdatePhoneNum(hp.PhoneNo, hp.PersonId)
syncCount++
}
}
--
Gitblit v1.8.0