From 6ecda400e04a118326cabe768f8808e9b5514af6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 05 八月 2020 19:46:35 +0800
Subject: [PATCH] set 90 spaceNum,limit <=5 push msg
---
service/carService.go | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 179eece..d9a9ce0 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -7,6 +7,7 @@
"encoding/json"
"fmt"
"github.com/astaxie/beego"
+ "strconv"
)
type CarService struct {
hikUtil *reqUtil.HikHttpUtil
@@ -150,26 +151,35 @@
SpaceType string `json:"spaceType"`
}
-func (sv *CarService) FindSpaceNo() models.PosResult {
+func (sv *CarService) FindSpaceNo(userId string) models.PosResult {
resultList := make(models.PosResult,0)
-
+ var myPlateNosMap = make(map[string]string)
+ vehicles := sv.GetVehicleListByPerson(userId)
+ if vehicles != nil {
+ for _,veh := range vehicles {
+ myPlateNosMap[veh.PlateNo] = veh.PlateNo
+ //myPlateNos = append(myPlateNos, veh.PlateNo)
+ }
+ }
+ //bindCars := strings.Join(myPlateNos, ",")
//鍏堟煡杞﹀簱鍞竴鏍囪瘑
- parkList := sv.getHikParkList() //鍏堟煡鏈夊嚑涓仠杞﹀満
- if parkList != nil {
+ //parkList := sv.getHikParkList() //鍏堟煡鏈夊嚑涓仠杞﹀満
+ //if parkList != nil {
url := "/artemis/api/pms/v1/parkingSpace/spaceNo"
- for _,p := range parkList {
+ //for _,p := range parkList {
reqBody := map[string]interface{} {
- "parkSyscode": p.ParkIndexCode,//鍋滆溅搴撳敮涓�鏍囪瘑
+ //"parkSyscode": p.ParkIndexCode,//鍋滆溅搴撳敮涓�鏍囪瘑
//"state": 1, //杞︿綅鐘舵�侊紝0锛氱┖闂诧紝1锛氬仠杞�
+ //"bindCars": bindCars,
"pageNo": 1,
"pageSize": 1000,
}
- result := sv.hikUtil.Post(url, reqBody)
- fmt.Println("findSpaceNo result:", result)
- if result.Code == reqUtil.HikResult_Success {
- rb, err := json.Marshal(result.Data)
+ pageResult := sv.getHikPageResult(url, reqBody)
+ fmt.Println("findSpaceNo pageResult:", pageResult)
+ if pageResult != nil {
+ rb, err := json.Marshal(pageResult.List)
if err != nil {
- fmt.Println("hik find spaceNo err:",err)
+ fmt.Println("marshal pageResult.List err:",err)
return nil
}
var spaceList []SpaceNo
@@ -179,11 +189,16 @@
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,
PlateNo: s.PlateNos,
+ IsMine: isMine,
}
if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
pi.PosNo = v
@@ -191,6 +206,18 @@
resultList = append(resultList, pi)
}
}
+ //}
+ //}
+ if len(resultList) == 0 {
+ for i:=1;i<91;i++ {
+ pi := models.PosInfo {
+ SpaceNo: strconv.Itoa(i),
+ PosNo: "",
+ State: 1,
+ PlateNo: "",
+ IsMine: false,
+ }
+ resultList = append(resultList, pi)
}
}
@@ -299,7 +326,7 @@
fmt.Println("marshal result.Data err:", err)
}
} else {
- fmt.Println("result.Code:", result.Code)
+ fmt.Println("result:", result)
}
return nil
}
@@ -333,12 +360,10 @@
"pageSize": 100,
"personIds": personId,
}
- fmt.Println(url, reqBody)
pageResult := sv.getHikPageResult(url, reqBody)
if pageResult ==nil {
return nil
}
- fmt.Println("getVehicleList result:", pageResult)
b, err := json.Marshal(pageResult.List)
if err == nil {
--
Gitblit v1.8.0