fix merge

controllers/data_manage/edb_info.go

@@ -4363,6 +4363,82 @@ func (this *EdbInfoController) EdbSourceList() {
 // @Success 200 {object} data_manage.EdbInfoListResp
 // @router /edb_source/list/python [get]
 func (this *EdbInfoController) EdbSourceListByPython() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	isBase, _ := this.GetInt("IsBase", 0)
+
+	cond := ``
+	if isBase > 0 {
+		cond = ` AND is_base = 1`
+	}
+	pars := make([]interface{}, 0)
+	list, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标来源列表失败, Err: " + e.Error()
+		return
+	}
+
+	baseEdbList := make([]data_manage.EdbSourceChild, 0)
+	calEdbList := make([]data_manage.EdbSourceChild, 0)
+	for _, v := range list {
+		switch v.IsBase {
+		case 1:
+			baseEdbList = append(baseEdbList, data_manage.EdbSourceChild{
+				EdbSourceId: v.EdbSourceId,
+				SourceName:  v.SourceName,
+				IsBase:      v.IsBase,
+				TableName:   v.TableName,
+				Child:       []data_manage.EdbSourceChild{},
+			})
+		case 2:
+			calEdbList = append(calEdbList, data_manage.EdbSourceChild{
+				EdbSourceId: v.EdbSourceId,
+				SourceName:  v.SourceName,
+				IsBase:      v.IsBase,
+				TableName:   v.TableName,
+				Child:       []data_manage.EdbSourceChild{},
+			})
+		}
+	}
+	resp := []data_manage.EdbSourceChild{
+		{
+			EdbSourceId: 0,
+			SourceName:  "基础指标",
+			IsBase:      1,
+			Child:       baseEdbList,
+		},
+		{
+			EdbSourceId: 0,
+			SourceName:  "计算指标",
+			IsBase:      1,
+			Child:       calEdbList,
+		},
+	}
+
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// EdbChartList
+// @Title 指标缩略图列表接口
+// @Description 指标缩略图列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   ClassifyId   query   int  true       "分类id"
+// @Param   AdminId   query   int  false       "创建人id"
+// @Param   IsOnlyMe   query   bool  false       "是否只看我的"
+// @Success 200 {object} response.EdbInfoChartListResp
+// @router /edb_info/chart/list [get]
+func (this *EdbInfoController) EdbChartList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -4482,82 +4558,6 @@ func (this *EdbInfoController) EdbSourceListByPython() {
 	br.Data = resp
 }
 
-// EdbChartList
-// @Title 指标缩略图列表接口
-// @Description 指标缩略图列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ClassifyId   query   int  true       "分类id"
-// @Param   AdminId   query   int  false       "创建人id"
-// @Param   IsOnlyMe   query   bool  false       "是否只看我的"
-// @Success 200 {object} response.EdbInfoChartListResp
-// @router /edb_info/chart/list [get]
-func (this *EdbInfoController) EdbChartList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	isBase, _ := this.GetInt("IsBase", 0)
-
-	cond := ``
-	if isBase > 0 {
-		cond = ` AND is_base = 1`
-	}
-	pars := make([]interface{}, 0)
-	list, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标来源列表失败, Err: " + e.Error()
-		return
-	}
-
-	baseEdbList := make([]data_manage.EdbSourceChild, 0)
-	calEdbList := make([]data_manage.EdbSourceChild, 0)
-	for _, v := range list {
-		switch v.IsBase {
-		case 1:
-			baseEdbList = append(baseEdbList, data_manage.EdbSourceChild{
-				EdbSourceId: v.EdbSourceId,
-				SourceName:  v.SourceName,
-				IsBase:      v.IsBase,
-				TableName:   v.TableName,
-				Child:       []data_manage.EdbSourceChild{},
-			})
-		case 2:
-			calEdbList = append(calEdbList, data_manage.EdbSourceChild{
-				EdbSourceId: v.EdbSourceId,
-				SourceName:  v.SourceName,
-				IsBase:      v.IsBase,
-				TableName:   v.TableName,
-				Child:       []data_manage.EdbSourceChild{},
-			})
-		}
-	}
-	resp := []data_manage.EdbSourceChild{
-		{
-			EdbSourceId: 0,
-			SourceName:  "基础指标",
-			IsBase:      1,
-			Child:       baseEdbList,
-		},
-		{
-			EdbSourceId: 0,
-			SourceName:  "计算指标",
-			IsBase:      1,
-			Child:       calEdbList,
-		},
-	}
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
 // Modify
 // @Title 修改指标信息接口
 // @Description 编辑指标接口