Merge branch 'bzq/eiaSteo' of eta_server/eta_data_pubish into master

models/base_from_eia_steo.go

@@ -1,29 +1,30 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromEiaSteoIndex EiaSteo指标
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk"`
-	BaseFromEiaSteoClassifyId int       `description:"指标分类id"`
-	IndexCode                 string    `description:"指标编码"`
-	IndexName                 string    `description:"指标名称（中文名称）"`
-	IndexNameOriginal         string    `description:"指标名称（原始名称）"`
-	Frequency                 string    `description:"频度"`
-	Level                     int       `description:"指标层级（原始层级）"`
-	Unit                      string    `description:"单位"`
-	Super                     string    `description:"我也不知道是个啥，反正先存起来，万一用到了呢"`
-	Precision                 int       `description:"精度，我也不知道会不会用到，反正先存起来，万一用到了呢"`
-	LastHistorical            string    `description:"最近的历史记录，我也不知道会不会用到，反正先存起来，万一用到了呢"`
-	Description               string    `description:"备注信息，我也不知道会不会用到，反正先存起来，万一用到了呢"`
-	IsMappable                int       `description:"是否可映射，我也不知道会不会用到，反正先存起来，万一用到了呢"`
-	StartDate                 time.Time `description:"开始日期"`
-	EndDate                   time.Time `description:"结束日期"`
-	ModifyTime                time.Time `description:"最新更新时间"`
-	CreateTime                time.Time `description:"创建时间"`
+	BaseFromEiaSteoIndexId    int    `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoClassifyId int    `description:"指标分类id"`
+	IndexCode                 string `description:"指标编码"`
+	IndexName                 string `description:"指标名称（中文名称）"`
+	IndexNameOriginal         string `description:"指标名称（原始名称）"`
+	Frequency                 string `description:"频度"`
+	Level                     int    `description:"指标层级（原始层级）"`
+	Unit                      string `description:"单位"`
+	Super                     string `description:"我也不知道是个啥，反正先存起来，万一用到了呢"`
+	Precision                 int    `description:"精度，我也不知道会不会用到，反正先存起来，万一用到了呢"`
+	LastHistorical            string `description:"最近的历史记录，我也不知道会不会用到，反正先存起来，万一用到了呢"`
+	Description               string `description:"备注信息，我也不知道会不会用到，反正先存起来，万一用到了呢"`
+	IsMappable                int    `description:"是否可映射，我也不知道会不会用到，反正先存起来，万一用到了呢"`
+	StartDate                 string `description:"开始日期"`
+	EndDate                   string `description:"结束日期"`
+	ModifyTime                string `description:"最新更新时间"`
+	CreateTime                string `description:"创建时间"`
 }
 
 type BaseFromEiaSteoData struct {
@@ -36,7 +37,25 @@ type BaseFromEiaSteoData struct {
 	CreateTime             time.Time `description:"创建时间"`
 }
 
-func GetEiaSteoIndex(startDate, endDate string) (list []*BaseFromTradeDalianIndex, err error) {
+// BaseFromEiaSteoClassify EiaSteo分类
+type BaseFromEiaSteoClassify struct {
+	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk"`
+	ClassifyName              string    `description:"分类名称（中文名称）"`
+	ClassifyNameOriginal      string    `description:"分类名称（原始名称）"`
+	ParentId                  int       `description:"父级id"`
+	Level                     int       `description:"层级"`
+	ModifyTime                time.Time `description:"最新更新时间"`
+	CreateTime                time.Time `description:"创建时间"`
+}
+
+func (obj *BaseFromEiaSteoClassify) GetBaseFromEiaSteoClassifyAll() (list []*BaseFromEiaSteoClassify, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_eia_steo_classify `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return list, err
+}
+
+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 `
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)

services/classify.go

@@ -14,6 +14,9 @@ func GetClassifyList(source int) (list interface{}, err error) {
 	case utils.DATA_SOURCE_ICPI:
 		icpiObj := new(models.BaseFromIcpiClassify)
 		list, err = icpiObj.GetBaseFromIcpiClassifyAll()
+	case utils.DATA_SOURCE_EIA_STEO:
+		eiaSteoObj := new(models.BaseFromEiaSteoClassify)
+		list, err = eiaSteoObj.GetBaseFromEiaSteoClassifyAll()
 	default:
 	}
 	return

services/index.go

@@ -3,6 +3,7 @@ package services
 import (
 	"eta/eta_data_push/models"
 	"eta/eta_data_push/utils"
+
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -22,6 +23,8 @@ func GetIndexList(source int, startDate, endDate string) (list interface{}, err
 		list, err = models.GetChangesVisitorsCovid(startDate, endDate)
 	case utils.DATA_SOURCE_EIA_STEO:
 		list, err = models.GetEiaSteoIndex(startDate, endDate)
+		// TODO: 月底客户再同步EIA-STEO数据
+		list = new([]models.BaseFromEiaSteoIndex)
 	case utils.DATA_SOURCE_GIE:
 		list, err = models.GetEicIndex(startDate, endDate)
 	case utils.DATA_SOURCE_COM_TRADE: