From c68413f680d64ad9343ec7a2c0a7fec8fc4531a6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 12 八月 2020 14:48:47 +0800
Subject: [PATCH] add unbind alias
---
service/carService.go | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 4e2c881..a3c45e0 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -179,21 +179,22 @@
return nil
}
for _,s := range spaceList {
- isMine := false
- if _,exist := myPlateNosMap[s.PlateNos]; exist {
- isMine = true
- }
+
pi := models.PosInfo {
SpaceNo: s.SpaceNo,
PosNo: "",
State: s.State,
- IsMine: isMine,
}
if s.PlateNo != "" {
pi.PlateNo = s.PlateNo
} else if s.PlateNos != "" {
pi.PlateNo = s.PlateNos
}
+ isMine := false
+ if _,exist := myPlateNosMap[pi.PlateNo]; exist {
+ isMine = true
+ }
+ pi.IsMine = isMine
if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
pi.PosNo = v
}
@@ -302,20 +303,32 @@
return list
}
-func SyncHikPerson() {
+func SyncHikPerson() int {
+ syncCount := 0
sv := NewCarService()
hikPersons := sv.GetHikPersonList()
- if hikPersons != nil {
+ if hikPersons != nil && len(hikPersons) >0 {
var u models.User
- uMap := u.GetAllMapByPhone()
+ uMap,idMap := u.GetAllMapByPhone()
+ 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)
+ syncCount++
}
}
}
+ for k,_ := range idMap {
+ if _,in := hikPM[k];!in {
+ u.Delete(k)
+ syncCount++
+ }
+ }
+
}
+ return syncCount
}
func (sv *CarService) getHikPageResult(url string, reqBody map[string]interface{}) *vo.HikPageResult {
@@ -366,10 +379,13 @@
reqBody := map[string]interface{} {
"pageNo": 1,
"pageSize": 1000,
- "personIds": personId,
+ }
+ if personId != "" {
+ reqBody["personIds"] = personId
}
pageResult := sv.getHikPageResult(url, reqBody)
if pageResult ==nil {
+ fmt.Println("GetVehicleListByPerson pageResult is nil")
return nil
}
@@ -378,6 +394,8 @@
var list []HikVehicle
if err = json.Unmarshal(b, &list);err == nil {
return list
+ } else {
+ fmt.Println("unmarshal err:", err)
}
}
--
Gitblit v1.8.0