fix:同步eiaSteo分类和关闭指标同步

models/base_from_eia_steo.go

@@ -1,8 +1,9 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromEiaSteoIndex EiaSteo指标
@@ -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,7 @@ 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)
+		list = new(models.BaseFromEiaSteoIndex)
 	case utils.DATA_SOURCE_GIE:
 		list, err = models.GetEicIndex(startDate, endDate)
 	case utils.DATA_SOURCE_COM_TRADE: