From 6d3673f0ee39c02aa49775693d64554c6af25e57 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 16:50:26 +0800
Subject: [PATCH] new findSpaceNo
---
controllers/user.go | 3 ---
service/carService.go | 22 +++++++++++-----------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 3b437a1..2025f12 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -132,11 +132,8 @@
func (u *UserController) MyPlateNos() {
userId := u.GetString("userId")
fmt.Println("MyPlateNos userId", userId)
- //var uc models.UserCar
- //all, err := uc.GetByUserId(userId)
sv := service.NewCarService()
vehicleList := sv.GetVehicleListByPerson(userId)
- fmt.Println("vehicleList:", vehicleList)
var nos = make([]string, 0)
if vehicleList != nil {
for _,p := range vehicleList {
diff --git a/service/carService.go b/service/carService.go
index 7d4bbac..99f5e93 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -154,22 +154,22 @@
resultList := make(models.PosResult,0)
//鍏堟煡杞﹀簱鍞竴鏍囪瘑
- 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锛氬仠杞�
"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
@@ -191,8 +191,8 @@
resultList = append(resultList, pi)
}
}
- }
- }
+ //}
+ //}
return resultList
}
--
Gitblit v1.8.0