初始化指标

controllers/base_from_wind.go

@@ -57,7 +57,7 @@ func (this *WindController) Add() {
 		// 试用平台的话，需要额外从弘则这边获取下地址
 		if utils.BusinessCode == utils.HZ_TRIAL_BUSSINESS_CODE {
 			// todo 从体验版中获取对应的终端信息
-			tmpWindUrl, err, errMsg := services.GetHzWindUrl(req.EdbCode, source)
+			tmpWindUrl, tmpTerminalCode, err, errMsg := services.GetHzWindUrl(req.EdbCode, source)
 			if err != nil {
 				br.Msg = "添加失败！"
 				br.ErrMsg = "添加失败，Err：" + err.Error()
@@ -67,9 +67,10 @@ func (this *WindController) Add() {
 				return
 			}
 			windUrl = tmpWindUrl
+			terminalCode = tmpTerminalCode
 		}
 
-		if windUrl == `` {
+		if terminalCode == `` {
 			terminalInfo, err := services.GetTerminal(utils.DATA_SOURCE_WIND, "")
 			if err != nil {
 				br.Msg = "获取可以使用的wind地址失败！"
@@ -80,9 +81,9 @@ func (this *WindController) Add() {
 			terminalCode = terminalInfo.TerminalCode
 		}
 
-		if windUrl == `` {
-			br.Msg = "没有配置wind地址！"
-			br.ErrMsg = "没有配置wind地址"
+		if terminalCode == `` {
+			br.Msg = "没有配置wind终端！"
+			br.ErrMsg = "没有配置wind终端"
 			return
 		}
 
@@ -185,7 +186,13 @@ func (this *WindController) Refresh() {
 	if strings.Contains(req.EdbCode, ".") {
 		endDate = time.Now().Format(utils.FormatDate)
 	}
-	dataItem, errCode, err := services.GetEdbDataFromWindUrl(edbInfo.ServerUrl, req.EdbCode, req.StartDate, endDate)
+	//获取对应的终端信息
+	terminal, err := services.GetTerminal(utils.DATA_SOURCE_WIND, edbInfo.TerminalCode)
+	if err != nil {
+		br.Msg = "终端未配置"
+		return
+	}
+	dataItem, errCode, err := services.GetEdbDataFromWindUrl(terminal.ServerUrl, req.EdbCode, req.StartDate, endDate)
 	if errCode == 421 { //指标超限
 		br.Ret = 421
 		br.Msg = "指标超限！"

controllers/edb_info.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"eta/eta_index_lib/logic"
 	"eta/eta_index_lib/models"
-	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -96,19 +95,8 @@ func (this *EdbInfoController) Add() {
 		isAdd = true
 	}
 	var windUrl string
-	var terminalCode string
 	if isAdd {
-		terminalInfo, e := services.GetTerminal(req.Source, "")
-		if e == nil {
-			terminalCode = terminalInfo.TerminalCode
-			if req.Source == utils.DATA_SOURCE_WIND {
-				windUrl = terminalInfo.ServerUrl
-			}
-		} else {
-			utils.FileLog.Info(fmt.Sprintf("获取数据源终端信息失败, Err: %s", e))
-		}
-
-		if req.Source == utils.DATA_SOURCE_WIND && windUrl == "" {
+		if req.Source == utils.DATA_SOURCE_WIND {
 			windUrl, err = GetServerUrl()
 			if err != nil {
 				br.Msg = "判断失败！"
@@ -118,7 +106,7 @@ func (this *EdbInfoController) Add() {
 		}
 	}
 	admnId, _ := strconv.Atoi(utils.InitAdminId)
-	edbInfo, err := models.EdbInfoAdd(&req, windUrl, admnId, utils.InitAdminName, terminalCode)
+	edbInfo, err := models.EdbInfoAdd(&req, windUrl, admnId, utils.InitAdminName)
 	if err != nil {
 		br.Msg = "新增指标失败！"
 		br.ErrMsg = "新增指标失败,Err:" + err.Error()

models/edb_info.go

@@ -1054,16 +1054,17 @@ type EdbInfoDetailResp struct {
 }
 
 type AddEdbInfoParams struct {
-	Source     int    `description:"来源id"`
-	EdbCode    string `description:"指标编码"`
-	EdbName    string `description:"指标名称"`
-	Frequency  string `description:"频率"`
-	Unit       string `description:"单位"`
-	ClassifyId int    `description:"分类id"`
+	Source       int    `description:"来源id"`
+	EdbCode      string `description:"指标编码"`
+	EdbName      string `description:"指标名称"`
+	Frequency    string `description:"频率"`
+	Unit         string `description:"单位"`
+	ClassifyId   int    `description:"分类id"`
+	TerminalCode string `description:"终端编码"`
 }
 
 // EdbInfoAdd 添加指标到指标库
-func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserRealName string, terminalCode string) (edbInfo *EdbInfo, err error) {
+func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, err error) {
 	source := req.Source
 	//判断指标名称是否存在
 	var condition string
@@ -1155,14 +1156,6 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 			return
 		}
 	}
-	tbName := GetBaseIndexTableName(source)
-	if tbName != "" {
-		var tE error
-		terminalCode, sourceIndexName, tE = GetTerminalFromBaseIndex(req.EdbCode, tbName)
-		if tE != nil {
-			utils.FileLog.Info(fmt.Sprintf("获取数据源终端信息失败, Err: %s", tE))
-		}
-	}
 	//获取该层级下最大的排序数
 	maxSort, err := GetEdbAndClassifyMaxSort(req.ClassifyId, 0)
 	if err != nil {
@@ -1182,7 +1175,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 	edbInfo.CreateTime = time.Now()
 	edbInfo.ModifyTime = time.Now()
 	edbInfo.ServerUrl = serverUrl
-	edbInfo.TerminalCode = terminalCode
+	edbInfo.TerminalCode = req.TerminalCode
 	edbInfo.Sort = maxSort + 1
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + req.EdbCode + timestamp)
@@ -1247,32 +1240,3 @@ func GetEdbAndClassifyMaxSort(parentId int, classifyType uint8) (maxSort int, er
 	}
 	return
 }
-
-func GetTerminalFromBaseIndex(edbCode, tbName string) (terminalCode string, sourceIndexName string, err error) {
-	if tbName != "" {
-		var item BaseIndexTerminalCode
-		item, err = GetBaseIndexTerminalCode(edbCode, tbName)
-		if err != nil {
-			err = fmt.Errorf("查询数据源指标信息失败， Err： %s", err)
-			return
-		}
-		terminalCode = item.TerminalCode
-		sourceIndexName = item.IndexName
-	}
-	return
-}
-
-func GetBaseIndexTableName(source int) (tableName string) {
-	switch source {
-	case utils.DATA_SOURCE_YS:
-		tableName = "base_from_smm_index"
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
-		tableName = "base_from_mysteel_chemical_index"
-	case utils.DATA_SOURCE_SCI:
-		tableName = "base_from_sci_index"
-	case utils.DATA_SOURCE_BAIINFO:
-		tableName = "base_from_baiinfo_index"
-	default:
-	}
-	return
-}

services/base_from_jiayue.go

@@ -303,7 +303,7 @@ func SyncJiaYueNewIndex(item models.BridgeJiaYueIndexAndData, menus []models.Bri
 	addParams.Unit = item.Unit
 	addParams.ClassifyId = classify.ClassifyId
 	addParams.Source = sourceId
-	edbInfo, e := models.EdbInfoAdd(addParams, "", 0, "", "")
+	edbInfo, e := models.EdbInfoAdd(addParams, "", 0, "")
 	if e != nil {
 		err = fmt.Errorf("EdbInfoAdd err: %s", e.Error())
 		return

services/edb_terminal.go

@@ -8,7 +8,7 @@ import (
 
 // GetTerminal 获取终端信息
 func GetTerminal(source int, oldTerminalCode string) (edbTerminal *models.EdbTerminal, err error) {
-	if source == utils.DATA_SOURCE_WIND {
+	if source == utils.DATA_SOURCE_WIND && oldTerminalCode == "" {
 		tmpConfig := new(models.EdbConfig)
 		tmpConfig, err = models.GetConfigDetailByCode("wind_terminal_code")
 		if err != nil && err.Error() != utils.ErrNoRow() {

services/hongze_sync_trial.go

@@ -28,14 +28,15 @@ type SyncTrialEdbInfoResp struct {
 	Code int    `json:"code"`
 	Msg  string `json:"msg"`
 	Data struct {
-		EdbCode   string `json:"edb_code"`
-		Source    int    `json:"source"`
-		ServerUrl string `json:"server_url"`
+		EdbCode      string `json:"edb_code"`
+		Source       int    `json:"source"`
+		ServerUrl    string `json:"server_url"`
+		TerminalCode string `json:"terminal_code"`
 	} `json:"data"`
 }
 
 // GetHzWindUrl 获取wind的url
-func GetHzWindUrl(edbCode string, source int) (windUrl string, err error, errMsg string) {
+func GetHzWindUrl(edbCode string, source int) (windUrl string, terminalCode string, err error, errMsg string) {
 	requestSyncTrialUrl := syncTrialUrl + `common/edb_info/edb_code?edb_code=%s&source=%d`
 	requestSyncTrialUrl = fmt.Sprintf(requestSyncTrialUrl, edbCode, source)
 
@@ -73,6 +74,6 @@ func GetHzWindUrl(edbCode string, source int) (windUrl string, err error, errMsg
 		return
 	}
 	windUrl = item.Data.ServerUrl
-
+	terminalCode = item.Data.TerminalCode
 	return
 }