新增指定指标ID参数

controller/index_data/gn_index.go

@@ -29,7 +29,7 @@ func (j *GnIndexController) GetPageIndex(c *gin.Context) {
 		return
 	}
 
-	list, page, err := indexDataService.GetPageIndexesFromGn(req.PageIndex, req.PageSize, req.LastModifyTime)
+	list, page, err := indexDataService.GetPageIndexesFromGn(req.PageIndex, req.PageSize, req.LastModifyTime, req.IndexId)
 	if err != nil {
 		resp.FailMsg("查询失败", err.Error(), c)
 		return

logic/gn/auth.go

@@ -1,8 +1,12 @@
 package gn
 
 import (
+	"eta_gn/eta_bridge/models/eta"
 	"eta_gn/eta_bridge/models/response"
+	"eta_gn/eta_bridge/services"
 	"eta_gn/eta_bridge/services/gn"
+	"fmt"
+	"time"
 )
 
 // LoginEta
@@ -13,53 +17,52 @@ import (
 // @return resp response.LoginResp
 // @return err error
 // @return errMsg string
-func LoginEta(code string) (resp response.GnUserResp, err error, errMsg string) {
-	tokenResp, err := gn.GetToken(code)
-	if err != nil {
+// func LoginEta(code string) (resp response.GnUserResp, err error, errMsg string) {
+func LoginEta(code string) (resp response.LoginResp, err error, errMsg string) {
+	tokenResp, e := gn.GetToken(code)
+	if e != nil {
+		err = fmt.Errorf("获取AccessToken失败, %v", e)
 		return
 	}
-
-	//// 获取eta用户信息
-	//adminInfo, err := eta.GetSysUserByOutId(tokenResp.Uid)
-	//if err != nil {
-	//	return
-	//}
+	accessToken := tokenResp.AccessToken
 
 	// 获取用户信息
-	res, err := gn.GetUserInfo(code, tokenResp.AccessToken)
-	if err != nil {
+	res, e := gn.GetUserInfo(code, accessToken)
+	if e != nil {
+		err = fmt.Errorf("获取用户基础信息失败, Err: %v, Code: %s, Token: %s", e, code, accessToken)
+		return
+	}
+	//resp.Sub = res.Sub
+	//resp.PreferredUsername = res.PreferredUsername
+	//resp.Name = res.Name
+	//resp.FamilyName = res.FamilyName
+	//resp.GivenName = res.GivenName
+
+	// 获取eta用户信息
+	adminInfo, e := eta.GetSysUserByAdminName(res.PreferredUsername)
+	if e != nil {
+		err = fmt.Errorf("用户不存在, UserName: %s", res.PreferredUsername)
 		return
 	}
-	resp.Sub = res.Sub
-	resp.PreferredUsername = res.PreferredUsername
-	resp.Name = res.Name
-	resp.FamilyName = res.FamilyName
-	resp.GivenName = res.GivenName
 
-	//// 获取eta用户信息
-	//adminInfo, err := eta.GetSysUserByAdminName(userInfoResp.LoginName)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 生成登录session
-	//resp, session, err, errMsg := services.CreateEtaSession(adminInfo)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 记录两方session的绑定信息
-	//thirdSession := &eta.SysThirdSession{
-	//	ID:               0,
-	//	SysUserID:        uint64(session.SysUserId),
-	//	UserName:         session.UserName,
-	//	AccessToken:      session.AccessToken,
-	//	ThirdAccessToken: tokenResp.AccessToken,
-	//	//ThirdRefreshToken: tokenResp.RefreshToken,
-	//	ThirdExpiredTime: time.Now().Add(time.Duration(tokenResp.ExpiresIn-100) * time.Second),
-	//	CreatedTime:      time.Now(),
-	//	LastUpdatedTime:  time.Now(),
-	//}
-	//err = eta.AddSysThirdSession(thirdSession)
+	// 生成登录session
+	sessionResp, session, e, _ := services.CreateEtaSession(adminInfo)
+	if e != nil {
+		err = fmt.Errorf("登录失败, %v", e)
+		return
+	}
+	resp = sessionResp
+
+	// 记录两方session的绑定信息
+	thirdSession := &eta.SysThirdSession{
+		SysUserID:        uint64(session.SysUserId),
+		UserName:         session.UserName,
+		AccessToken:      session.AccessToken,
+		ThirdAccessToken: tokenResp.AccessToken,
+		ThirdExpiredTime: time.Now().Add(time.Duration(tokenResp.ExpiresIn-100) * time.Second),
+		CreatedTime:      time.Now(),
+		LastUpdatedTime:  time.Now(),
+	}
+	err = eta.AddSysThirdSession(thirdSession)
 	return
 }

models/eta/sys_third_session.go

@@ -8,7 +8,7 @@ import (
 // SysThirdSession
 // @Description: 第三方登录会话session
 type SysThirdSession struct {
-	ID               uint64 `gorm:"primaryKey;column:id"`
+	ID               uint64 `gorm:"primaryKey;column:id;autoIncrement:true"`
 	SysUserID        uint64 `gorm:"column:sys_user_id"`
 	UserName         string `gorm:"column:user_name"`
 	AccessToken      string `gorm:"index:access_token;column:access_token"`

models/request/index_data/gn_index.go

@@ -5,6 +5,7 @@ type GnPageIndexReq struct {
 	LastModifyTime string `json:"last_modify_time" form:"last_modify_time" description:"最近一次更新时间"`
 	PageIndex      int    `json:"page_index" form:"page_index" description:"当前页码"`
 	PageSize       int    `json:"page_size" form:"page_size" description:"每页数据量"`
+	IndexId        string `json:"index_id" form:"index_id" description:"指标ID,不为空时表示只取该指标"`
 }
 
 // GnDataReq 指标数据请求体

services/index_data/gn_base_data_platform.go

@@ -79,6 +79,7 @@ type IndexInfoReq struct {
 	UpdateTime string `json:"UPDATE_TIME"`
 	Size       int    `json:"size"`
 	PageNo     int    `json:"pageNo"`
+	IndexId    string `json:"INDEX_ID"`
 }
 
 // GetIndexInfoList

services/index_data/gn_platform.go

@@ -15,7 +15,7 @@ import (
 // TODO 过滤前后空格
 
 // GetPageIndexesFromGn 分页获取指标数据
-func GetPageIndexesFromGn(pageIndex, pageSize int, modifyTime string) (list []gn.IndexInfo, page *paging.PagingItem, err error) {
+func GetPageIndexesFromGn(pageIndex, pageSize int, modifyTime, indexId string) (list []gn.IndexInfo, page *paging.PagingItem, err error) {
 	defer func() {
 		if err != nil {
 			global.LOG.Info("GetPageIndexesFromGn Err: " + err.Error())
@@ -29,6 +29,9 @@ func GetPageIndexesFromGn(pageIndex, pageSize int, modifyTime string) (list []gn
 		Size:       pageSize,
 		PageNo:     pageIndex,
 	}
+	if indexId != "" {
+		req.IndexId = indexId
+	}
 	resp, err := GetIndexInfoList(req)
 	if err != nil {
 		return