Merge branch 'hotfix/edb_data_code' of eta_server/eta_hub into custom

controllers/edb.go

@@ -165,20 +165,37 @@ func (this *EdbController) Detail() {
 	}()
 
 	unicode := this.GetString("UniqueCode")
-	if unicode == "" {
+	edbCode := this.GetString("EdbCode")
+	if unicode == "" && edbCode == "" {
 		br.Msg = "参数有误"
 		return
 	}
+
 	edbOb := new(data_manage.EdbInfo)
-	edb, e := edbOb.GetItemByUniCode(unicode)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "指标不存在"
+	edb := new(data_manage.EdbInfo)
+	var e error
+	if unicode != "" {
+		edb, e = edbOb.GetItemByUniCode(unicode)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "指标不存在"
+				return
+			}
+			br.Msg = "获取失败"
+			br.ErrMsg = "EdbDetail GetItemByUniCode err: " + e.Error()
+			return
+		}
+	} else if edbCode != "" {
+		edb, e = edbOb.GetItemByEdbCode(edbCode)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "指标不存在"
+				return
+			}
+			br.Msg = "获取失败"
+			br.ErrMsg = "EdbDetail GetItemByEdbCode err: " + e.Error()
 			return
 		}
-		br.Msg = "获取失败"
-		br.ErrMsg = "EdbDetail GetItemByCode err: " + e.Error()
-		return
 	}
 
 	// 获取指标数据
@@ -213,7 +230,8 @@ func (this *EdbController) EdbData() {
 	}()
 
 	unicode := this.GetString("UniqueCode")
-	if unicode == "" {
+	edbCode := this.GetString("EdbCode")
+	if unicode == "" && edbCode == "" {
 		br.Msg = "参数有误"
 		return
 	}
@@ -227,15 +245,30 @@ func (this *EdbController) EdbData() {
 	}
 
 	edbOb := new(data_manage.EdbInfo)
-	edb, e := edbOb.GetItemByUniCode(unicode)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "指标不存在"
+	edb := new(data_manage.EdbInfo)
+	var e error
+	if unicode != "" {
+		edb, e = edbOb.GetItemByUniCode(unicode)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "指标不存在"
+				return
+			}
+			br.Msg = "获取失败"
+			br.ErrMsg = "EdbDetail GetItemByUniCode err: " + e.Error()
+			return
+		}
+	} else if edbCode != "" {
+		edb, e = edbOb.GetItemByEdbCode(edbCode)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "指标不存在"
+				return
+			}
+			br.Msg = "获取失败"
+			br.ErrMsg = "EdbDetail GetItemByEdbCode err: " + e.Error()
 			return
 		}
-		br.Msg = "获取失败"
-		br.ErrMsg = "EdbDetail GetItemByCode err: " + e.Error()
-		return
 	}
 
 	// 获取指标数据