From 9ef7f582a51eed7c7306efd33f2a4c220665763f Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 15:46:40 +0800
Subject: [PATCH] add log
---
service/userService.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/service/userService.go b/service/userService.go
index 665820b..e9ba427 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -18,28 +18,49 @@
func (sv *UserService) Login(phoneNum, code string) (bool,*vo.UserInfo,error) {
if verifyCode(phoneNum, code) {
+ carSv := NewCarService()
+
var tmpUser models.User
- if err := tmpUser.SelectByPhoneNum(phoneNum); err != nil { //鐢ㄦ埛涓嶅瓨鍦�,鍒欐柊澧�
+ 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,
}
- if i, e := u.Insert();e ==nil && i >0 {
+ if _, e := u.Insert();e ==nil {
return true, &vo.UserInfo{
UserId: u.Id,
PhoneNum: phoneNum,
PlateNos: []string{},
}, nil
} else {
+ fmt.Println("u.Insert err:", e)
return false, nil, errors.New("娉ㄥ唽澶辫触")
}
} else { //鐢ㄦ埛宸插瓨鍦�
- var userCar models.UserCar
- var plateNos []string
- all, e := userCar.GetByUserId(tmpUser.Id)
- if e == nil && all != nil {
- for _,up := range all {
+ var plateNos = make([]string, 0)
+ hikVehicles := carSv.GetVehicleListByPerson(tmpUser.Id)
+
+ if hikVehicles != nil {
+ for _,up := range hikVehicles {
plateNos = append(plateNos, up.PlateNo)
}
}
@@ -54,6 +75,23 @@
}
}
+func (sv *UserService) AddPlateNo(userId, plateNo string) bool {
+ var uc models.UserCar
+ if uc.Exist(userId, plateNo) {
+ return true
+ }
+ tmp := models.UserCar{
+ Id: uuid.NewV4().String(),
+ UserId: userId,
+ PlateNo: plateNo,
+ }
+ _, err := tmp.Insert()
+ if err == nil {
+ return true
+ }
+ return false
+}
+
func NewVerifyCode(phoneNum string) error {
regionId := "cn-hangzhou"
accessKeyId := "LTAIkHFaStA1JKk5"
--
Gitblit v1.8.0