初始化指标接口修改

controllers/edb_info.go

@@ -98,22 +98,23 @@ func (this *EdbInfoController) Add() {
 	var windUrl string
 	var terminalCode string
 	if isAdd {
-		if req.Source == utils.DATA_SOURCE_WIND {
-			// todo 改成从终端表中获取终端信息
-			/*windUrl, _, err = GetServerUrl()
+		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 == "" {
+			windUrl, err = GetServerUrl()
 			if err != nil {
 				br.Msg = "判断失败！"
 				br.ErrMsg = "判断失败,Err:" + err.Error()
 				return
-			}*/
-			terminalInfo, err := services.GetTerminal(utils.DATA_SOURCE_WIND, "")
-			if err != nil {
-				br.Msg = "获取可以使用的wind地址失败！"
-				br.ErrMsg = "获取可以使用的wind地址失败，err:" + err.Error()
-				return
 			}
-			windUrl = terminalInfo.ServerUrl
-			terminalCode = terminalInfo.TerminalCode
 		}
 	}
 	admnId, _ := strconv.Atoi(utils.InitAdminId)

models/edb_info.go

@@ -1155,9 +1155,10 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 			return
 		}
 	}
-	if terminalCode == "" {
+	tbName := GetBaseIndexTableName(source)
+	if tbName != "" {
 		var tE error
-		terminalCode, sourceIndexName, tE = GetTerminalFromBaseIndex(source, req.EdbCode)
+		terminalCode, sourceIndexName, tE = GetTerminalFromBaseIndex(req.EdbCode, tbName)
 		if tE != nil {
 			utils.FileLog.Info(fmt.Sprintf("获取数据源终端信息失败, Err: %s", tE))
 		}
@@ -1224,7 +1225,7 @@ type ResetEdbClassifyReq struct {
 
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&sort)
 	return
@@ -1247,8 +1248,7 @@ func GetEdbAndClassifyMaxSort(parentId int, classifyType uint8) (maxSort int, er
 	return
 }
 
-func GetTerminalFromBaseIndex(source int, edbCode string) (terminalCode string, sourceIndexName string, err error) {
-	tbName := GetBaseIndexTableName(source)
+func GetTerminalFromBaseIndex(edbCode, tbName string) (terminalCode string, sourceIndexName string, err error) {
 	if tbName != "" {
 		var item BaseIndexTerminalCode
 		item, err = GetBaseIndexTerminalCode(edbCode, tbName)

models/edb_terminal.go

@@ -64,7 +64,7 @@ type BaseIndexTerminalCode struct {
 
 // GetBaseIndexTerminalCode 获取数据源的终端code
 func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
 	err = o.Raw(sql, edbCode).QueryRow(&item)
 	return