Merge branch 'feature/jiayue' into debug

controller/index_data/jiayue_index.go

@@ -161,3 +161,16 @@ func (j *JiaYueIndexController) GetRecentNewIndex(c *gin.Context) {
 	}
 	resp.OkData("获取成功", data, c)
 }
+
+// GetMenuList
+// @Description 获取指标目录列表
+// @Success 200 {string} string "获取成功"
+// @Router /jiayue/menu_list [post]
+func (j *JiaYueIndexController) GetMenuList(c *gin.Context) {
+	data, e := jiayue.GetDictCategory(``, make([]interface{}, 0), "")
+	if e != nil {
+		resp.FailMsg("获取失败", "获取嘉业指标目录列表, err: "+e.Error(), c)
+		return
+	}
+	resp.OkData("获取成功", data, c)
+}

models/jiayue/category.go

@@ -39,7 +39,7 @@ type DictCategorySql struct {
 	Path        sql.NullString `description:"目录全路径" json:"PATH"`
 }
 
-// GetDictCategory 获取指标目录
+// GetDictCategory 获取指标目录列表
 func GetDictCategory(condition string, pars []interface{}, orderRule string) (categories []DictCategory, err error) {
 	defer func() {
 		if err != nil {
@@ -47,7 +47,31 @@ func GetDictCategory(condition string, pars []interface{}, orderRule string) (ca
 		}
 	}()
 
-	// 查询字段固定, 避免嘉悦加了字段这边报错
+	fields := "ID, PARENT_ID, PARENT_NAME, TYPE, CODE, NAME, ICON, SORTING, DESCRIPTION, USER_ID, PATH"
+	querySql := fmt.Sprintf(`SELECT %s FROM %s WHERE %s %s`, fields, IndexMenuTableName, condition, orderRule)
+	order := ``
+	if orderRule != "" {
+		order += fmt.Sprintf(` ORDER BY %s`, orderRule)
+	}
+	global.LOG.Info("querySql SQL: ", querySql)
+
+	list, e := execDictCategory(querySql, pars)
+	if e != nil {
+		err = fmt.Errorf("execDictCategory err: %s", e.Error())
+		return
+	}
+	categories = list
+	return
+}
+
+// GetIndexCategory 获取指标关联目录
+func GetIndexCategory(condition string, pars []interface{}, orderRule string) (categories []DictCategory, err error) {
+	defer func() {
+		if err != nil {
+			global.LOG.Info("GetIndexCategory Err:" + err.Error())
+		}
+	}()
+
 	fields := "C.ID, C.PARENT_ID, C.PARENT_NAME, C.TYPE, C.CODE, C.NAME, C.ICON, C.SORTING, C.DESCRIPTION, C.USER_ID, C.PATH"
 	querySql := fmt.Sprintf(`SELECT %s FROM %s C JOIN %s R ON C.ID = R.INDEX_ID WHERE %s %s`, fields, IndexMenuTableName, IndexMenuRelateTableName, condition, orderRule)
 	order := ``

models/response/index_data.go

@@ -10,6 +10,7 @@ type IndexResp struct {
 	Id             int           `description:"指标自增ID" json:"id"`
 	IndexCode      string        `description:"指标编码" json:"index_code"`
 	IndexName      string        `description:"指标名称" json:"index_name"`
+	SourceType     string        `description:"指标来源" json:"source_type"`
 	Unit           string        `description:"单位" json:"unit"`
 	Frequency      string        `description:"频度" json:"frequency"`
 	LastDate       time.Time     `description:"指标最新时间" json:"last_date"`
@@ -31,6 +32,7 @@ type IndexMenuData struct {
 	Id         int    `description:"目录ID" json:"id"`
 	Type       string `description:"目录类型" json:"type"`
 	Code       string `description:"目录编码" json:"code"`
+	Name       string `description:"目录名称" json:"name"`
 	Icon       string `description:"目录图标" json:"icon"`
 	Sort       int    `description:"排序" json:"sort"`
 	ParentId   int    `description:"父级目录ID" json:"parent_id"`

routers/index_data.go

@@ -15,4 +15,5 @@ func InitIndexData(r *gin.RouterGroup) {
 	group.POST("jiayue/page_index", control.GetPageIndex)
 	group.POST("jiayue/frequency_list", control.GetIndexFrequency)
 	group.POST("jiayue/new_index", control.GetRecentNewIndex)
+	group.POST("jiayue/menu_list", control.GetMenuList)
 }

services/index_data/jiayue_platform.go

@@ -5,11 +5,9 @@ import (
 	"eta/eta_bridge/models/jiayue"
 	"eta/eta_bridge/models/response"
 	"eta/eta_bridge/services/alarm_msg"
-	"eta/eta_bridge/utils"
 	"fmt"
 	"strconv"
 	"strings"
-	"time"
 )
 
 // GetIndexFromJiaYue 获取嘉悦指标信息
@@ -190,25 +188,23 @@ func GetNewIndexAndDataFromJiaYue() (indexList []*response.IndexResp, err error)
 	indexPars := make([]interface{}, 0)
 	// TODO:查询两个小时之前的数据(待定)
 	//timeBefore := time.Now().Local().Add(-2 * time.Hour).Format(utils.FormatDateTime)
-	//indexCond += ` CREATE_TIME <= :1 `
+	//indexCond += ` CREATE_TIME <= TO_DATE (:1, 'yyyy-mm-dd hh24:mi:ss') `
 	//indexPars = append(indexPars, timeBefore.Format(utils.FormatDateTime))
 
 	// TODO:测试
-	endTime := time.Date(2023, 6, 8, 0, 0, 0, 0, time.Local).Format(utils.FormatDateTime)
-	indexCond += fmt.Sprintf(`CREATE_TIME <= TO_DATE ('%s', 'yyyy-mm-dd hh24:mi:ss')`, endTime)
-	//indexPars = append(indexPars, endTime)
-	sourceArr := []string{"bloomberg", "bloomberg_tmp"}
-	if len(sourceArr) > 0 {
-		str := ``
-		for _, s := range sourceArr {
-			str += fmt.Sprintf(`'%s',`, s)
-		}
-		str = strings.TrimRight(str, ",")
-		indexCond += fmt.Sprintf(` AND SOURCE_TYPE IN (%s)`, str)
-		//for _, s := range sourceArr {
-		//	indexPars = append(indexPars, s)
-		//}
-	}
+	//endTime := time.Date(2023, 6, 8, 0, 0, 0, 0, time.Local).Format(utils.FormatDateTime)
+	//indexCond += fmt.Sprintf(`CREATE_TIME <= TO_DATE ('%s', 'yyyy-mm-dd hh24:mi:ss')`, endTime)
+	//sourceArr := []string{"bloomberg", "bloomberg_tmp"}
+	//if len(sourceArr) > 0 {
+	//	str := ``
+	//	for _, s := range sourceArr {
+	//		str += fmt.Sprintf(`'%s',`, s)
+	//	}
+	//	str = strings.TrimRight(str, ",")
+	//	indexCond += fmt.Sprintf(` AND SOURCE_TYPE IN (%s)`, str)
+	//}
+	indexCond = ` ID = :1`
+	indexPars = append(indexPars, 180399)
 
 	indexes, e := jiayue.GetDictIndex(indexCond, indexPars, "CREATE_TIME ASC")
 	if e != nil {
@@ -224,25 +220,27 @@ func GetNewIndexAndDataFromJiaYue() (indexList []*response.IndexResp, err error)
 	indexList = make([]*response.IndexResp, 0)
 	for _, v := range indexes {
 		// 指标数据
-		dataCond := " INDEX_ID = :1"
-		dataPars := make([]interface{}, 0)
-		dataPars = append(dataPars, v.Id)
-		indexData, e := jiayue.GetDictData(v.TableName, dataCond, dataPars)
-		if e != nil {
-			err = fmt.Errorf("GetDictData err: %s", e.Error())
-			return
-		}
+		//dataCond := " INDEX_ID = :1"
+		//dataPars := make([]interface{}, 0)
+		//dataPars = append(dataPars, v.Id)
+		//indexData, e := jiayue.GetDictData(v.TableName, dataCond, dataPars)
+		//if e != nil {
+		//	err = fmt.Errorf("GetDictData err: %s", e.Error())
+		//	return
+		//}
+		//
 
 		// 指标目录
 		menuCond := ` R.INDEX_ID = :1`
 		menuPars := make([]interface{}, 0)
 		menuPars = append(menuPars, v.Id)
-		menus, e := jiayue.GetDictCategory(menuCond, menuPars, "")
+		menus, e := jiayue.GetIndexCategory(menuCond, menuPars, "")
 		if e != nil {
 			err = fmt.Errorf("GetDictCategory err: %s", e.Error())
 			return
 		}
 
+		var indexData []jiayue.DictData
 		item := FormatItem2Resp(v, indexData, menus)
 		indexList = append(indexList, item)
 	}
@@ -255,6 +253,7 @@ func FormatItem2Resp(item jiayue.DictIndex, dictData []jiayue.DictData, dictMenu
 	res.Id = item.Id
 	res.IndexCode = item.Code
 	res.IndexName = item.Name
+	res.SourceType = item.SourceType
 	res.Unit = item.Unit
 	res.Frequency = item.Frequency
 	res.LastDate = item.DateLast
@@ -274,6 +273,7 @@ func FormatItem2Resp(item jiayue.DictIndex, dictData []jiayue.DictData, dictMenu
 		res.MenuData.Id = firstMenu.Id
 		res.MenuData.Type = firstMenu.Type
 		res.MenuData.Code = firstMenu.Code
+		res.MenuData.Name = firstMenu.Name
 		res.MenuData.Icon = firstMenu.Icon
 		res.MenuData.Sort = firstMenu.Sorting
 		res.MenuData.ParentId = firstMenu.ParentId