From a1c9a42221434e519898f8ad885a7ab4d7ce3226 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 15:13:02 +0800
Subject: [PATCH] fix pageSize
---
service/carService.go | 2 +-
service/userService.go | 28 +++++++++++++++++++++++-----
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/service/carService.go b/service/carService.go
index 1c05619..cac0d22 100644
--- a/service/carService.go
+++ b/service/carService.go
@@ -234,7 +234,7 @@
url := "/artemis/api/resource/v2/person/personList"
reqBody := map[string]interface{} {
"pageNo": 1,
- "pageSize": 10000,
+ "pageSize": 1000,
}
fmt.Println(url, reqBody)
result := sv.hikUtil.Post(url, reqBody)
diff --git a/service/userService.go b/service/userService.go
index f3a7337..e9ba427 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -18,12 +18,30 @@
func (sv *UserService) Login(phoneNum, code string) (bool,*vo.UserInfo,error) {
if verifyCode(phoneNum, code) {
+ carSv := NewCarService()
+
var tmpUser models.User
err := tmpUser.SelectByPhoneNum(phoneNum)
fmt.Println("login err:", err)
if err != nil { //鐢ㄦ埛涓嶅瓨鍦�,鍒欐柊澧�
+ //鍏堝垽鏂鎵嬫満鍙锋槸鍚﹀湪娴峰悍骞冲彴涓�
+ hikPersons := carSv.GetHikPersonList()
+ found := false
+ hikPersonId := ""
+ if hikPersons != nil {
+ for _,hikP := range hikPersons {
+ if hikP.Phone == phoneNum {
+ found = true
+ hikPersonId = hikP.PersonId
+ }
+ }
+ }
+ if !found {
+ return false, nil, errors.New("璇疯仈绯诲仠杞﹀満绠＄悊鍛�")
+ }
+
u := models.User{
- Id: uuid.NewV4().String(),
+ Id: hikPersonId,
PhoneNum: phoneNum,
IsDelete: false,
}
@@ -38,11 +56,11 @@
return false, nil, errors.New("娉ㄥ唽澶辫触")
}
} else { //鐢ㄦ埛宸插瓨鍦�
- var userCar models.UserCar
var plateNos = make([]string, 0)
- all, e := userCar.GetByUserId(tmpUser.Id)
- if e == nil && all != nil {
- for _,up := range all {
+ hikVehicles := carSv.GetVehicleListByPerson(tmpUser.Id)
+
+ if hikVehicles != nil {
+ for _,up := range hikVehicles {
plateNos = append(plateNos, up.PlateNo)
}
}
--
Gitblit v1.8.0