fix: 数据源目录定位

controllers/data_manage/eia_steo.go

@@ -47,6 +47,7 @@ func (this *EdbInfoController) EiaSteoClassify() {
 	childClassifyMap := make(map[int][]*data_manage.BaseFromEiaSteoClassifyView)
 	rootList := make([]*data_manage.BaseFromEiaSteoClassifyView, 0)
 	for _, v := range classifyList {
+		v.UniqueCode = strconv.Itoa(v.BaseFromEiaSteoClassifyId)
 		if v.Level == 1 {
 			rootList = append(rootList, v)
 		} else {

controllers/data_manage/manual_edb.go

@@ -359,6 +359,7 @@ func (c *ManualEdbController) EdbSearch() {
 		if s == "" {
 			s = v.SecName
 		}
+		v.ClassifyUniqueCode = utils.MD5(strconv.Itoa(v.ClassifyId))
 		v.SearchText = s
 	}
 

controllers/data_manage/smm_data.go

@@ -13,6 +13,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -63,6 +64,7 @@ func (this *EdbInfoController) SmmClassify() {
 
 	rootChildMap := make(map[int][]*data_manage.BaseFromSmmClassifyItems)
 	for _, v := range classifyAll {
+		v.UniqueCode = strconv.Itoa(v.ClassifyId)
 		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
 		/*if existItems, ok := baseFromSmmIndexMap[v.ClassifyId]; ok {
 			v.Children = existItems
@@ -93,6 +95,7 @@ func (this *EdbInfoController) SmmClassify() {
 		Level:              1,
 		Sort:               0,
 		Children:           nil,
+		UniqueCode:         "0",
 	}
 	/*initIndexList, err := data_manage.GetBaseFromSmmIndexByClassifyId(initClassify.ClassifyId)
 	if err != nil {

controllers/data_source/data_source.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"strconv"
 )
 
 // SearchByEs
@@ -216,6 +217,49 @@ func (c *DataSourceController) SearchByEs() {
 		}
 	}
 
+	// 分类的唯一编码(前端定位用)
+	if classifyIdKey == "" {
+		classifyIdKey = "ClassifyId"
+	}
+	idUniqueCodeArr := []int{
+		utils.DATA_SOURCE_SCI_HQ, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_YS, utils.DATA_SOURCE_EIA_STEO,
+	}
+	if utils.InArrayByInt(idUniqueCodeArr, source) {
+		for _, v := range listMap {
+			classifyId, ok := v[classifyIdKey].(int)
+			if !ok {
+				v["ClassifyUniqueCode"] = ""
+				continue
+			}
+			v["ClassifyUniqueCode"] = strconv.Itoa(classifyId)
+		}
+	}
+	//if source == utils.DATA_SOURCE_MANUAL {
+	//	// 手工指标
+	//	var wxUserId int64
+	//	wxUserId = int64(sysUser.AdminId)
+	//	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+	//		wxUserId = 0
+	//	}
+	//	classifies, err := models.GetEdbdataClassify(wxUserId)
+	//	if err != nil {
+	//		br.Msg = "获取失败"
+	//		br.ErrMsg = fmt.Sprintf("获取手工指标分类失败, %v", e)
+	//		return
+	//	}
+	//	unicodeMap := make(map[int]string)
+	//	for _, v := range classifies {
+	//		unicodeMap[v.ClassifyId] = v.UniqueCode
+	//	}
+	//	for _, v := range listMap {
+	//		classifyId, ok := v["ClassifyId"].(int)
+	//		if !ok {
+	//			continue
+	//		}
+	//		v["ClassifyUniqueCode"] = unicodeMap[classifyId]
+	//	}
+	//}
+
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := dataSourceModel.SearchDataSourceResp{
 		Paging: page,

models/data_manage/base_from_eia_stero.go

@@ -58,6 +58,7 @@ type BaseFromEiaSteoClassifyView struct {
 	ClassifyNameOriginal      string                         `description:"分类名称（原始名称）"`
 	ParentId                  int                            `description:"父级id"`
 	Level                     int                            `description:"层级"`
+	UniqueCode                string                         `description:"唯一编码"`
 	Child                     []*BaseFromEiaSteoClassifyView `description:"子级分类列表"`
 }
 

models/data_manage/base_from_smm_classify.go

@@ -98,7 +98,7 @@ type BaseFromSmmClassifyItems struct {
 	ParentId             int    `description:"父级id"`
 	Level                int    `description:"层级"`
 	Sort                 int    `description:"排序字段，越小越靠前，默认值：10"`
-	//UniqueCode         string                         `description:"唯一编码"`
+	UniqueCode           string `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
 	Children []*BaseFromSmmClassifyItems `description:"下级"`

models/data_source/data_source.go

@@ -1067,13 +1067,13 @@ func (m *BaseFromCoalmineMapping) EsCols() SearchEsCols {
 		IndexCode:   "index_code",
 		IndexName:   "index_name",
 		ClassifyId:  "",
-		Unit:        "",
-		Frequency:   "",
-		StartDate:   "",
-		EndDate:     "",
-		LatestValue: "",
+		Unit:        "unit",
+		Frequency:   "frequency",
+		StartDate:   "start_date",
+		EndDate:     "end_date",
+		LatestValue: "latest_value",
 		CreateTime:  "create_time",
-		ModifyTime:  "",
+		ModifyTime:  "modify_time",
 	}
 }
 
@@ -1802,7 +1802,7 @@ func (m *BaseFromMtjhMapping) EsCols() SearchEsCols {
 		EndDate:     "end_date",
 		LatestValue: "latest_value",
 		CreateTime:  "create_time",
-		ModifyTime:  "",
+		ModifyTime:  "modify_time",
 	}
 }
 

models/manual_edb.go

@@ -66,30 +66,31 @@ func GetEdbDataListByCode(tradeCode string) (items []*Edbdata, err error) {
 
 // EdbInfoListItem
 type EdbInfoListItem struct {
-	TradeCode    string `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string `orm:"column(UNIT);" description:"单位"`
-	Remark       string `orm:"column(REMARK);" description:"备注"`
-	Frequency    string `description:"频度"`
-	ClassifyId   int    `description:"分类id"`
-	ClassifyName string `description:"分类名称"`
-	CreateDate   string `description:"创建时间"`
-	UserId       int    `description:"录入用户id"`
-	NoticeTime   string `description:"通知时间"`
-	Mobile       string `description:"录入者手机号"`
-	ModifyDate   string `description:"待更新日期"`
-	ModifyTime   string `description:"数据更新时间"`
-	Status       string `description:"状态：未完成/完成"`
-	UniqueCode   string
-	IsJoinEdb    int8    `description:"指标库是否已添加：0-否；1-是"`
-	UserName     string  `description:"录入用户名称"`
-	StartDate    string  `description:"数据开始日期"`
-	EndDate      string  `description:"数据结束日期"`
-	LatestValue  float64 `description:"指标最新值"`
-	NextDateTime string  `description:"下期时间"`
-	Source       int     `description:"来源"`
-	SourceName   string  `description:"数据源名称"`
-	SearchText   string  `description:"搜索结果（含高亮）"`
+	TradeCode          string `orm:"column(TRADE_CODE);pk" description:"指标code"`
+	SecName            string `orm:"column(SEC_NAME);" description:"指标名称"`
+	Unit               string `orm:"column(UNIT);" description:"单位"`
+	Remark             string `orm:"column(REMARK);" description:"备注"`
+	Frequency          string `description:"频度"`
+	ClassifyId         int    `description:"分类id"`
+	ClassifyName       string `description:"分类名称"`
+	CreateDate         string `description:"创建时间"`
+	UserId             int    `description:"录入用户id"`
+	NoticeTime         string `description:"通知时间"`
+	Mobile             string `description:"录入者手机号"`
+	ModifyDate         string `description:"待更新日期"`
+	ModifyTime         string `description:"数据更新时间"`
+	Status             string `description:"状态：未完成/完成"`
+	UniqueCode         string
+	IsJoinEdb          int8    `description:"指标库是否已添加：0-否；1-是"`
+	UserName           string  `description:"录入用户名称"`
+	StartDate          string  `description:"数据开始日期"`
+	EndDate            string  `description:"数据结束日期"`
+	LatestValue        float64 `description:"指标最新值"`
+	NextDateTime       string  `description:"下期时间"`
+	Source             int     `description:"来源"`
+	SourceName         string  `description:"数据源名称"`
+	SearchText         string  `description:"搜索结果（含高亮）"`
+	ClassifyUniqueCode string  `description:"分类唯一编码(前端定位用)"`
 }
 
 // EdbListResp 指标数据结构体