Merge branch 'feature/api_v1_edb' into debug

controllers/edb.go

@@ -143,7 +143,7 @@ func (this *EdbController) List() {
 	}
 	resp := make([]*data_manage.EdbInfoItem, 0)
 	for _, v := range edbList {
-		resp = append(resp, data_manage.FormatEdbInfo2Item(v, make([]*data_manage.EdbDataItem, 0)))
+		resp = append(resp, data_manage.FormatEdbInfo2Item(v))
 	}
 
 	br.Data = resp
@@ -180,12 +180,60 @@ func (this *EdbController) Detail() {
 		return
 	}
 
+	// 获取指标数据
+	//dataOb := new(data_manage.EdbData)
+	//dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.EdbCode, []string{}, "")
+	//if e != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "EdbDetail GetItemsBySourceAndCode err: " + e.Error()
+	//	return
+	//}
+	//edbData := make([]*data_manage.EdbDataItem, 0)
+	//for _, v := range dataList {
+	//	edbData = append(edbData, data_manage.FormatEdbData2Item(v))
+	//}
+
+	resp := data_manage.FormatEdbInfo2Item(edb)
+	br.Data = resp
+	br.Ret = 200
+	br.Msg = "获取成功"
+}
+
+// EdbData
+// @Title 指标数据
+// @Description 指标数据
+// @Success 200 {object} data_manage.EdbInfoItem
+// @router /data [get]
+func (this *EdbController) EdbData() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	unicode := this.GetString("UniqueCode")
+	if unicode == "" {
+		br.Msg = "参数有误"
+		return
+	}
+	edbOb := new(data_manage.EdbInfo)
+	edb, e := edbOb.GetItemByUniCode(unicode)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "指标不存在"
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "EdbDetail GetItemByCode err: " + e.Error()
+		return
+	}
+
 	// 获取指标数据
 	dataOb := new(data_manage.EdbData)
 	dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.EdbCode, []string{}, "")
 	if e != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "EdbDetail GetItemsBySourceAndCode err: " + e.Error()
+		br.ErrMsg = "EdbData GetItemsBySourceAndCode err: " + e.Error()
 		return
 	}
 	edbData := make([]*data_manage.EdbDataItem, 0)
@@ -193,8 +241,7 @@ func (this *EdbController) Detail() {
 		edbData = append(edbData, data_manage.FormatEdbData2Item(v))
 	}
 
-	resp := data_manage.FormatEdbInfo2Item(edb, edbData)
-	br.Data = resp
+	br.Data = edbData
 	br.Ret = 200
 	br.Msg = "获取成功"
 }

controllers/supply_analysis.go

@@ -113,19 +113,19 @@ func (this *SupplyAnalysisController) StockPlantEdbDetail() {
 	}
 
 	// 获取指标数据
-	dataOb := new(data_manage.EdbData)
-	dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.EdbCode, []string{}, "")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "StockPlantEdbDetail GetItemsBySourceAndCode err: " + e.Error()
-		return
-	}
-	edbData := make([]*data_manage.EdbDataItem, 0)
-	for _, v := range dataList {
-		edbData = append(edbData, data_manage.FormatEdbData2Item(v))
-	}
+	//dataOb := new(data_manage.EdbData)
+	//dataList, e := dataOb.GetItemsBySourceAndCode(edb.Source, edb.EdbCode, []string{}, "")
+	//if e != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "StockPlantEdbDetail GetItemsBySourceAndCode err: " + e.Error()
+	//	return
+	//}
+	//edbData := make([]*data_manage.EdbDataItem, 0)
+	//for _, v := range dataList {
+	//	edbData = append(edbData, data_manage.FormatEdbData2Item(v))
+	//}
 
-	resp := data_manage.FormatEdbInfo2Item(edb, edbData)
+	resp := data_manage.FormatEdbInfo2Item(edb)
 	br.Data = resp
 	br.Ret = 200
 	br.Msg = "获取成功"

models/data_manage/edb_info.go

@@ -76,34 +76,34 @@ func (m *EdbInfo) GetItemByEdbCode(code string) (item *EdbInfo, err error) {
 
 // EdbInfoItem 指标信息
 type EdbInfoItem struct {
-	EdbInfoId    int            `description:"指标信息ID"`
-	UniqueCode   string         `description:"指标唯一编码"`
-	EdbCode      string         `description:"指标编码"`
-	EdbInfoType  int            `description:"指标类型: 0-普通指标; 1-预测指标"`
-	EdbType      int            `description:"指标类型: 1-基础指标; 2-计算指标"`
-	EdbName      string         `description:"指标名称"`
-	ClassifyId   int            `description:"分类ID"`
-	Source       int            `description:"来源ID"`
-	SourceName   string         `description:"来源名称"`
-	Frequency    string         `description:"频率"`
-	Unit         string         `description:"单位"`
-	StartDate    string         `description:"起始日期"`
-	EndDate      string         `description:"终止日期"`
-	MinValue     float64        `description:"指标最小值"`
-	MaxValue     float64        `description:"指标最大值"`
-	LatestDate   string         `description:"数据最新日期"`
-	LatestValue  float64        `description:"数据最新值"`
-	ChartImage   string         `description:"图表图片"`
-	Calendar     string         `description:"公历/农历"`
-	DataDateType string         `description:"数据日期类型: 交易日/自然日"`
-	Sort         int            `description:"排序"`
-	NoUpdate     int            `description:"是否停更: 0-继续更新; 1-停止更新"`
-	CreateTime   string         `description:"创建时间"`
-	ModifyTime   string         `description:"更新时间"`
-	EdbData      []*EdbDataItem `description:"指标数据"`
+	EdbInfoId    int     `description:"指标信息ID"`
+	UniqueCode   string  `description:"指标唯一编码"`
+	EdbCode      string  `description:"指标编码"`
+	EdbInfoType  int     `description:"指标类型: 0-普通指标; 1-预测指标"`
+	EdbType      int     `description:"指标类型: 1-基础指标; 2-计算指标"`
+	EdbName      string  `description:"指标名称"`
+	ClassifyId   int     `description:"分类ID"`
+	Source       int     `description:"来源ID"`
+	SourceName   string  `description:"来源名称"`
+	Frequency    string  `description:"频率"`
+	Unit         string  `description:"单位"`
+	StartDate    string  `description:"起始日期"`
+	EndDate      string  `description:"终止日期"`
+	MinValue     float64 `description:"指标最小值"`
+	MaxValue     float64 `description:"指标最大值"`
+	LatestDate   string  `description:"数据最新日期"`
+	LatestValue  float64 `description:"数据最新值"`
+	ChartImage   string  `description:"图表图片"`
+	Calendar     string  `description:"公历/农历"`
+	DataDateType string  `description:"数据日期类型: 交易日/自然日"`
+	Sort         int     `description:"排序"`
+	NoUpdate     int     `description:"是否停更: 0-继续更新; 1-停止更新"`
+	CreateTime   string  `description:"创建时间"`
+	ModifyTime   string  `description:"更新时间"`
+	//EdbData      []*EdbDataItem `description:"指标数据"`
 }
 
-func FormatEdbInfo2Item(origin *EdbInfo, edbData []*EdbDataItem) (item *EdbInfoItem) {
+func FormatEdbInfo2Item(origin *EdbInfo) (item *EdbInfoItem) {
 	if origin == nil {
 		return
 	}
@@ -132,6 +132,6 @@ func FormatEdbInfo2Item(origin *EdbInfo, edbData []*EdbDataItem) (item *EdbInfoI
 	item.DataDateType = origin.DataDateType
 	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
 	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
-	item.EdbData = edbData
+	//item.EdbData = edbData
 	return
 }

routers/commentsRouter.go

@@ -52,6 +52,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:EdbController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:EdbController"],
+        beego.ControllerComments{
+            Method: "EdbData",
+            Router: `/data`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_hub/controllers:EdbController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:EdbController"],
         beego.ControllerComments{
             Method: "Detail",