Merge branch 'hotfix/bug8100_eia_steo' of eta_server/eta_data_pubish into master

models/base_from_eia_steo.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // BaseFromEiaSteoIndex EiaSteo指标
@@ -58,14 +59,34 @@ func (obj *BaseFromEiaSteoClassify) GetBaseFromEiaSteoClassifyAll() (list []*Bas
 
 func GetEiaSteoIndex(startDate, endDate string) (list []*BaseFromEiaSteoIndex, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_index WHERE create_time>=? AND create_time<=?  ORDER BY create_time ASC `
+	sql := `SELECT * FROM base_from_eia_steo_index WHERE modify_time>=? AND modify_time<=?  ORDER BY modify_time ASC `
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 	return
 }
 
 func GetEiaSteoIndexData(indexCode, startDate, endDate string) (list []*BaseFromEiaSteoData, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_data WHERE index_code=? AND create_time>=? AND create_time<=? ORDER BY create_time ASC `
+	sql := `SELECT * FROM base_from_eia_steo_data WHERE index_code=? AND modify_time>=? AND modify_time<=? ORDER BY modify_time ASC `
 	_, err = o.Raw(sql, indexCode, startDate, endDate).QueryRows(&list)
 	return
 }
+
+type BaseFromEiaSteoDataResp struct {
+	List   []*BaseFromEiaSteoData
+	Paging *paging.PagingItem `description:"分页数据"`
+}
+
+// GetBaseFromEiaSteoDataList 获取EiaSteo数据列表
+func GetBaseFromEiaSteoDataList(startDate, endDate string, startSize, pageSize int) (total int, list []*BaseFromEiaSteoData, err error) {
+	o := orm.NewOrm()
+	totalSql := `SELECT count(1) total FROM base_from_eia_steo_data WHERE modify_time>=? AND modify_time<=? `
+	err = o.Raw(totalSql, startDate, endDate).QueryRow(&total)
+	if err != nil {
+		return
+	}
+
+	sql := `SELECT * FROM base_from_eia_steo_data WHERE modify_time>=? AND modify_time<=? ORDER BY base_from_eia_steo_data_id ASC LIMIT ?,?`
+	_, err = o.Raw(sql, startDate, endDate, startSize, pageSize).QueryRows(&list)
+
+	return
+}

services/index.go

@@ -81,6 +81,18 @@ func GetIndexDataList(source int, indexCode, startDate, endDate string) (list in
 // GetIndexDataPageList 分页获取数据同步
 func GetIndexDataPageList(source, currPage, pageSize int, startDate, endDate string) (list interface{}, err error) {
 	switch source {
+	case utils.DATA_SOURCE_EIA_STEO:
+		var total int
+		dataList := make([]*models.BaseFromEiaSteoData, 0)
+		total, dataList, err = models.GetBaseFromEiaSteoDataList(startDate, endDate, currPage*pageSize, pageSize)
+		if err != nil {
+			return
+		}
+		page := paging.GetPaging(currPage, pageSize, total)
+		list = models.BaseFromEiaSteoDataResp{
+			List:   dataList,
+			Paging: page,
+		}
 	case utils.DATA_SOURCE_COM_TRADE:
 		var total int
 		dataList := make([]*models.ComTradeData, 0)