```注释掉InitRefreshEdb函数调用

- 移除了对InitRefreshEdb函数的调用
- 添加了注释，表明此处不再需要初始化操作- 保留了其他功能的实现
```

models/data_manage/base_from_changes_visitors_covid.go

@@ -1,78 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-// 谷歌出行指数
-type BaseFromChangesVisitorsCovid struct {
-	Id                  uint64    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`    //序号
-	Entity              string    `orm:"column(entity)"`        //国家
-	Code                string    `orm:"column(code)"`          //国家编码
-	EdbCode             string    `orm:"column(edb_code)"`      //指标ID
-	Day                 time.Time `orm:"column(day)"`           //统计的日期
-	RetailAndRecreation string    `orm:"column(retail_and_recreation)"`
-	GroceryAndPharmacy  string    `orm:"column(grocery_and_pharmacy)"`
-	Residential         string    `orm:"column(residential)"`
-	TransitStations     string    `orm:"column(transit_stations)"`
-	Parks               string    `orm:"column(parks)"`
-	Workplaces          string    `orm:"column(workplaces)"`
-	Total               string    `orm:"column(total)"`
-	CreateTime          time.Time `orm:"auto_now_add;column(create_time)"` //创建时间
-	ModifyTime          time.Time `orm:"auto_now_add;column(modify_time)"` //修改时间
-}
-
-// AddBaseFromChangesVisitorsCovidMulti 批量添加谷歌出行记录
-func AddBaseFromChangesVisitorsCovid(item *BaseFromChangesVisitorsCovid) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
-// GetLatestBaseFromChangesVisitorsCovid 查询最新的日期
-func GetLatestBaseFromChangesVisitorsCovid() (item *BaseFromChangesVisitorsCovid, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_changes_visitors_covid order by day desc, id desc limit 1`
-	//err = o.Raw(sql).QueryRow(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql).First(&item).Error
-	return
-}
-
-// GetBaseFromChangesVisitorsCovidByEntityDay 查询国家和统计日期查询记录是否存在
-func GetBaseFromChangesVisitorsCovidByEntityDay(entity, day string) (item *BaseFromChangesVisitorsCovid, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_changes_visitors_covid where entity=? and day=? limit 1`
-	//err = o.Raw(sql, entity, day).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, entity, day).First(&item).Error
-	return
-}
-
-type ChangesVisitorsCovidIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromChangesVisitorsCovid `gorm:"-"`
-}
-
-// 获取当天数据信息列表
-func GetChangesVisitorsCovidAll(dateTime string) (items []*BaseFromChangesVisitorsCovid, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_changes_visitors_covid WHERE day>=? `
-	//_, err = o.Raw(sql, dateTime).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateTime).Find(&items).Error
-	return
-}
-
-func GetChangesVisitorsCovidMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.day)as max_date FROM base_from_changes_visitors_covid as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-
-	return
-}

models/data_manage/base_from_eia_steo.go

@@ -1,245 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-
-	"time"
-)
-
-// BaseFromEiaSteoIndex EiaSteo指标
-type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int    `gorm:"column:base_from_eia_steo_index_id;primaryKey"` // `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:"创建时间"`
-}
-
-func AddBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromEiaSteoIndexId)
-	return
-}
-
-func InsertOrUpdateBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertOrUpdate(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromEiaSteoIndexId)
-	return
-}
-
-// Add 新增指标
-func (item *BaseFromEiaSteoIndex) Add() (err error) {
-	//o := orm.NewOrm()
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.BaseFromEiaSteoIndexId = int(lastId)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexAll(dateStr string) (list []*BaseFromEiaSteoIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_index WHERE create_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexCodeListByDate(dateStr string) (list []string, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT index_code FROM base_from_eia_steo_index WHERE modify_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-// Update 更新作者基础信息
-func (item *BaseFromEiaSteoIndex) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(item, cols...)
-
-	err = global.DEFAULT_DmSQL.Select(cols).Updates(item).Error
-	return
-}
-
-// BaseFromEiaSteoClassify EiaSteo分类
-type BaseFromEiaSteoClassify struct {
-	BaseFromEiaSteoClassifyId int       `gorm:"column:base_from_eia_steo_classify_id;primaryKey"` // `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 (item *BaseFromEiaSteoClassify) AddBaseFromEiaSteoClassify() (err error) {
-	//o := orm.NewOrm()
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.BaseFromEiaSteoClassifyId = int(lastId)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
-// BaseFromEiaSteoData EiaSteo数据表
-type BaseFromEiaSteoData struct {
-	BaseFromEiaSteoDataId  int       `gorm:"column:base_from_eia_steo_data_id;primaryKey"` // `orm:"column(base_from_eia_steo_data_id);pk"`
-	BaseFromEiaSteoIndexId int       `description:"指标id"`
-	IndexCode              string    `description:"指标编码"`
-	DataTime               time.Time `description:"数据日期"`
-	Value                  float64   `description:"数据值"`
-	ModifyTime             time.Time `description:"最新更新时间"`
-	CreateTime             time.Time `description:"创建时间"`
-}
-
-func (b *BaseFromEiaSteoData) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(b, cols...)
-	err = global.DEFAULT_DmSQL.Select(cols).Updates(b).Error
-	return
-}
-
-func AddBaseFromEiaSteoData(item *BaseFromEiaSteoData) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromEiaSteoDataId)
-	return
-}
-
-// GetBaseFromEiaSteoClassifyAll 获取所有的分类
-func GetBaseFromEiaSteoClassifyAll() (list []*BaseFromEiaSteoClassify, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_classify`
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-func AddBaseEiaSteoClassify(item *BaseFromEiaSteoClassify) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromEiaSteoClassifyId)
-	return
-}
-
-func (item *BaseFromEiaSteoClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(item, cols...)
-	err = global.DEFAULT_DmSQL.Select(cols).Updates(item).Error
-	return
-}
-
-func BatchDeleteBaseFromEiaSteoClassify(id []int) (err error) {
-	if len(id) == 0 {
-		return
-	}
-	//o := orm.NewOrm()
-	sql := `DELETE FROM base_from_eia_steo_classify WHERE base_from_eia_steo_classify_id IN (` + utils.GetOrmInReplace(len(id)) + `)`
-	//_, err = o.Raw(sql, id).Exec()
-	err = global.DEFAULT_DmSQL.Raw(sql, id).Error
-	return
-}
-
-type EiaSteoIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromEiaSteoIndex `gorm:"-"`
-}
-
-type EiaSteoIndexDataResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromEiaSteoData `gorm:"-"`
-}
-
-type EiaSteoClassifyDataResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromEiaSteoClassify `gorm:"-"`
-}
-
-func GetBaseFromEiaSteoIndexDataAll(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_data WHERE create_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexDataByIndexCode(indexCode, dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_data WHERE index_code=? AND modify_time>=?`
-	//_, err = o.Raw(sql, indexCode, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode, dateStr).Find(&list).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexDataByDate(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_eia_steo_data WHERE modify_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_eia_steo_data as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}
-
-func GetBaseFromEiaSteoIndexMaxCreateDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM base_from_eia_steo_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/base_from_gie.go

@@ -1,74 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey"` //`orm:"column(base_from_eic_index_id);pk"`
-	Type                   string
-	EicCode                string
-	Name                   string
-	Status                 string
-	GasDayStart            string
-	GasInStorage           string
-	GasInStorageCode       string
-	Consumption            string
-	ConsumptionCode        string
-	ConsumptionFull        string
-	ConsumptionFullCode    string
-	Full                   string
-	FullCode               string
-	Trend                  string
-	TrendCode              string
-	Injection              string
-	InjectionCode          string
-	Withdrawal             string
-	WithdrawalCode         string
-	WorkingGasVolume       string
-	WorkingGasVolumeCode   string
-	InjectionCapacity      string
-	InjectionCapacityCode  string
-	WithdrawalCapacity     string
-	WithdrawalCapacityCode string
-	Info                   string
-	Parent                 string
-	CreateTime             time.Time
-	ModifyTime             time.Time
-}
-
-func GetBaseFromEicIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.gas_day_start)as max_date FROM base_from_trade_eic_index_v2 as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}
-
-func GetBaseFromEicIndexAll(dateStr string) (list []*BaseFromTradeEicIndexV2, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start >=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func AddBaseFromEicIndexV2(item *BaseFromTradeEicIndexV2) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromEicIndexId)
-	return
-}
-
-type EicIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeEicIndexV2 `gorm:"-"`
-}

models/data_manage/base_from_icpi.go

@@ -1,171 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `gorm:"column:base_from_icpi_index_id;primaryKey"` //`orm:"column(base_from_icpi_index_id);pk"`
-	BaseFromIcpiClassifyId int       `description:"分类id"`
-	IndexCode              string    `description:"指标编码"`
-	IndexName              string    `description:"指标名称"`
-	Frequency              string    `description:"频度"`
-	StartDate              time.Time `description:"开始日期"`
-	EndDate                time.Time `description:"结束日期"`
-	CreateTime             time.Time `description:"创建时间"`
-	ModifyTime             time.Time `description:"修改时间"`
-}
-
-func GetBaseFromIcpiIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_icpi_data as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}
-
-type IcpiIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromIcpiIndex `gorm:"-"`
-}
-
-func GetBaseFromIcpiIndexAll(dateStr string) (list []*BaseFromIcpiIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_icpi_index WHERE end_date>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func (obj *BaseFromIcpiIndex) AddBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromIcpiIndexId)
-	return
-}
-
-func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertOrUpdate(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromIcpiIndexId)
-	return
-}
-
-type BaseFromIcpiClassify struct {
-	BaseFromIcpiClassifyId int    `gorm:"column:base_from_icpi_classify_id;primaryKey"` //`orm:"column(base_from_icpi_classify_id);pk"`
-	ClassifyName           string `description:"分类名称"`
-	ClassifyNameEn         string `description:"英文名称"`
-	ParentId               int    `description:"上级id"`
-	CreateTime             string `description:"创建时间"`
-	ModifyTime             string `description:"修改时间"`
-}
-
-type IcpiClassifyResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromIcpiClassify `gorm:"-"`
-}
-
-func GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_icpi_classify `
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-func AddBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromIcpiClassifyId)
-	return
-}
-
-func InsertOrUpdateBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertOrUpdate(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromIcpiClassifyId)
-	return
-}
-
-// GetBaseFromComTradeMaxDate 获取ICPI消费者指数最大数据
-func GetBaseFromIcpiMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM base_from_icpi_data as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}
-
-type BaseFromIcpiData struct {
-	BaseFromIcpiDataId  int       `gorm:"column:base_from_icpi_data_id;primaryKey"` //`orm:"column(base_from_icpi_data_id);pk"`
-	BaseFromIcpiIndexId int       `description:"指标id"`
-	IndexCode           string    `description:"指标编码"`
-	DataTime            string    `description:"日期"`
-	Value               string    `description:"值"`
-	CreateTime          time.Time `description:"创建时间"`
-	ModifyTime          time.Time `description:"修改时间"`
-}
-
-// GetAllComTradeDataList 获取ICPI消费者指数数据
-func GetAllBaseFromIcpiDataList(startDate string) (list []*BaseFromIcpiData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_icpi_data WHERE create_time>=?  ORDER BY base_from_icpi_data_id ASC `
-	//_, err = o.Raw(sql, startDate).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
-	return
-}
-
-type BaseFromIcpiDataResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    BaseFromIcpiDataIndexAndDataResp
-}
-
-// ComTradeIndexDataResp 分页列表响应体
-type BaseFromIcpiDataIndexAndDataResp struct {
-	List   []*BaseFromIcpiData `gorm:"-"`
-	Paging *paging.PagingItem  `description:"分页数据"`
-}
-
-// MultiAddBaseFromComTradeData 批量添加数据
-func MultiAddBaseFromIcpiDataIndex(items []*BaseFromIcpiData) (lastId int64, err error) {
-	//num := len(items)
-	//if num <= 0 {
-	//	return
-	//}
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertMulti(num, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}

models/data_manage/base_from_mysteel_chemical_index.go

@@ -1,94 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-)
-
-type BaseFromMysteelChemicalIndexItem struct {
-	BaseFromMysteelChemicalIndexId    int32   `json:"base_from_mysteel_chemical_index_id"`
-	BaseFromMysteelChemicalClassifyId int32   `json:"base_from_mysteel_chemical_classify_id"` // 钢联化工指标分类id
-	IndexCode                         string  `json:"index_code"`                             // 指标编码
-	IndexName                         string  `json:"index_name"`                             // 指标名称
-	Unit                              string  `json:"unit"`                                   // 单位
-	Source                            string  `json:"source"`                                 // 数据来源
-	Frequency                         string  `json:"frequency"`                              // 频度
-	StartDate                         string  `json:"start_date"`                             // 开始日期
-	EndDate                           string  `json:"end_date"`                               // 结束日期
-	Describe                          string  `json:"describe"`                               // 指标描述
-	UpdateWeek                        string  `json:"update_week"`                            // 更新周期
-	UpdateTime                        string  `json:"update_time"`                            // 更新时间，多个时间点用英文,隔开
-	UpdateTime2                       string  `json:"update_time2"`                           // 更新时间2
-	SysUserId                         int32   `json:"sys_user_id"`                            // 创建人id
-	SysUserRealName                   string  `json:"sys_user_real_name"`                     // 创建人姓名
-	CreateTime                        string  `json:"create_time"`                            // 创建时间
-	ModifyTime                        string  `json:"modify_time"`                            // 修改时间
-	FilePath                          string  `json:"file_path"`                              // 文件存储路径
-	Sort                              int32   `json:"sort"`                                   // 排序
-	MergeFilePath                     string  `json:"merge_file_path"`
-	FileIndex                         int32   `json:"file_index"`
-	MergeUpdateWeek                   string  `json:"merge_update_week"`    // 合并文件的更新周
-	MergeFilePathWeek                 string  `json:"merge_file_path_week"` // 更新文件
-	UpdateDate                        string  `json:"update_date"`          // 更新日期
-	IsRefresh                         int32   `json:"is_refresh"`           // 0:不需要及时刷新,1:需要及时刷新
-	IsStop                            int32   `json:"is_stop"`              // 是否停更:1:停更,0:未停更
-	TerminalCode                      string  `json:"terminal_code"`        // 所属终端编码
-	EndValue                          float64 `json:"end_value"`            // 指标的最新值
-	EdbInfoId                         int     `json:"edb_info_id"`
-}
-
-// GetBaseFromMysteelChemicalIndexItemByCode
-// @Description: 根据指标编码获取钢联指标详情
-// @author: Roc
-// @datetime 2024-03-11 16:42:56
-// @param edbCode string
-// @return item *BaseFromMysteelChemicalIndexItem
-// @return err error
-func GetBaseFromMysteelChemicalIndexItemByCode(edbCode string) (item *BaseFromMysteelChemicalIndexItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE index_code = ?`
-	//err = o.Raw(sql, edbCode).QueryRow(&item)
-	err = global.DmSQL["data"].Raw(sql, edbCode).First(&item).Error
-	return
-}
-
-func GetBaseFromMysteelChemicalIndexItems(frequencyList []string) (items []*BaseFromMysteelChemicalIndexItem, err error) {
-	num := len(frequencyList)
-	if num == 0 {
-		return
-	}
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT b.*, e.edb_info_id FROM base_from_mysteel_chemical_index AS b
-	LEFT JOIN edb_info AS e
-	ON b.index_code = e.edb_code
-	WHERE b.source='api' AND b.frequency IN (` + utils.GetOrmInReplace(len(frequencyList)) + `)`
-	//_, err = o.Raw(sql, frequencyList).QueryRows(&items)
-	err = global.DmSQL["data"].Raw(sql, frequencyList).Find(&items).Error
-	return
-}
-
-// GetRefreshBaseFromMysteelChemicalIndexItemByCreateTime 获取正常刷新的钢联化工指标
-func GetRefreshBaseFromMysteelChemicalIndexItemByCreateTime(endDate string, startPage, pageSize int) (items []*BaseFromMysteelChemicalIndexItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE is_stop = 0 and create_time < ? Limit ?,?`
-	//_, err = o.Raw(sql, endDate, startPage, pageSize).QueryRows(&items)
-	err = global.DmSQL["data"].Raw(sql, endDate, startPage, pageSize).Find(&items).Error
-	return
-}
-
-// GetCountRefreshBaseFromMysteelChemicalIndexItemByCreateTime 获取正常刷新的钢联化工指标
-func GetCountRefreshBaseFromMysteelChemicalIndexItemByCreateTime(endDate string) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT count(*) FROM base_from_mysteel_chemical_index WHERE is_stop = 0 and create_time < ?`
-	//err = o.Raw(sql, endDate).QueryRow(&total)
-	err = global.DmSQL["data"].Raw(sql, endDate).Scan(&total).Error
-	return
-}
-
-func SetStopRefreshMysteelChemicalIndex(ids []int32) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 1 WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(len(ids)) + `) and is_stop=0`
-	//_, err = o.Raw(sql, ids).Exec()
-	err = global.DmSQL["data"].Exec(sql, ids).Error
-	return
-}

models/data_manage/base_from_smm.go

@@ -1,199 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromSmm struct {
-	BaseFromSmmId int `gorm:"column:base_from_smm_id;primaryKey"` //`orm:"column(base_from_smm_id);pk"`
-	Aid           int
-	Name          string
-	Interface     string
-	ApiUpdate     int
-	ApiUpdateType string
-	ApiType       int
-	ApiTypeAll    string
-	Type1         string `orm:"column(type_1)"`
-	Type2         string `orm:"column(type_2)"`
-	Type3         string `orm:"column(type_3)"`
-	ApiStartTime  string
-	ApiUpdateTime string
-	StartTime     string
-	FinishTime    string
-	AuthModule    string
-	AuthLang      string
-	ApiLabel      string
-	Enable        string
-	EditPerson    string
-	EditTime      string
-	AuthDur       int
-	AuthDurType   string
-	StartDate     string
-	EndDate       string
-}
-
-func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromSmmId)
-	return
-}
-
-func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM base_from_smm WHERE interface='cu_annual_copper_cathode_demand_supply_balance_in_china' `
-	sql := `SELECT * FROM base_from_smm WHERE end_date IS NOT NULL `
-	//_, err = o.Raw(sql).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int `gorm:"column:base_from_smm_index_id;primaryKey"` //`orm:"column(base_from_smm_index_id);pk"`
-	Interface          string
-	Name               string
-	IndexCode          string
-	IndexName          string
-	Type1              string `orm:"column(type_1)"`
-	Type2              string `orm:"column(type_2)"`
-	Type3              string `orm:"column(type_3)"`
-	Frequency          string
-	Unit               string
-	ApiStartTime       string
-	ApiUpdateTime      string
-	StartTime          string
-	FinishTime         string
-	CreateTime         time.Time
-	ModifyTime         time.Time
-}
-
-func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromSmmIndexId)
-	return
-}
-
-func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_smm_index `
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-type BaseFromSmmData struct {
-	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"` //`orm:"column(smm_data_id);pk"`
-	BaseFromSmmIndexId int
-	IndexCode          string
-	DataTime           string
-	Value              string
-	CreateTime         time.Time
-	ModifyTime         time.Time
-	DataTimestamp      int64
-}
-
-func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.SmmDataId)
-	return
-}
-
-func GetBaseFromSmmDataAll(indexCode string) (list []*BaseFromSmmData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_smm_data WHERE index_code=?`
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
-	//_, err = o.Raw(sql, value, smmDataId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, value, smmDataId).Error
-	return
-}
-
-func GetBaseFromSmmIndexByCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
-	//_, err = o.Raw(sql, smmCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, smmCode).Find(&list).Error
-	return
-}
-
-func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(min_date, &max_date).Error
-	return
-}
-
-func ModifyBaseFromSmmSmmType(baseFromSmmId int, smmType string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE base_from_smm SET smm_type=? WHERE base_from_smm_id=? `
-	//_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, smmType, baseFromSmmId).Error
-	return
-}
-
-func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, minDate, maxDate string) (err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	//o := orm.NewOrm()
-	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_index_id=? `
-	//_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
-	err = to.Exec(sql, minDate, maxDate, baseFromSmmIndexId).Error
-	if err != nil {
-		return
-	}
-
-	sql = ` UPDATE base_from_smm SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_id=? `
-	//_, err = o.Raw(sql, minDate, maxDate, baseFromSmmId).Exec()
-	err = to.Exec(sql, minDate, maxDate, baseFromSmmId).Error
-	return
-}
-
-type BaseFromSmmDataSimple struct {
-	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"` //`orm:"column(smm_data_id);pk"`
-	BaseFromSmmIndexId int
-	IndexCode          string
-	DataTime           string
-	Value              float64
-}
-
-func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmDataSimple, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
-	return
-}

models/data_manage/base_from_smm_index.go

@@ -1,52 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-)
-
-type BaseFromSmmIndexItem struct {
-	BaseFromSmmIndexId int32   `json:"base_from_smm_index_id"`
-	ClassifyId         int32   `json:"classify_id"` // Smm原始数据指标分类id
-	Interface          string  `json:"interface"`
-	Name               string  `json:"name"`
-	IndexCode          string  `json:"index_code"`      // 指标编码
-	IndexName          string  `json:"index_name"`      // 指标名称
-	Type1              string  `json:"type_1"`          // 类型1
-	Type2              string  `json:"type_2"`          // 类型2
-	Type3              string  `json:"type_3"`          // 类型3
-	Frequency          string  `json:"frequency"`       // 频度
-	Unit               string  `json:"unit"`            // 单位
-	ApiStartTime       string  `json:"api_start_time"`  // 接口开始日期
-	ApiUpdateTime      string  `json:"api_update_time"` // 接口更新日期
-	StartTime          string  `json:"start_time"`      // 开始日期
-	FinishTime         string  `json:"finish_time"`     // 完成日期
-	CreateTime         string  `json:"create_time"`
-	ModifyTime         string  `json:"modify_time"`
-	StartDate          string  `json:"start_date"`
-	EndDate            string  `json:"end_date"`
-	IsGet              int32   `json:"is_get"`           // 0:未获取数据,1:已获取数据
-	Sort               int32   `json:"sort"`             // 排序
-	BaseFileName       string  `json:"base_file_name"`   // 文件目录
-	RenameFileName     string  `json:"rename_file_name"` // 重命名文件目录
-	TerminalCode       string  `json:"terminal_code"`    // 所属终端编码
-	DataState          string  `json:"data_state"`       // 指标数据状态 normal/空白-正常更新 ceased-已停更irregular-更新依赖外部会有不定期延迟
-	ReleaseTime        string  `json:"release_time"`     // 预计发布时间
-	IsStop             int32   `json:"is_stop"`          // 是否停更:1:停更,0:未停更
-	EndValue           float64 `json:"end_value"`        // 指标的最新值
-}
-
-// GetBaseFromSmmIndexItemItemByCode
-// @Description: 根据指标编码获取指标信息
-// @author: Roc
-// @datetime 2024-03-11 16:41:02
-// @param source int
-// @param edbCode string
-// @return item *BaseFromSmmIndexItem
-// @return err error
-func GetBaseFromSmmIndexItemItemByCode(edbCode string) (item *BaseFromSmmIndexItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&item)
-	err = global.DmSQL["data"].Raw(sql, edbCode).First(&item).Error
-	return
-}

models/data_manage/base_from_ths_hf_index.go

@@ -1,211 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// BaseFromThsHfIndex 同花顺高频数据
-type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey"` // `orm:"column(base_from_ths_hf_index_id);pk"`
-	BaseFromThsHfClassifyId int       `description:"分类ID"`
-	IndexCode               string    `description:"指标编码"`
-	IndexName               string    `description:"指标名称"`
-	Unit                    string    `description:"单位"`
-	Source                  string    `description:"数据来源"`
-	Frequency               string    `description:"频度"`
-	StartDate               time.Time `description:"开始日期（至时分秒）"`
-	EndDate                 time.Time `description:"结束日期（至时分秒）"`
-	Describe                string    `description:"指标描述"`
-	Sort                    int       `description:"排序"`
-	IsStop                  int       `description:"是否停更：0-否；1-停更"`
-	TerminalCode            string    `description:"所属终端编码"`
-	StockCode               string    `description:"证券代码"`
-	Indicator               string    `description:"同花顺指标代码"`
-	ApiPars                 string    `description:"API请求参数"`
-	LatestValue             float64   `description:"最新值"`
-	SysUserId               int       `description:"创建人ID"`
-	SysUserRealName         string    `description:"创建人姓名"`
-	CreateTime              time.Time `description:"创建时间"`
-	ModifyTime              time.Time `description:"修改时间"`
-}
-
-func (m *BaseFromThsHfIndex) TableName() string {
-	return "base_from_ths_hf_index"
-}
-
-type BaseFromThsHfIndexCols struct {
-	PrimaryId               string
-	BaseFromThsHfClassifyId string
-	IndexCode               string
-	IndexName               string
-	Unit                    string
-	Source                  string
-	Frequency               string
-	StartDate               string
-	EndDate                 string
-	Describe                string
-	Sort                    string
-	IsStop                  string
-	TerminalCode            string
-	StockCode               string
-	Indicator               string
-	ApiPars                 string
-	LatestValue             string
-	SysUserId               string
-	SysUserRealName         string
-	CreateTime              string
-	ModifyTime              string
-}
-
-func (m *BaseFromThsHfIndex) Cols() BaseFromThsHfIndexCols {
-	return BaseFromThsHfIndexCols{
-		PrimaryId:               "base_from_ths_hf_index_id",
-		BaseFromThsHfClassifyId: "base_from_ths_hf_classify_id",
-		IndexCode:               "index_code",
-		IndexName:               "index_name",
-		Unit:                    "unit",
-		Source:                  "source",
-		Frequency:               "frequency",
-		StartDate:               "start_date",
-		EndDate:                 "end_date",
-		Describe:                "describe",
-		Sort:                    "sort",
-		IsStop:                  "is_stop",
-		TerminalCode:            "terminal_code",
-		StockCode:               "stock_code",
-		Indicator:               "indicator",
-		ApiPars:                 "api_pars",
-		LatestValue:             "latest_value",
-		SysUserId:               "sys_user_id",
-		SysUserRealName:         "sys_user_real_name",
-		CreateTime:              "create_time",
-		ModifyTime:              "modify_time",
-	}
-}
-
-func (m *BaseFromThsHfIndex) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.BaseFromThsHfIndexId = int(id)
-	err = global.DEFAULT_DmSQL.Create(m).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) CreateMulti(items []*BaseFromThsHfIndex) (err error) {
-	//if len(items) == 0 {
-	//	return
-	//}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
-
-	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) Remove() (err error) {
-	//o := orm.NewOrm()
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//_, err = o.Raw(sql, m.BaseFromThsHfIndexId).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, m.BaseFromThsHfIndexId).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) MultiRemove(ids []int) (err error) {
-	if len(ids) == 0 {
-		return
-	}
-	//o := orm.NewOrm()
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	//_, err = o.Raw(sql, ids).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interface{}) (err error) {
-	if condition == "" {
-		return
-	}
-	//o := orm.NewOrm()
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) GetItemById(id int) (item *BaseFromThsHfIndex, err error) {
-	//o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//err = o.Raw(sql, id).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfIndex, err error) {
-	//o := orm.NewOrm()
-	order := ``
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	//o := orm.NewOrm()
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfIndex, err error) {
-	//o := orm.NewOrm()
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-
-	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
-	return
-}

models/data_manage/base_from_trade_cffex.go

@@ -1,80 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeCffexIndex struct {
-	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
-	Rank                      int
-	DealShortName             string
-	DealName                  string
-	DealCode                  string
-	DealValue                 int
-	DealChange                int
-	BuyShortName              string
-	BuyName                   string
-	BuyCode                   string
-	BuyValue                  int
-	BuyChange                 int
-	SoldShortName             string
-	SoldName                  string
-	SoldCode                  string
-	SoldValue                 int
-	SoldChange                int
-	Frequency                 string
-	ClassifyName              string
-	ClassifyType              string
-	CreateTime                time.Time
-	ModifyTime                time.Time
-	DataTime                  string
-}
-
-func AddBaseFromTradeCffexIndex(item *BaseFromTradeCffexIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeCffexIndexId)
-	return
-}
-
-func GetBaseFromTradeCffexIndexAll(dateStr string) (list []*BaseFromTradeCffexIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_cffex_index WHERE data_time=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func ModifyBaseFromTradeCffexIndex(columnList [5]string, dataList [5]interface{}, dataId int) (err error) {
-	//o := orm.NewOrm()
-	sql := "UPDATE base_from_trade_cffex_index SET " +
-		columnList[0] + "=?," + columnList[1] + "=?," + columnList[2] + "=?," + columnList[3] + "=?," + columnList[4] +
-		"=?,modify_time=NOW() WHERE base_from_trade_cffex_index_id=? "
-	//_, err = o.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Error
-	return
-}
-
-type CffexIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeCffexIndex `gorm:"-"`
-}
-
-func GetBaseFromTradeCffexIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_cffex_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/base_from_trade_dalian.go

@@ -1,102 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int    `gorm:"column:base_from_trade_dalian_index_id;primaryKey"` // `orm:"column(base_from_trade_dalian_index_id);pk"`
-	Rank                       string `description:"排名"`
-	DealShortName              string `description:"成交量公司简称"`
-	DealName                   string `description:"成交量指标名称"`
-	DealCode                   string `description:"成交量指标编码"`
-	DealValue                  string `description:"成交量"`
-	DealChange                 string `description:"成交变化量"`
-	BuyShortName               string `description:"成交量公司简称"`
-	BuyName                    string `description:"持买单量指标名称"`
-	BuyCode                    string `description:"持买单量指标编码"`
-	BuyValue                   string `description:"持买单量"`
-	BuyChange                  string `description:"持买单量变化量"`
-	SoldShortName              string `description:"成交量公司简称"`
-	SoldName                   string `description:"持买单量指标名称"`
-	SoldCode                   string `description:"持买单量指标编码"`
-	SoldValue                  string `description:"持买单量"`
-	SoldChange                 string `description:"持买单量变化量"`
-	Frequency                  string `description:"频度"`
-	ClassifyName               string `description:"分类名称"`
-	ClassifyType               string `description:"分类名称下的类型"`
-	CreateTime                 string `description:"插入时间"`
-	ModifyTime                 string `description:"修改时间"`
-	DataTime                   string `description:"数据日期"`
-}
-
-func AddBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeDalianIndexId)
-	return
-}
-
-type BaseFromTradeDalianData struct {
-	BaseFromTradeDalianDataId  int `gorm:"column:base_from_trade_dalian_data_id;primaryKey"` //`orm:"column(base_from_trade_dalian_data_id);pk"`
-	BaseFromTradeDalianIndexId int
-	IndexCode                  string
-	DataTime                   time.Time
-	Value                      string
-	AddCutValue                string
-	CreateTime                 time.Time
-	ModifyTime                 time.Time
-	DataTimestamp              string
-}
-
-// 刷新大连指标数据
-func RefreshEdbDataByDaLian(addSql string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(addSql).Exec()
-	//if err != nil {
-	//	return err
-	//}
-
-	//err = global.DEFAULT_DmSQL.Exec(addSql).Error
-	return
-}
-
-// 获取当天数据信息列表
-func GetBaseFromTradeDalianDataList(dateTime string) (items []*BaseFromTradeDalianIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_dalian_index WHERE data_time>=?`
-	//_, err = o.Raw(sql, dateTime).QueryRows(&items)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, dateTime).Find(&items).Error
-	return
-}
-
-func UpdateBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex, dataId int) (err error) {
-	//o := orm.NewOrm()
-	sql := "UPDATE base_from_trade_dalian_index SET `rank`=?,deal_short_name=?,deal_name=?,deal_code=?,deal_value=?,buy_short_name=?,deal_change=?,buy_name=?,buy_code=?,buy_value=?,buy_change=?,sold_short_name=?,sold_name=?,sold_code=?,sold_value=?,sold_change=?,frequency=?,classify_name=?,classify_type=?,modify_time=?,data_time=? WHERE base_from_trade_dalian_index_id=? "
-	//_, err = o.Raw(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Error
-	return
-}
-
-type DalianIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeDalianIndex `gorm:"-"`
-}
-
-func GetBaseFromTradeDalianIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_dalian_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/base_from_trade_guangzhou.go

@@ -1,177 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey"` //  `orm:"column(base_from_trade_guangzhou_index_id);pk"`
-	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
-	BaseFromTradeGuangzhouContractId int       `description:"合约id"`
-	IndexCode                        string    `description:"指标编码"`
-	IndexName                        string    `description:"指标名称"`
-	Frequency                        string    `description:"频率"`
-	Unit                             string    `description:"单位"`
-	StartDate                        string    `description:"开始日期"`
-	EndDate                          string    `description:"结束日期"`
-	CreateTime                       time.Time `description:"创建日期"`
-	ModifyTime                       time.Time `description:"修改日期"`
-	Value                            float64   `description:"数据值"`
-}
-
-func AddBaseFromTradeGuangzhouIndex(item *BaseFromTradeGuangzhouIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertOrUpdate(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeGuangzhouIndexId)
-	return
-}
-
-func GetBaseFromTradeGuangzhouIndexAll() (list []*BaseFromTradeGuangzhouIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_guangzhou_index `
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-type GuangzhouIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeGuangzhouIndex `gorm:"-"`
-}
-
-type BaseFromTradeGuangzhouClassify struct {
-	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
-	ClassifyName                     string    `description:"分类名称"`
-	ClassifyCode                     string    `description:"分类编码"`
-	ParentId                         int       `description:"分类父级id"`
-	ModifyTime                       time.Time `description:"修改时间"`
-	CreateTime                       time.Time `description:"创建时间"`
-}
-
-type GuangzhouClassifyResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeGuangzhouClassify `gorm:"-"`
-}
-
-func GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassify, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_guangzhou_classify `
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-func AddBaseFromTradeGuangzhouClassify(item *BaseFromTradeGuangzhouClassify) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeGuangzhouClassifyId)
-	return
-}
-
-type BaseFromTradeGuangzhouContract struct {
-	BaseFromTradeGuangzhouContractId int    `gorm:"column:base_from_trade_guangzhou_contract_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_contract_id);pk"`
-	BaseFromTradeGuangzhouClassifyId int    `description:"分类id"`
-	ClassifyCode                     string `description:"分类编码"`
-	Contract                         string `description:"合约编码"`
-	TradeDate                        string `description:"合约日期"`
-}
-
-// 新增合约
-func (obj *BaseFromTradeGuangzhouIndex) AddBaseFromTradeGuangzhouContract(item *BaseFromTradeGuangzhouContract) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(item)
-	err = global.DmSQL["data"].Create(item).Error
-	return
-}
-
-type GuangzhouContractResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeGuangzhouContract `gorm:"-"`
-}
-
-func GetBaseFromTradeGuangzhouContractAll() (list []*BaseFromTradeGuangzhouContract, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_guangzhou_contract `
-	//_, err = o.Raw(sql).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
-	return
-}
-
-// GetBaseFromComTradeMaxDate 获取广州期货交易所最大数据
-func GetBaseFromTradeGuangzhouMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM base_from_trade_guangzhou_data as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}
-
-type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_data_id);pk"`
-	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
-	IndexCode                     string    `description:"指标编码"`
-	DataTime                      string    `description:"数据日期"`
-	Value                         float64   `description:"数据值"`
-	QtySub                        float64   `description:"增减"`
-	CreateTime                    time.Time `description:"创建日期"`
-	ModifyTime                    time.Time `description:"修改日期"`
-}
-
-// GetAllComTradeDataList 获取广州期货交易所数据
-func GetAllBaseFromTradeGuangzhouDataList(startDate string) (list []*BaseFromTradeGuangzhouData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_guangzhou_data WHERE create_time>=?  ORDER BY base_from_trade_guangzhou_data_id ASC `
-	//_, err = o.Raw(sql, startDate).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
-	return
-}
-
-type BaseFromTradeGuangzhouDataResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    BaseFromTradeGuangzhouIndexAndDataResp
-}
-
-// ComTradeIndexDataResp 分页列表响应体
-type BaseFromTradeGuangzhouIndexAndDataResp struct {
-	List   []*BaseFromTradeGuangzhouData `gorm:"-"`
-	Paging *paging.PagingItem            `description:"分页数据"`
-}
-
-// MultiAddBaseFromComTradeData 批量添加数据
-func MultiAddBaseFromTradeGuangzhouData(items []*BaseFromTradeGuangzhouData) (lastId int64, err error) {
-	//num := len(items)
-	//if num <= 0 {
-	//	return
-	//}
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertMulti(num, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}

models/data_manage/base_from_trade_index.go

@@ -1,8 +0,0 @@
-package data_manage
-
-/*func GetFirstBaseFromTradeIndexByDate(exchange string) (item *BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrm()
-	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where rank < 50 order by data_time asc"
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}*/

models/data_manage/base_from_trade_ine.go

@@ -1,76 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeIneIndex struct {
-	BaseFromTradeIneIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` //`orm:"column(base_from_trade_ine_index_id);pk"`
-	Rank                    int
-	DealShortName           string
-	DealName                string
-	DealCode                string
-	DealValue               int
-	DealChange              int
-	BuyShortName            string
-	BuyName                 string
-	BuyCode                 string
-	BuyValue                int
-	BuyChange               int
-	SoldShortName           string
-	SoldName                string
-	SoldCode                string
-	SoldValue               int
-	SoldChange              int
-	Frequency               string
-	ClassifyName            string
-	ClassifyType            string
-	CreateTime              time.Time
-	ModifyTime              time.Time
-	DataTime                string
-}
-
-func AddBaseFromTradeIneIndex(item *BaseFromTradeIneIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeIneIndexId)
-	return
-}
-
-func GetBaseFromTradeIneIndexAll(dateStr string) (list []*BaseFromTradeIneIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_ine_index where data_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func ModifyBaseFromTradeIneIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	//o := orm.NewOrm()
-	sql := `UPDATE base_from_trade_ine_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_ine_index_id=? `
-	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
-	return
-}
-
-type IneIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeIneIndex `gorm:"-"`
-}
-
-func GetBaseFromTradeIneIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_ine_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/base_from_trade_shanghai.go

@@ -1,78 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
-	Rank                         int
-	DealShortName                string
-	DealName                     string
-	DealCode                     string
-	DealValue                    int
-	DealChange                   int
-	BuyShortName                 string
-	BuyName                      string
-	BuyCode                      string
-	BuyValue                     int
-	BuyChange                    int
-	SoldShortName                string
-	SoldName                     string
-	SoldCode                     string
-	SoldValue                    int
-	SoldChange                   int
-	Frequency                    string
-	ClassifyName                 string
-	ClassifyType                 string
-	CreateTime                   time.Time
-	ModifyTime                   time.Time
-	DataTime                     string
-}
-
-func AddBaseFromTradeShangHaiIndex(item *BaseFromTradeShanghaiIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeShangHaiIndexId)
-	return
-}
-
-func GetBaseFromTradeShangHaiIndexAll(dateStr string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE data_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func ModifyBaseFromTradeShangHaiIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	//o := orm.NewOrm()
-	sql := `UPDATE base_from_trade_shanghai_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_shanghai_index_id=? `
-	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
-	return
-}
-
-type ShanghaiIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeShanghaiIndex `gorm:"-"`
-}
-
-func GetBaseFromTradeShangHaiIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_shanghai_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/base_from_trade_zhengzhou.go

@@ -1,78 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"` //`orm:"column(base_from_trade_zhengzhou_index_id);pk"`
-	Rank                          int
-	DealShortName                 string
-	DealName                      string
-	DealCode                      string
-	DealValue                     int
-	DealChange                    int
-	BuyShortName                  string
-	BuyName                       string
-	BuyCode                       string
-	BuyValue                      int
-	BuyChange                     int
-	SoldShortName                 string
-	SoldName                      string
-	SoldCode                      string
-	SoldValue                     int
-	SoldChange                    int
-	Frequency                     string
-	ClassifyName                  string
-	ClassifyType                  string
-	CreateTime                    time.Time
-	ModifyTime                    time.Time
-	DataTime                      string
-}
-
-func AddBaseFromTradeZhengzhouIndex(item *BaseFromTradeZhengzhouIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.BaseFromTradeZhengzhouIndexId)
-	return
-}
-
-func GetBaseFromTradeZhengzhouIndexAll(dateStr string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE data_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-func ModifyBaseFromTradeZhengzhouIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	//o := orm.NewOrm()
-	sql := `UPDATE base_from_trade_zhengzhou_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_zhengzhou_index_id=? `
-
-	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
-	return
-}
-
-type ZhengzhouIndexResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*BaseFromTradeZhengzhouIndex `gorm:"-"`
-}
-
-func GetBaseFromTradeZhengzhouIndexMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_zhengzhou_index as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/com_trade_data.go

@@ -1,74 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"time"
-)
-
-// ComTradeData 联合国商品贸易数据表
-type ComTradeData struct {
-	ComTradeDataId     int       `gorm:"column:com_trade_data_id;primaryKey"` // `orm:"column(com_trade_data_id);pk"`
-	ComTradeId         int       `description:"指标id"`
-	IndexCode          string    `description:"联合国商品贸易编码"`
-	Flow               string    `description:"贸易流向：X（Export：出口）；M（Import：进口）"`
-	ReporterCode       int       `description:"出口国id"`
-	ReporterName       string    `description:"出口国名称"`
-	PartnerCode        int       `description:"进口国id"`
-	PartnerName        string    `description:"进口国名称"`
-	Partner2Code       int       `description:"第二进口国id"`
-	Partner2Name       string    `description:"第二进口国名称"`
-	DateType           int       `description:"日期类型，1：年度，2：月度"`
-	DataTime           string    `description:"数据日期"`
-	IndexTradeCode     string    `description:"离岸价编码"`
-	TradeValue         float64   `description:"离岸价（美元）"`
-	IndexNetWeightCode string    `description:"净重编码"`
-	NetWeightValue     float64   `description:"净重/公斤"`
-	ModifyTime         time.Time `description:"最新更新时间"`
-	CreateTime         time.Time `description:"创建时间"`
-}
-
-// GetAllComTradeDataList 获取联合国商品贸易数据列表
-func GetAllComTradeDataList(startDate string) (list []*ComTradeData, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM com_trade_data WHERE create_time>=?  ORDER BY com_trade_data_id ASC `
-	//_, err = o.Raw(sql, startDate).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
-
-	return
-}
-
-// AddBaseFromComTradeData 添加数据
-func AddBaseFromComTradeData(item *ComTradeData) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.ComTradeDataId)
-	return
-}
-
-// MultiAddBaseFromComTradeData 批量添加数据
-func MultiAddBaseFromComTradeData(items []*ComTradeData) (lastId int64, err error) {
-	//num := len(items)
-	//if num <= 0 {
-	//	return
-	//}
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertMulti(num, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-// GetBaseFromComTradeMaxDate 获取un数据中的最大日期数据
-func GetBaseFromComTradeMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM com_trade_data as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/data_manage/com_trade_index.go

@@ -1,107 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-// ComTradeIndex 联合国商品贸易数据指标表
-type ComTradeIndex struct {
-	ComTradeId  int       `gorm:"column:com_trade_id;primaryKey"` // `orm:"column(com_trade_id);pk"`
-	IndexCode   string    `description:"联合国商品贸易编码"`
-	IndexName   string    `description:"联合国商品名称"`
-	IndexNameCn string    `description:"联合国商品名称（中文）"`
-	UpdateTime  time.Time `description:"数据最近更新时间"`
-	CreateTime  time.Time `description:"创建时间"`
-}
-
-// GetAllComTradeIndexList 获取指标数据列表
-func GetAllComTradeIndexList(startDate string) (list []*ComTradeIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM com_trade_index WHERE create_time>=?  ORDER BY com_trade_id DESC `
-	//_, err = o.Raw(sql, startDate).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
-	return
-}
-
-func GetBaseFromComTradeCodeMappingAll(dateStr string) (list []*BaseFromEiaSteoIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM com_trade_index WHERE create_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-// AddBaseFromComTradeIndex 添加新的指标
-func AddBaseFromComTradeIndex(item *ComTradeIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.ComTradeId)
-	return
-}
-
-// ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
-type ComTradeCodeMapping struct {
-	Code       string    `gorm:"column:code;primaryKey"` // `orm:"column(code);pk"`
-	IndexCode  string    `description:"联合国商品贸易编码"`
-	Type       int       `description:"1:价格；2：重量"`
-	Name       string    `description:"指标名称"`
-	CreateTime time.Time `description:"创建时间"`
-}
-
-// GetAllComTradeCodeMappingList 获取联合国商品贸易数据指标编码与分类编码的关系列表
-func GetAllComTradeCodeMappingList(startDate string) (list []*ComTradeCodeMapping, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM com_trade_code_mapping WHERE create_time>=?  ORDER BY create_time ASC `
-	//_, err = o.Raw(sql, startDate).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
-	return
-}
-
-// AddBaseFromComTradeCodeMapping 添加联合国商品贸易数据指标编码与分类编码的关系
-func AddBaseFromComTradeCodeMapping(item *ComTradeCodeMapping) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	//lastId = int64(item.Code)
-	return
-}
-
-type ComTradeIndexMappingResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    ComTradeIndexAndMappingResp
-}
-
-type ComTradeIndexAndMappingResp struct {
-	IndexList   []ComTradeIndex
-	MappingList []ComTradeCodeMapping
-}
-
-type ComTradeIndexDataResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    ComTradeIndexAndDataResp
-}
-
-// ComTradeIndexAndDataResp 指标数据结构体
-type ComTradeIndexAndDataResp struct {
-	List   []*ComTradeData    `gorm:"-"`
-	Paging *paging.PagingItem `description:"分页数据"`
-}

models/data_manage/edb_data_calculate_ljztbpj.go

@@ -1,28 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-// EdbDataCalculateLjztbpj 累计值同比拼接数据结构体
-type EdbDataCalculateLjztbpj struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-// GetAllEdbDataCalculateLjztbpjByEdbInfoId 根据指标id获取全部的数据
-func GetAllEdbDataCalculateLjztbpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateLjztbpj, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_data_calculate_ljztbpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&items).Error
-	return
-}

models/data_manage/edb_data_calculate_zjpj.go

@@ -1,29 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-// EdbDataCalculateZjpj 直接拼接数据结构体
-type EdbDataCalculateZjpj struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-// GetAllEdbDataCalculateZjpjByEdbInfoId 根据指标id获取全部的数据
-func GetAllEdbDataCalculateZjpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateZjpj, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_data_calculate_zjpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&items).Error
-	return
-}

models/data_manage/edb_data_cffex.go

@@ -1,231 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type CffexData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-type BaseFromCffexDataSimple struct {
-	Id        int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
-}
-
-type BaseInfoFromCffex struct {
-	DealName string
-	BuyName  string
-	SoldName string
-}
-
-type BaseFromTradeCFFEXIndex struct {
-	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
-	Rank                      int
-	DealShortName             string
-	DealName                  string
-	DealCode                  string
-	DealValue                 string
-	DealChange                int
-	BuyShortName              string
-	BuyName                   string
-	BuyCode                   string
-	BuyValue                  string
-	BuyChange                 int
-	SoldShortName             string
-	SoldName                  string
-	SoldCode                  string
-	SoldValue                 string
-	SoldChange                int
-	Frequency                 string
-	ClassifyName              string
-	ClassifyType              string
-	CreateTime                time.Time
-	ModifyTime                time.Time
-	DataTime                  string
-}
-
-func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_cffex WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&minDate, &maxDate).Error
-	return
-}
-
-// RefreshEdbDataByCffex 刷新中金所指标数据
-func RefreshEdbDataByCffex(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	var suffix string
-	if strings.Contains(edbCode, "deal") {
-		suffix = "deal"
-	} else if strings.Contains(edbCode, "buy") {
-		suffix = "buy"
-	} else if strings.Contains(edbCode, "sold") {
-		suffix = "sold"
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		if suffix == "deal" {
-			condition += " AND deal_code=? "
-		} else if suffix == "buy" {
-			condition += " AND buy_code=? "
-		} else {
-			condition += " AND sold_code=? "
-		}
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND data_time>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
-
-	glDataList, err := GetCffexDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_cffex(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, v := range glDataList {
-		var value string
-		if suffix == "deal" {
-			value = v.DealValue
-		} else if suffix == "buy" {
-			value = v.BuyValue
-		} else {
-			value = v.SoldValue
-		}
-		item := v
-		itemValue := value
-		if _, ok := existMap[v.DataTime]; !ok {
-			count, err := GetEdbDataCffexByCodeAndDate(edbCode, v.DataTime)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return err
-			}
-			if count <= 0 {
-				eDate := item.DataTime
-				sValue := itemValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				err = ModifyEdbDataCffex(int64(edbInfoId), v.DataTime, value)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		existMap[v.DataTime] = value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		//if err != nil {
-		//	return err
-		//}
-
-		if err = tx.Exec(addSql).Error; err != nil {
-			return
-		}
-	}
-	return
-}
-
-// GetBaseInfoFromCffexByIndexCode 获取指标信息
-func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCffex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromCffexDataSimple, err error) {
-	sql := ` SELECT * FROM base_from_trade_cffex_index WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func AddEdbDataCffexBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeCFFEXIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetEdbDataCffexByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_cffex WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataCffex(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_cffex SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/edb_data_dl.go

@@ -1,207 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type DlData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-type BaseFromDlDataSimple struct {
-	Id        int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"` //`orm:"column(base_from_trade_dalian_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
-}
-
-type BaseInfoFromDl struct {
-	DealName string
-	BuyName  string
-	SoldName string
-}
-
-func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_dl WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&minDate, &maxDate).Error
-	return
-}
-
-// RefreshEdbDataByDl 刷新大商所指标数据
-func RefreshEdbDataByDl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	var suffix string
-	if strings.Contains(edbCode, "deal") {
-		suffix = "deal"
-	} else if strings.Contains(edbCode, "buy") {
-		suffix = "buy"
-	} else if strings.Contains(edbCode, "sold") {
-		suffix = "sold"
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		if suffix == "deal" {
-			condition += " AND deal_code=? "
-		} else if suffix == "buy" {
-			condition += " AND buy_code=? "
-		} else {
-			condition += " AND sold_code=? "
-		}
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND data_time>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
-
-	glDataList, err := GetDlDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_dl(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, v := range glDataList {
-		var value string
-		if suffix == "deal" {
-			value = v.DealValue
-		} else if suffix == "buy" {
-			value = v.BuyValue
-		} else {
-			value = v.SoldValue
-		}
-		item := v
-		itemValue := value
-		if _, ok := existMap[v.DataTime]; !ok {
-			count, err := GetEdbDataDlByCodeAndDate(edbCode, v.DataTime)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return err
-			}
-			if count <= 0 {
-				eDate := item.DataTime
-				sValue := itemValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				err = ModifyEdbDataDl(int64(edbInfoId), v.DataTime, value)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		existMap[v.DataTime] = value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		//if err != nil {
-		//	return err
-		//}
-
-		if err = tx.Exec(addSql).Error; err != nil {
-			return
-		}
-
-	}
-	return
-}
-
-// GetBaseInfoFromDalianByIndexCode 获取指标信息
-func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInfoFromDl, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_dalian_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromDlDataSimple, err error) {
-	sql := ` SELECT * FROM base_from_trade_dalian_index WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func AddEdbDataDlBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeDalianIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_dalian_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetEdbDataDlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_dl WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataDl(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_dl SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/edb_data_gl.go

@@ -1,167 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-func AddEdbDataGlBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-type GlData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData, err error) {
-	//sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
-	//o := orm.NewOrm()
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` ORDER BY PUBLISH_TIME DESC `
-	condition += " AND IS_DELETE=0 "
-	sql1 := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
-	//o := orm.NewOrmUsingDB("gl")
-	if condition != "" {
-		sql1 += condition
-	}
-	//sql := `select * from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by DATA_DATE ORDER BY PUBLISH_TIME DESC `
-	sql := `select MS_ID, INDEX_CODE, DATA_VALUE, DATA_DATE, PUBLISH_TIME, UPDATE_TIME, IS_DELETE from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by MS_ID, INDEX_CODE, DATA_VALUE, DATA_DATE, PUBLISH_TIME, UPDATE_TIME, IS_DELETE ORDER BY PUBLISH_TIME DESC `
-
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DmSQL["gl"].Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func GetEdbDataGlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_gl WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_gl SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-
-	return
-}
-
-// 刷新钢联指标数据
-func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	tx := global.DEFAULT_DmSQL.Begin()
-	//if err != nil {
-	//	return err
-	//}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-
-	if err != nil {
-		return
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		condition += " AND INDEX_CODE=? "
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND DATA_DATE>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND DATA_DATE<=? "
-		pars = append(pars, endDate)
-	}
-
-	condition += " AND IS_DELETE=0 "
-
-	//获取已存在指标所有数据
-	existDataList := make([]*EdbDataBase, 0)
-	dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_GL, utils.DATA_SUB_SOURCE_EDB)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&existDataList)
-	err = tx.Raw(sql, edbInfoId).Find(&existDataList).Error
-
-	if err != nil {
-		return err
-	}
-	existDataMap := make(map[string]string)
-	for _, v := range existDataList {
-		existDataMap[v.DataTime] = v.Value
-	}
-
-	glDataList, err := GetGlDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	addExistMap := make(map[string]string)
-	for _, v := range glDataList {
-		item := v
-		if _, ok := addExistMap[v.DataTime]; !ok {
-			if existVal, existOk := existDataMap[v.DataTime]; !existOk {
-				eDate := item.DataTime
-				sValue := item.InputValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				if existVal != item.InputValue {
-					sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-					sql = fmt.Sprintf(sql, dataTableName)
-					//_, err = tx.Raw(sql, item.InputValue, edbInfoId, v.DataTime).Exec()
-					err = tx.Exec(sql, item.InputValue, edbInfoId, v.DataTime).Error
-					if err != nil {
-						return err
-					}
-				}
-			}
-		}
-		addExistMap[v.DataTime] = v.InputValue
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		err = tx.Exec(addSql).Error
-		if err != nil {
-			return err
-		}
-	}
-
-	return
-}

models/data_manage/edb_data_lt.go

@@ -1,94 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"time"
-)
-
-type EdbDataLt struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-// AddEdbDataLtBySql 执行添加数据的sql
-func AddEdbDataLtBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-// ModifyEdbDataLt 修改路透社数据
-func ModifyEdbDataLt(edbInfoId int64, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_lt SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}
-
-func GetEdbDataLtMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_lt WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&min_date, &max_date).Error
-	return
-}
-
-func GetEdbDataLtByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_lt WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func GetEdbDataLtByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_data_lt WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
-	//_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, size).Find(&items).Error
-	return
-}
-
-type EdbDataFromLt struct {
-	Close map[int64]interface{} `json:"CLOSE"`
-}
-
-// QueryEdbDataByLt 获取路透社数据
-func QueryEdbDataByLt(edbCode, startDate, endDate string) (dataList map[int64]interface{}, err error) {
-	dataList = make(map[int64]interface{})
-
-	ltUrl := utils.LtServerUrl + `edbInfo/ek?EdbCode=%s&StartDate=%s&EndDate=%s`
-	ltUrl = fmt.Sprintf(ltUrl, edbCode, startDate, endDate)
-	utils.FileLog.Info("ltUrl:%s", ltUrl)
-	body, err := http.Get(ltUrl)
-	utils.FileLog.Info("lt result:%s", string(body))
-
-	if err != nil {
-		return
-	}
-	//fmt.Println(string(body))
-	item := new(EdbDataFromLt)
-	err = json.Unmarshal(body, &item)
-
-	if err != nil {
-		return
-	}
-	dataList = item.Close
-	return
-}

models/data_manage/edb_data_lz.go

@@ -1,86 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-)
-
-type lzSurveyData struct {
-	DataTime   string `orm:"column(data_time)" description:"日期"`
-	InputValue string `orm:"column(input_value)" description:"值"`
-}
-
-type LongzhongSurveyData struct {
-	SurveyDataId         int `gorm:"column:survey_data_id;primaryKey"` //`orm:"column(survey_data_id);pk"`
-	SurveyProductId      int
-	ProjectQuotaId       int64
-	BreedId              string
-	BreedName            string
-	QuotaId              string
-	QuotaName            string
-	UnitId               string
-	UnitName             string
-	SampleType           int64
-	SampleId             string
-	SampleName           string
-	DeviceId             string
-	Device               string
-	ProductCraftId       string
-	ProductCraft         string
-	ProductLine          string
-	InputMode            int64
-	Frequency            int64
-	InputValue           string
-	TaskShouldFinishTime int64
-	CustomId             string
-	CustomType           int64
-	Custom               string
-	QuotaSampleId        int64
-	TaskActualFinishTime int64
-	AreaName             string
-	ProvinceName         string
-	ResearchStartData    int64
-	ResearchStopData     int64
-	DataTime             string
-}
-
-func GetLzSurveyDataByTradeCode(condition string, pars []interface{}) (item []*lzSurveyData, err error) {
-	sql := ` SELECT  a.* FROM longzhong_survey_data AS a
-				INNER JOIN longzhong_survey_product AS b ON a.survey_product_id=b.survey_product_id
-				WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY a.data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func GetLzSurveyDataExistByTradeCode(surveyProductId int) (items []*LongzhongSurveyData, err error) {
-	sql := ` SELECT  * FROM longzhong_survey_data WHERE 1=1 AND survey_product_id=? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, surveyProductId).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, surveyProductId).Find(&items).Error
-
-	return
-}
-
-func GetEdbDataLzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_lz WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataLz(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_lz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/edb_data_pb.go

@@ -1,65 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"time"
-)
-
-type EdbDataPb struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` // `orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	Ticker        string
-	Field         string
-	DataTimestamp int64
-}
-
-func AddEdbDataPb(items []*EdbDataPb) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(1, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func ModifyEdbDataPb(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_pb SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
-	//_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId, value, edbCode, dataTime).Error
-	return
-}
-
-func ModifyEdbDataPbStatus(edbInfoId int64, edbCode string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_pb SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
-	//_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId, edbCode).Error
-	return
-}
-
-func GetEdbDataPbCount(edbCode, dataTime string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_pb WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, dataTime).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, dataTime).Scan(&count).Error
-	return
-}
-
-func GetEdbDataPbMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_pb WHERE edb_info_id=? `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&min_date, &max_date)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&min_date, &max_date).Error
-	return
-}

models/data_manage/edb_data_quarter.go

@@ -1,14 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-)
-
-func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
-	//o := orm.NewOrm()
-	hsql := `SELECT COUNT(1) AS count FROM edb_data_quarter WHERE edb_info_id=? `
-	//err = o.Raw(hsql, edbInfoId).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(hsql, edbInfoId).Scan(&count).Error
-	return
-}

models/data_manage/edb_data_sh.go

@@ -1,232 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type ShData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-type BaseFromShDataSimple struct {
-	Id        int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
-}
-
-type BaseInfoFromSh struct {
-	DealName string
-	BuyName  string
-	SoldName string
-}
-
-type BaseFromTradeShIndex struct {
-	BaseFromTradeShIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
-	Rank                   int
-	DealShortName          string
-	DealName               string
-	DealCode               string
-	DealValue              string
-	DealChange             int
-	BuyShortName           string
-	BuyName                string
-	BuyCode                string
-	BuyValue               string
-	BuyChange              int
-	SoldShortName          string
-	SoldName               string
-	SoldCode               string
-	SoldValue              string
-	SoldChange             int
-	Frequency              string
-	ClassifyName           string
-	ClassifyType           string
-	CreateTime             time.Time
-	ModifyTime             time.Time
-	DataTime               string
-}
-
-func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sh WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&minDate, &maxDate).Error
-	return
-}
-
-// RefreshEdbDataBySh 刷新上期所指标数据
-func RefreshEdbDataBySh(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	var suffix string
-	if strings.Contains(edbCode, "deal") {
-		suffix = "deal"
-	} else if strings.Contains(edbCode, "buy") {
-		suffix = "buy"
-	} else if strings.Contains(edbCode, "sold") {
-		suffix = "sold"
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		if suffix == "deal" {
-			condition += " AND deal_code=? "
-		} else if suffix == "buy" {
-			condition += " AND buy_code=? "
-		} else {
-			condition += " AND sold_code=? "
-		}
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND data_time>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
-
-	glDataList, err := GetShDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_sh(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, v := range glDataList {
-		var value string
-		if suffix == "deal" {
-			value = v.DealValue
-		} else if suffix == "buy" {
-			value = v.BuyValue
-		} else {
-			value = v.SoldValue
-		}
-		item := v
-		itemValue := value
-		if _, ok := existMap[v.DataTime]; !ok {
-			count, err := GetEdbDataShByCodeAndDate(edbCode, v.DataTime)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return err
-			}
-			if count <= 0 {
-				eDate := item.DataTime
-				sValue := itemValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				err = ModifyEdbDataSh(int64(edbInfoId), v.DataTime, value)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		existMap[v.DataTime] = value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		err = tx.Exec(addSql).Error
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// GetBaseInfoFromShByIndexCode 获取指标信息
-func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFromSh, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShDataSimple, err error) {
-	sql := ` SELECT * FROM base_from_trade_shanghai_index WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func AddEdbDataShBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//	_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetEdbDataShByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_sh WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataSh(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_sh SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/edb_data_shfe.go

@@ -1,231 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type ShfeData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-type BaseFromShfeDataSimple struct {
-	Id        int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` // `orm:"column(base_from_trade_ine_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
-}
-
-type BaseInfoFromShfe struct {
-	DealName string
-	BuyName  string
-	SoldName string
-}
-
-type BaseFromTradeShfeIndex struct {
-	BaseFromTradeShfeIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` //`orm:"column(base_from_trade_ine_index_id);pk"`
-	Rank                     int
-	DealShortName            string
-	DealName                 string
-	DealCode                 string
-	DealValue                string
-	DealChange               int
-	BuyShortName             string
-	BuyName                  string
-	BuyCode                  string
-	BuyValue                 string
-	BuyChange                int
-	SoldShortName            string
-	SoldName                 string
-	SoldCode                 string
-	SoldValue                string
-	SoldChange               int
-	Frequency                string
-	ClassifyName             string
-	ClassifyType             string
-	CreateTime               time.Time
-	ModifyTime               time.Time
-	DataTime                 string
-}
-
-func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_ine WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&minDate, &maxDate).Error
-	return
-}
-
-// RefreshEdbDataByShfe 刷新上期能源指标数据
-func RefreshEdbDataByShfe(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	var suffix string
-	if strings.Contains(edbCode, "deal") {
-		suffix = "deal"
-	} else if strings.Contains(edbCode, "buy") {
-		suffix = "buy"
-	} else if strings.Contains(edbCode, "sold") {
-		suffix = "sold"
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		if suffix == "deal" {
-			condition += " AND deal_code=? "
-		} else if suffix == "buy" {
-			condition += " AND buy_code=? "
-		} else {
-			condition += " AND sold_code=? "
-		}
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND data_time>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
-
-	glDataList, err := GetShfeDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_ine(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, v := range glDataList {
-		var value string
-		if suffix == "deal" {
-			value = v.DealValue
-		} else if suffix == "buy" {
-			value = v.BuyValue
-		} else {
-			value = v.SoldValue
-		}
-		item := v
-		itemValue := value
-		if _, ok := existMap[v.DataTime]; !ok {
-			count, err := GetEdbDataShfeByCodeAndDate(edbCode, v.DataTime)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return err
-			}
-			if count <= 0 {
-				eDate := item.DataTime
-				sValue := itemValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				err = ModifyEdbDataShfe(int64(edbInfoId), v.DataTime, value)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		existMap[v.DataTime] = value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		err = tx.Exec(addSql).Error
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// GetBaseInfoFromShfeByIndexCode 获取指标信息
-func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoFromShfe, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShfeDataSimple, err error) {
-	sql := ` SELECT * FROM base_from_trade_ine_index WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func AddEdbDataShfeBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShfeIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetEdbDataShfeByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_ine WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataShfe(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_ine SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/edb_data_ths.go

@@ -1,54 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"time"
-)
-
-type EdbDataThs struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-func AddEdbDataThs(items []*EdbDataThs) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(1, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func ModifyEdbDataThs(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_ths SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
-	//_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId, value, edbCode, dataTime).Error
-	return
-}
-
-func GetEdbDataThsCount(ebdCode, dataTime string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_ths WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, ebdCode, dataTime).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, ebdCode, dataTime).Scan(&count).Error
-	return
-}
-
-func GetEdbDataThsMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ths WHERE edb_info_id=? `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&min_date, &max_date)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&min_date, &max_date).Error
-	return
-}

models/data_manage/edb_data_wind.go

@@ -1,63 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"time"
-)
-
-type EdbDataWind struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-func AddEdbDataWind(items []*EdbDataWind) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(1, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func ModifyEdbDataWind(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_wind SET edb_info_id=?,value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
-	//_, err = o.Raw(sql, edbInfoId, value, edbCode, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId, value, edbCode, dataTime).Error
-	return
-}
-
-func ModifyEdbDataWindStatus(edbInfoId int64, edbCode string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_wind SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
-	//_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId, edbCode).Error
-	return
-}
-
-func GetEdbDataWindCount(edbCode, dataTime string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_wind WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, dataTime).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, dataTime).Scan(&count).Error
-	return
-}
-
-func GetEdbDataWindMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_wind WHERE edb_info_id=? `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&min_date, &max_date)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&min_date, &max_date).Error
-	return
-}

models/data_manage/edb_data_ys.go

@@ -1,433 +0,0 @@
-/**
-* @Author: jgl
-* @Date: 2021/9/15 10:15
- */
-
-package data_manage
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strconv"
-	"time"
-)
-
-type EdbDataYs struct {
-	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` // `orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
-}
-
-func AddEdbDataSmm(items []*EdbDataYs) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(1, items)
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func ModifyEdbDataSmm(edbCode, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_ys SET value=?,status=1,modify_time=NOW() WHERE edb_code=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbCode, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbCode, dataTime).Error
-	return
-}
-
-/*
-
-//有色基础指标同步
-func SyncSmmIndexDataBase() {
-	utils.FileLog.Info("start:" + time.Now().Format(utils.FormatDateTime))
-	list, err := data_manage.GetBaseFromSmmList()
-	if err != nil {
-		fmt.Println("GetBaseFromSmmList Err:" + err.Error())
-		return
-	}
-	token, err := getToken("pqian@hzinsights.com", "hz123456")
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	endDate := time.Now().Format(utils.FormatDate)
-	smmIndexAll, err := data_manage.GetBaseFromSmmIndex()
-	if err != nil {
-		fmt.Println("GetBaseFromSmmIndex Err:" + err.Error())
-		return
-	}
-	existIndexMap := make(map[string]*data_manage.BaseFromSmmIndex)
-	for _, item := range smmIndexAll {
-		existIndexMap[item.IndexCode] = item
-	}
-
-	for k, v := range list {
-		edbCode := v.Interface
-		var startDate string
-		if v.EndDate == "" || v.EndDate == "0000-00-00" {
-			startDate = v.ApiStartTime
-		} else {
-			if v.EndDate != "" {
-				dateFormate, _ := time.Parse(utils.FormatDate, v.EndDate)
-				var syncDay int
-				if v.ApiUpdateType == "day" {
-					syncDay = utils.DATA_REFRESH
-				} else if v.ApiUpdateType == "month" {
-					syncDay = utils.DATA_REFRESH * 30
-				} else if v.ApiUpdateType == "week" {
-					syncDay = utils.DATA_REFRESH * 7
-				} else if v.ApiUpdateType == "year" {
-					syncDay = utils.DATA_REFRESH * 365
-				}
-				startDate = dateFormate.AddDate(0, 0, -syncDay).Format(utils.FormatDate)
-			}
-		}
-
-		ysItem, err := getApiData(token, edbCode, startDate, endDate)
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		if ysItem != nil && ysItem.Code == 200 {
-
-			frequency := ysItem.Data.Frequency
-
-			indexMap := make(map[string]int)
-			smmIndexIdMap := make(map[int]int)
-			indexCodeMap := make(map[int]string)
-
-			indexKey := 0
-			var isDateIndex int
-			for fk, fv := range ysItem.Data.Field {
-				if fv.IsDate == "1" {
-					isDateIndex = fk
-				} else {
-					if !strings.Contains(fv.Name, "产品名称") &&
-						!strings.Contains(fv.Name, "单位") &&
-						!strings.Contains(fv.Name, "时间") &&
-						!strings.Contains(fv.Name, "备注") {
-
-						indexMap[fv.DBColName] = fk
-
-						indexKey += 1
-						indexCode := v.Interface + "#" + strconv.Itoa(indexKey)
-
-						if findItem, ok := existIndexMap[indexCode]; !ok {
-							ssmIndex := new(data_manage.BaseFromSmmIndex)
-							ssmIndex.Interface = v.Interface
-							ssmIndex.Name = v.Name
-							ssmIndex.IndexCode = indexCode
-							ssmIndex.IndexName = v.Name + "_" + fv.Name
-							ssmIndex.Type1 = v.Type1
-							ssmIndex.Type2 = v.Type2
-							ssmIndex.Type3 = v.Type3
-							ssmIndex.Frequency = frequency
-							ssmIndex.Unit = fv.Unit
-							ssmIndex.ApiStartTime = v.ApiStartTime
-							ssmIndex.ApiUpdateTime = v.ApiUpdateTime
-							ssmIndex.StartTime = v.StartTime
-							ssmIndex.FinishTime = v.FinishTime
-							ssmIndex.CreateTime = time.Now()
-							ssmIndex.ModifyTime = time.Now()
-							lastIndexId, err := data_manage.AddBaseFromSmmIndex(ssmIndex)
-							if err != nil {
-								return
-							}
-							smmIndexIdMap[fk] = int(lastIndexId)
-							indexCodeMap[fk] = indexCode
-						} else {
-							smmIndexIdMap[fk] = findItem.BaseFromSmmIndexId
-							indexCodeMap[fk] = findItem.IndexCode
-						}
-					}
-				}
-			}
-
-			existDataMap := make(map[string]*data_manage.BaseFromSmmData)
-			for _, mv := range indexCodeMap {
-				indexCode := mv
-				dataAllList, err := data_manage.GetBaseFromSmmDataAll(indexCode)
-				if err != nil {
-					fmt.Println("GetBaseFromSmmData Err:" + err.Error())
-					return
-				}
-				for _, item := range dataAllList {
-					key := item.IndexCode + item.DataTime
-					existDataMap[key] = item
-				}
-			}
-
-			addExistDataMap := make(map[string]string)
-
-			for _, dv := range ysItem.Data.Content {
-				var dataTime string
-				dataTime = dv[isDateIndex]
-				if strings.Contains(dataTime, "Q1") {
-					dataTime = strings.Replace(dataTime, "Q1", "-01", -1)
-					dataTime += "-31"
-				}
-				if strings.Contains(dataTime, "Q2") {
-					dataTime = strings.Replace(dataTime, "Q2", "-06", -1)
-					dataTime += "-30"
-				}
-				if strings.Contains(dataTime, "Q3") {
-					dataTime = strings.Replace(dataTime, "Q3", "-09", -1)
-					dataTime += "-30"
-				}
-				if strings.Contains(dataTime, "Q4") {
-					dataTime = strings.Replace(dataTime, "Q4", "-12", -1)
-					dataTime += "-31"
-				}
-
-				if strings.Contains(dataTime, "H1") {
-					dataTime = strings.Replace(dataTime, "H1", "-06", -1)
-					dataTime += "-30"
-				}
-
-				if strings.Contains(dataTime, "H2") {
-					dataTime = strings.Replace(dataTime, "H2", "-12", -1)
-					dataTime += "-31"
-				}
-
-				if frequency == "月" {
-					monthDate, err := time.Parse("2006-01", dataTime)
-					if err != nil {
-						fmt.Println("time.Parse:" + err.Error())
-					}
-					lastTime := monthDate.AddDate(0, 1, -1)
-					lastYear, lastMonth, lastDay := lastTime.Date()
-					var lastDate string
-					if int(lastMonth) < 10 {
-						lastDate = strconv.Itoa(lastYear) + "-" + "0" + strconv.Itoa(int(lastMonth)) + "-" + strconv.Itoa(lastDay)
-					} else {
-						lastDate = strconv.Itoa(lastYear) + "-" + strconv.Itoa(int(lastMonth)) + "-" + strconv.Itoa(lastDay)
-					}
-					dataTime = lastDate
-				} else if frequency == "年" {
-					dataTime = dataTime + "-12-31"
-				}
-				saveDataTime, err := time.Parse(utils.FormatDate, dataTime)
-				if err != nil {
-					fmt.Println("saveDataTime parse err:" + err.Error() + " dataTime:" + dataTime)
-					panic(err)
-				}
-				timestamp := saveDataTime.UnixNano() / 1e6
-				//循环指标
-				for _, v := range indexMap {
-
-					indexCode := indexCodeMap[v]
-					smmIndexId := smmIndexIdMap[v]
-					dataVal := dv[v]
-
-					if indexCode != "" {
-
-						key := indexCode + dataTime
-						val := strings.Replace(dataVal, ",", "", -1)
-						if findData, dataOk := existDataMap[key]; !dataOk {
-							if _, addOK := addExistDataMap[key]; !addOK {
-								if val != "" && val != "-" {
-									dataItem := new(data_manage.BaseFromSmmData)
-									dataItem.BaseFromSmmIndexId = int(smmIndexId)
-									dataItem.IndexCode = indexCode
-									dataItem.DataTime = dataTime
-									dataItem.Value = val
-									dataItem.CreateTime = time.Now()
-									dataItem.ModifyTime = time.Now()
-									dataItem.DataTimestamp = timestamp
-									_, err = data_manage.AddBaseFromSmmData(dataItem)
-									if err != nil && !strings.Contains(err.Error(), "idx_index_code_date") {
-										fmt.Println("AddBaseFromSmmData Err:" + err.Error())
-										return
-									}
-								}
-							}
-						} else {
-							if findData != nil && findData.Value != val { //修改
-								if _, addOK := addExistDataMap[key]; !addOK {
-									if val != "" && val != "-" {
-										err = data_manage.ModifyBaseFromSmmData(findData.SmmDataId, val)
-										if err != nil {
-											fmt.Println("ModifyBaseFromSmmData Err:" + err.Error())
-											return
-										}
-									}
-								}
-							}
-						}
-						addExistDataMap[key] = key
-					}
-				}
-			}
-
-			//修改数据开始，结束日期
-			{
-				indexList, err := data_manage.GetBaseFromSmmIndexByCode(v.Interface)
-				if err != nil {
-					fmt.Println("GetBaseFromSmmIndexByCode Err:" + err.Error())
-				}
-				for _, sv := range indexList {
-					minDate, maxDate, err := data_manage.GetBaseFromSmmMaxOrMinDate(sv.IndexCode)
-					if err != nil {
-						fmt.Println("GetEdbDataSmmMaxOrMinDate Err:" + err.Error())
-					} else {
-						err = data_manage.ModifyBaseFromSmmMinDateAndMaxDate(sv.BaseFromSmmIndexId, v.BaseFromSmmId, minDate, maxDate)
-						if err != nil {
-							fmt.Println("ModifyBaseFromSmmMinDateAndMaxDate Err:" + err.Error())
-						}
-					}
-				}
-			}
-		}
-		fmt.Println(v.Interface, v.Name, k)
-		time.Sleep(1 * time.Second)
-	}
-	utils.FileLog.Info("end:" + time.Now().Format(utils.FormatDateTime))
-}
-*/
-
-const (
-	dataUrl = "https://dataapi.smm.cn/GetData/" //data url (中文)
-	//dataUrl = "https://dataapi.smm.cn/GetDataEn/" //data url (english edition)
-	authUrl = "https://platform.smm.cn/usercenter/auth" // auth url (for all)
-)
-
-type TokenResp struct {
-	Code int       `json:"Code"`
-	Msg  string    `json:"Msg"`
-	Data TokenData `json:"Data"`
-}
-
-type TokenData struct {
-	Token string `json:"Token"`
-}
-
-// 获取token
-func getToken(userName string, password string) (string, error) {
-	encryptAuth := md5.New()
-	encryptAuth.Write([]byte(password)) //encrypt password with md5
-	newPassword := hex.EncodeToString(encryptAuth.Sum(nil))
-
-	resp, err := http.PostForm(authUrl, url.Values{"user_name": {userName}, "password": {newPassword}})
-	if err != nil {
-		return "", err
-	}
-
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("reponse error", err)
-		return "", err
-	}
-
-	var bodyJsonContent TokenResp
-
-	if err = json.Unmarshal([]byte(body), &bodyJsonContent); err != nil {
-		fmt.Println(err, "unmarsal failure")
-		return "", err
-	}
-
-	var token string
-	if bodyJsonContent.Code == 0 {
-		token = bodyJsonContent.Data.Token
-	}
-
-	//print(token)
-	return token, nil
-}
-
-// request response
-type DataResp struct {
-	Code int      `json:"Code"`
-	Msg  string   `json:"Msg"`
-	Data *ApiData `json:"Data"`
-}
-
-// api data response
-type ApiData struct {
-	Status  int        `json:"Status"` //0 no permission，1 ok
-	Field   []ApiField `json:"Field"`
-	Content [][]string `json:"Content"`
-}
-
-// api title
-type ApiField struct {
-	Unit       string `json:"Unit"`
-	Info       string `json:"Info"`
-	Name       string `json:"Name"`
-	ColumnType string `json:"ColumnType"`
-	ColIndex   uint   `json:"ColIndex"`
-	IsDate     string `json:"IsDate"`
-}
-
-type YsResult struct {
-	Code int64 `json:"Code"`
-	Data struct {
-		CompanyList []interface{} `json:"CompanyList"`
-		Content     [][]string    `json:"Content"`
-		Field       []struct {
-			ColIndex   int64  `json:"ColIndex"`
-			ColumnType string `json:"ColumnType"`
-			Info       string `json:"Info"`
-			IsDate     string `json:"IsDate"`
-			Name       string `json:"Name"`
-			Unit       string `json:"Unit"`
-			DBColName  string `json:"db_col_name"`
-		} `json:"Field"`
-		CountPage   int64  `json:"count_page"`
-		CurrentPage int64  `json:"current_page"`
-		Frequency   string `json:"frequency"`
-		Mindate     string `json:"mindate"`
-		PageNum     int64  `json:"page_num"`
-		Status      int64  `json:"status"`
-		TotalNum    int64  `json:"total_num"`
-	} `json:"Data"`
-	Msg string `json:"Msg"`
-}
-
-/*
- * request data
- * sdatetime,edatetime ==>format:yyyy-mm-dd,
- * apiName ==> data.metal.com(for english)/data.smm.cn (for chinese)
- */
-func getApiData(token string, apiName string, sdatetime string, edatetime string) (item *YsResult, err error) {
-	reqUrl := dataUrl + apiName
-	resp, err := http.PostForm(reqUrl, url.Values{"token": {token}, "sdatetime": {sdatetime}, "edatetime": {edatetime}})
-	if err != nil {
-		return nil, err
-	}
-
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("response error")
-		return nil, err
-	}
-	utils.FileLog.Info("ys result:" + string(body))
-	dataJsonContent := new(YsResult)
-	if err = json.Unmarshal([]byte(body), &dataJsonContent); err != nil {
-		fmt.Println(err, "data unmarshal failure")
-		return nil, err
-	}
-
-	if dataJsonContent.Code == 200 && len(dataJsonContent.Data.Content) > 0 {
-		return dataJsonContent, nil
-	} else {
-		err = errors.New("code:" + strconv.Itoa(int(dataJsonContent.Code)) + "msg:" + dataJsonContent.Msg)
-	}
-	return nil, nil
-}

models/data_manage/edb_data_zz.go

@@ -1,207 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type ZzData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-type BaseFromZzDataSimple struct {
-	Id        int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"` //`orm:"column(base_from_trade_zhengzhou_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
-}
-
-type BaseInfoFromZz struct {
-	DealName string
-	BuyName  string
-	SoldName string
-}
-
-func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_zz WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&minDate, &maxDate).Error
-	return
-}
-
-// RefreshEdbDataByZz 刷新郑商所指标数据
-func RefreshEdbDataByZz(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	var suffix string
-	if strings.Contains(edbCode, "deal") {
-		suffix = "deal"
-	} else if strings.Contains(edbCode, "buy") {
-		suffix = "buy"
-	} else if strings.Contains(edbCode, "sold") {
-		suffix = "sold"
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-	var condition string
-	var pars []interface{}
-
-	if edbCode != "" {
-		if suffix == "deal" {
-			condition += " AND deal_code=? "
-		} else if suffix == "buy" {
-			condition += " AND buy_code=? "
-		} else {
-			condition += " AND sold_code=? "
-		}
-		pars = append(pars, edbCode)
-	}
-
-	if startDate != "" {
-		condition += " AND data_time>=? "
-		pars = append(pars, startDate)
-	}
-
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
-
-	glDataList, err := GetZzDataByTradeCode(condition, pars)
-
-	addSql := ` INSERT INTO edb_data_zz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, v := range glDataList {
-		var value string
-		if suffix == "deal" {
-			value = v.DealValue
-		} else if suffix == "buy" {
-			value = v.BuyValue
-		} else {
-			value = v.SoldValue
-		}
-		item := v
-		itemValue := value
-		if _, ok := existMap[v.DataTime]; !ok {
-			count, err := GetEdbDataZzByCodeAndDate(edbCode, v.DataTime)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return err
-			}
-			if count <= 0 {
-				eDate := item.DataTime
-				sValue := itemValue
-				if sValue != "" {
-					dataTime, err := time.Parse(utils.FormatDate, eDate)
-					if err != nil {
-						return err
-					}
-					timestamp := dataTime.UnixNano() / 1e6
-					timeStr := fmt.Sprintf("%d", timestamp)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
-					isAdd = true
-				}
-			} else {
-				err = ModifyEdbDataZz(int64(edbInfoId), v.DataTime, value)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		existMap[v.DataTime] = value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
-		err = tx.Exec(addSql).Error
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// GetBaseInfoFromZhengzhouByIndexCode 获取指标信息
-func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*BaseInfoFromZz, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromZzDataSimple, err error) {
-	sql := ` SELECT * FROM base_from_trade_zhengzhou_index WHERE 1=1 `
-	//o := orm.NewOrm()
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-func AddEdbDataZzBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
-	return
-}
-
-func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	//o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
-	sql = fmt.Sprintf(sql, suffix)
-	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
-	return
-}
-
-func GetEdbDataZzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_zz WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
-	return
-}
-
-func ModifyEdbDataZz(edbInfoId int64, dataTime, value string) (err error) {
-	//o := orm.NewOrm()
-	sql := ` UPDATE edb_data_zz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-
-	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
-	return
-}

models/data_manage/meeting_probabilities.go

@@ -1,116 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_task/global"
-	"time"
-)
-
-// MeetingProbabilities excel表格详情表
-type MeetingProbabilities struct {
-	MeetingInfoId int       `gorm:"column:meeting_info_id;primaryKey"` //`orm:"column(meeting_info_id);pk"`
-	Content       string    `description:"表格内容"`
-	ExcelImage    string    `description:"表格图片"`
-	DateTime      string    `description:"数据日期"`
-	IsDelete      int       `description:"是否删除，0：未删除，1：已删除"`
-	ModifyTime    time.Time `description:"最近修改日期"`
-	CreateTime    time.Time `description:"创建日期"`
-}
-
-type MeetingProbabilitiesResp struct {
-	Ret     int
-	Msg     string
-	ErrMsg  string
-	ErrCode string
-	Data    []*MeetingProbabilities `gorm:"-"`
-}
-
-// AddMeetingProbabilities 新增表格
-func AddMeetingProbabilities(meetingInfo *MeetingProbabilities) (newId int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(meetingInfo)
-	//if err != nil {
-	//	return
-	//}
-	//meetingInfo.MeetingInfoId = int(lastId)
-	//newId = int(lastId)
-	err = global.DmSQL["data"].Create(meetingInfo).Error
-	return
-}
-
-func GetMeetingProbabilitiesAll(dateStr string) (list []*MeetingProbabilities, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM meeting_probabilities WHERE date_time>=?`
-	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
-
-	sql := `SELECT * FROM meeting_probabilities WHERE date_time>=?`
-	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
-	return
-}
-
-type ISheet struct {
-	ScrollTop            int             `json:"scrollTop"`
-	ScrollLeft           int             `json:"scrollLeft"`
-	Index                string          `json:"index"`
-	Status               int             `json:"status"`
-	JfGirdSelectSave     []struct{}      `json:"jfgird_select_save"`
-	LuckySheetSelectSave []struct{}      `json:"luckysheet_select_save"`
-	Data                 [][]interface{} `json:"data"`
-	Config               map[string]struct {
-	} `json:"config"`
-	VisibleDataRow           []int            `json:"visibledatarow"`
-	VisibleDataColumn        []int            `json:"visibledatacolumn"`
-	ChWidth                  int              `json:"ch_width"`
-	RhHeight                 int              `json:"rh_height"`
-	LuckySheetSelectionRange []int            `json:"luckysheet_selection_range"`
-	ZoomRatio                int              `json:"zoomRatio"`
-	CellData                 []ISheetCellData `json:"celldata"`
-}
-type ISheetData struct {
-	M  string       `json:"m"`
-	Ct ISheetDataCt `json:"ct"`
-	V  string       `json:"v"`
-}
-
-type ISheetDataCt struct {
-	Fa string `json:"fa"`
-	T  string `json:"t"`
-}
-
-type ISheetCellData struct {
-	R int        `json:"r"`
-	C int        `json:"c"`
-	V ISheetData `json:"v"`
-}
-
-type SheetData struct {
-	Data [][]*struct {
-		Ct struct {
-			Fa string `json:"fa"`
-			T  string `json:"t"`
-		} `json:"ct"`
-		M string  `json:"m"`
-		V float64 `json:"v"`
-	} `json:"data"`
-}
-
-// AddExcelInfoReq 新增表格请求
-type AddExcelInfoReq struct {
-	ExcelName       string      `description:"表格名称"`
-	Source          int         `description:"表格来源，1：excel插件的表格，2：自定义表格，默认：1"`
-	ExcelType       int         `description:"表格类型，1：指标列，2：日期列，默认：1"`
-	ExcelImage      string      `description:"表格截图"`
-	ExcelClassifyId int         `description:"分类id"`
-	Content         string      `description:"Excel表格内容"`
-	TableData       interface{} `description:"自定义表格的数据内容"`
-}
-
-func GetMeetingProbabilitiesMaxDate() (max_date time.Time, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT max(a.date_time)as max_date FROM meeting_probabilities as a `
-	//err = o.Raw(sql).QueryRow(&max_date)
-
-	sql := ` SELECT max(a.date_time)as max_date FROM meeting_probabilities as a `
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
-	return
-}

models/db.go

@@ -97,45 +97,11 @@ func initback() {
 func initEdbDataTable() {
 	//注册对象
 	orm.RegisterModel(
-		new(data_manage.EdbDataWind),
-		new(data_manage.EdbDataThs),
-		new(data_manage.EdbDataPb),
-		new(data_manage.BaseFromSmm),
-		new(data_manage.BaseFromSmmIndex),
-		new(data_manage.BaseFromSmmData),
-		new(data_manage.EdbDataYs),
 		new(data_manage.EdbInfoCalculateMapping),
-		new(data_manage.EdbInfo),                 //hz_data库的edb_info表
-		new(data_manage.EdbDataCalculateZjpj),    //直接拼接
-		new(data_manage.EdbDataCalculateLjztbpj), //累计同比值拼接
-		new(data_manage.BaseFromTradeZhengzhouIndex),
-		new(data_manage.BaseFromTradeDalianIndex),
-		new(data_manage.BaseFromTradeShanghaiIndex),
-		new(data_manage.BaseFromTradeCffexIndex),
-		new(data_manage.BaseFromTradeIneIndex),
-		new(data_manage.BaseFromChangesVisitorsCovid),
-		new(data_manage.BaseFromEiaSteoIndex),
-		new(data_manage.BaseFromEiaSteoClassify),
-		new(data_manage.BaseFromEiaSteoData),
-		new(data_manage.ComTradeIndex),           // 联合国指标表
-		new(data_manage.ComTradeCodeMapping),     // 联合国指标关系表
-		new(data_manage.ComTradeData),            // 联合国数据表
-		new(data_manage.MeetingProbabilities),    // 联储加息概率
-		new(data_manage.BaseFromTradeEicIndexV2), // 欧洲天然气
-
-		//广期所
-		new(data_manage.BaseFromTradeGuangzhouClassify),
-		new(data_manage.BaseFromTradeGuangzhouContract),
-		new(data_manage.BaseFromTradeGuangzhouIndex),
-		new(data_manage.BaseFromTradeGuangzhouData),
-		//ICPI
-		new(data_manage.BaseFromIcpiIndex),
-		new(data_manage.BaseFromIcpiClassify),
-		new(data_manage.BaseFromIcpiData),
+		new(data_manage.EdbInfo),                   //hz_data库的edb_info表
 		new(data_manage.BusinessSysInteractionLog), // 商家系统交互记录表
 
 		new(data_manage.EdbInfoRelation), //指标引用关联表
-		new(data_manage.BaseFromThsHfIndex),
 	)
 }
 

services/changes_visitors_covid.go

@@ -1,55 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 谷歌出现数据
-func SyncChangesVisitorsCovid() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetChangesVisitorsCovidMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_GOOGLE_TRAVEL
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncChangesVisitorsCovid", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.ChangesVisitorsCovidIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetChangesVisitorsCovidAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[uint64]*data_manage.BaseFromChangesVisitorsCovid)
-	for _, v := range allIndex {
-		existIndexMap[v.Id] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.Id]; !ok {
-			err := data_manage.AddBaseFromChangesVisitorsCovid(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-		}
-	}
-	return err
-}

services/com_trade.go

@@ -1,164 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// SyncComTradeIndex 同步UN指标
-func SyncComTradeIndex() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromComTradeMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_COM_TRADE
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncComTradeIndex", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.ComTradeIndexMappingResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		fmt.Println("json.Unmarshal err:" + err.Error())
-		return err
-	}
-
-	// 指标处理
-	{
-		//获取所有指标信息  某一天的
-		allComTradeIndex, tmpErr := data_manage.GetAllComTradeIndexList(startDate)
-		if tmpErr != nil {
-			fmt.Println("get GetAllComTradeCodeMappingList err:" + tmpErr.Error())
-			return
-		}
-
-		existCodeMappingMap := make(map[string]*data_manage.ComTradeIndex)
-		for _, v := range allComTradeIndex {
-			existCodeMappingMap[v.IndexCode] = v
-		}
-
-		for _, zv := range respObj.Data.IndexList {
-			if _, ok := existCodeMappingMap[zv.IndexCode]; !ok {
-				newID, tmpErr := data_manage.AddBaseFromComTradeIndex(&zv)
-				if tmpErr != nil {
-					fmt.Println("insert error:", tmpErr)
-				}
-				fmt.Println("insert new indexID:", newID)
-			}
-		}
-	}
-
-	// mapping处理
-	{
-		//获取所有指标信息  某一天的
-		allCodeMappingIndex, tmpErr := data_manage.GetAllComTradeCodeMappingList(startDate)
-		if tmpErr != nil {
-			fmt.Println("get GetAllComTradeCodeMappingList err:" + tmpErr.Error())
-			return
-		}
-
-		existCodeMappingMap := make(map[string]*data_manage.ComTradeCodeMapping)
-		for _, v := range allCodeMappingIndex {
-			existCodeMappingMap[v.Code] = v
-		}
-
-		for _, zv := range respObj.Data.MappingList {
-			if _, ok := existCodeMappingMap[zv.Code]; !ok {
-				_, err = data_manage.AddBaseFromComTradeCodeMapping(&zv)
-				if err != nil {
-					fmt.Println("AddBaseFromComTradeCodeMapping error:", err)
-				}
-				fmt.Println("AddBaseFromComTradeCodeMapping new Code:", zv.Code)
-			}
-		}
-	}
-
-	return err
-}
-
-// SyncComTradeData 同步UN指标数据
-func SyncComTradeData() (err error) {
-	startDate := time.Now().Format(utils.FormatDate) + " 00:00:00"
-	//var startDate string
-	maxDate, err := data_manage.GetBaseFromComTradeMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/data/list_page`
-
-	existDataMap := make(map[string]*data_manage.ComTradeData)
-	allData, err1 := data_manage.GetAllComTradeDataList(startDate)
-	if err1 != nil {
-		fmt.Println("get GetBaseFromEiaSteoIndexDataAll err:" + err1.Error())
-		return
-	}
-	for _, dv := range allData {
-		tmpKey := dv.IndexTradeCode + "_" + dv.DataTime
-		existDataMap[tmpKey] = dv
-	}
-
-	//获取所有指标信息  某一天的
-	maxPage := 1
-
-	for currPage := 0; currPage < maxPage; currPage++ {
-		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_COM_TRADE
-		data["StartDate"] = startDate
-		data["CurrPage"] = currPage
-		data["PageSize"] = 500 //
-
-		var result string
-		result, err = HttpPost("SyncComTradeData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
-
-		respObj := new(data_manage.ComTradeIndexDataResp)
-		err = json.Unmarshal([]byte(result), &respObj)
-		if err != nil {
-			fmt.Println("json.Unmarshal err:" + err.Error())
-			return err
-		}
-		if respObj.Ret != 200 {
-			err = errors.New(respObj.ErrMsg)
-			return
-		}
-		// 总页码数
-		maxPage = respObj.Data.Paging.Pages
-
-		addDataList := make([]*data_manage.ComTradeData, 0)
-		if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
-			for _, dv := range respObj.Data.List {
-				tmpKey := dv.IndexTradeCode + "_" + dv.DataTime
-				if _, ok := existDataMap[tmpKey]; !ok {
-					addDataList = append(addDataList, dv)
-					existDataMap[tmpKey] = dv
-				}
-			}
-		}
-
-		// 最后如果还有数据未插入，那么继续插入吧
-		if len(addDataList) > 0 {
-			_, err = data_manage.MultiAddBaseFromComTradeData(addDataList)
-			if err != nil {
-				fmt.Println("AddBaseFromComTradeData error:", err)
-			}
-		}
-	}
-
-	return err
-}

services/data/base_from_jiayue.go

@@ -1,32 +0,0 @@
-package data
-
-import (
-	"context"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-)
-
-// SyncJiaYueNewIndex 同步嘉悦物产增量指标-每分钟
-func SyncJiaYueNewIndex(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "SyncJiaYueNewIndex-同步嘉悦物产增量指标失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	param := make(map[string]interface{})
-	uri := "jiayue_index/sync_new_index"
-	res, e := postRefreshEdbData(param, uri)
-	if e != nil {
-		err = fmt.Errorf("postRefreshEdbData err: %s", e.Error())
-		return
-	}
-	if res != nil && res.Ret != 200 {
-		err = fmt.Errorf("postRefreshEdbData fail")
-		return
-	}
-	return
-}

services/data/base_from_pcsg.go

@@ -1,73 +0,0 @@
-package data
-
-import (
-	"context"
-	"encoding/json"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"io/ioutil"
-	"time"
-)
-
-// RefreshPCSGBloomberg 中石油新加坡-定时刷新指标
-func RefreshPCSGBloomberg(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "RefreshPCSGBloombergDaily-中石油新加坡-刷新彭博指标失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-		}
-	}()
-
-	runTime := time.Now().Local().Format("15:04")
-	tasks, e := LoadPCSGBloombergTask()
-	if e != nil {
-		err = fmt.Errorf("读取配置失败, %v", e)
-		return
-	}
-	if len(tasks) == 0 {
-		utils.FileLog.Info("任务未配置")
-		return
-	}
-
-	// 根据分钟匹配任务
-	uri := "bloomberg/pcsg/refresh_task"
-	for _, v := range tasks {
-		if runTime != v.TaskTime {
-			continue
-		}
-		utils.FileLog.Info(fmt.Sprintf("执行%s", v.TaskKey))
-		param := make(map[string]interface{})
-		param["TaskKey"] = v.TaskKey
-		res, e := postRefreshEdbData(param, uri)
-		if e != nil {
-			utils.FileLog.Info(fmt.Sprintf("postRefreshEdbData, %v", e))
-			continue
-		}
-		if res != nil && res.Ret != 200 {
-			utils.FileLog.Info("postRefreshEdbData, fail")
-			continue
-		}
-		utils.FileLog.Info(fmt.Sprintf("执行结束%s", v.TaskKey))
-	}
-	return
-}
-
-type PCSGBloombergTask struct {
-	TaskKey  string `json:"TaskKey"`
-	TaskTime string `json:"TaskTime"`
-}
-
-// LoadPCSGBloombergTask 加载配置
-func LoadPCSGBloombergTask() (tasks []*PCSGBloombergTask, err error) {
-	filePath := "./static/pcsg_task.json"
-	b, e := ioutil.ReadFile(filePath)
-	if e != nil {
-		err = fmt.Errorf("读取配置失败, err: %v", e)
-		return
-	}
-	if e = json.Unmarshal(b, &tasks); e != nil {
-		err = fmt.Errorf("解析配置失败, err: %v", e)
-		return
-	}
-	return
-}

services/data/base_from_ths_hf.go

@@ -1,47 +0,0 @@
-package data
-
-import (
-	"context"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-)
-
-// RefreshBaseFromThsHfIndex 同花顺高频数据
-func RefreshBaseFromThsHfIndex(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("RefreshBaseFromThsHfIndex-刷新同花顺高频数据失败, %v", err)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	indexOb := new(data_manage.BaseFromThsHfIndex)
-	indexes, e := indexOb.GetItemsByCondition(``, make([]interface{}, 0), []string{indexOb.Cols().PrimaryId, indexOb.Cols().IndexCode}, "")
-	if e != nil {
-		err = fmt.Errorf("获取源指标列表失败, %v", e)
-		return
-	}
-	if len(indexes) == 0 {
-		return
-	}
-
-	refreshUrl := "ths/hf/base/refresh"
-	for _, v := range indexes {
-		param := make(map[string]interface{})
-		param["BaseIndexCode"] = v.IndexCode
-		param["RefreshType"] = 1 // 默认刷6小时前的
-		res, e := postRefreshEdbData(param, refreshUrl)
-		if e != nil {
-			utils.FileLog.Info(fmt.Sprintf("RefreshBaseFromThsHfIndex-postRefreshEdbData, code: %s, err: %v", v.IndexCode, e))
-			continue
-		}
-		if res != nil && res.Ret != 200 {
-			utils.FileLog.Info(fmt.Sprintf("RefreshBaseFromThsHfIndex-postRefreshEdbData, code: %s, Ret: %d, ErrMsg: %s", v.IndexCode, res.Ret, res.ErrMsg))
-			continue
-		}
-	}
-	return
-}

services/data/base_from_zhongji.go

@@ -1,32 +0,0 @@
-package data
-
-import (
-	"context"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-)
-
-// SyncZhongJiIndexList 同步中基宁波指标列表
-func SyncZhongJiIndexList(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "SyncJiaYueNewIndex-同步中基宁波指标列表失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	param := make(map[string]interface{})
-	uri := "smm/zhongji/list"
-	res, e := postRefreshEdbData(param, uri)
-	if e != nil {
-		err = fmt.Errorf("postRefreshEdbData err: %s", e.Error())
-		return
-	}
-	if res != nil && res.Ret != 200 {
-		err = fmt.Errorf("postRefreshEdbData fail")
-		return
-	}
-	return
-}

services/data/data_pb.go

@@ -1,96 +0,0 @@
-package data
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-type EdbDataFromPb struct {
-	Date   map[string]int64   `json:"date"`
-	Ticker map[string]string  `json:"ticker"`
-	Field  map[string]string  `json:"field"`
-	Value  map[string]float64 `json:"value"`
-}
-
-// 万得
-func SyncEdbDataByPb(edbInfoId int64, edbCode, startDate, endDate string) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("SyncEdbDataByPb Err:" + err.Error())
-		}
-	}()
-	addEdbCode := edbCode
-
-	edbCode = url.QueryEscape(edbCode)
-	pbUrl := utils.PbServerUrl + `edbInfo/pb?EdbCode=%s&StartDate=%s&EndDate=%s`
-	pbUrl = fmt.Sprintf(pbUrl, edbCode, startDate, endDate)
-	utils.FileLog.Info("pbUrl:" + pbUrl)
-	body, err := http.Get(pbUrl)
-	utils.FileLog.Info("pb result:" + string(body))
-
-	if strings.Contains(string(body), "html") {
-		return nil
-	}
-
-	if err != nil {
-		return
-	}
-	item := new(EdbDataFromPb)
-	err = json.Unmarshal(body, &item)
-	if err != nil {
-		return
-	}
-
-	pbList := make([]*data_manage.EdbDataPb, 0)
-	if len(item.Date) > 0 {
-		dateMap := item.Date
-		for k, v := range dateMap {
-			dataTimestamp := v
-			v = v / 1000
-			t := time.Unix(v, 0)
-			dateTime := t.Format(utils.FormatDate)
-
-			val := item.Value[k]
-			field := item.Field[k]
-			ticker := item.Ticker[k]
-			if field == "PX_LAST" {
-				count, err := data_manage.GetEdbDataPbCount(addEdbCode, dateTime)
-				if err != nil {
-					return err
-				}
-				if count > 0 {
-					err = data_manage.ModifyEdbDataPb(edbInfoId, addEdbCode, dateTime, val)
-					if err != nil {
-						return err
-					}
-				} else {
-					item := new(data_manage.EdbDataPb)
-					item.EdbCode = addEdbCode
-					item.EdbInfoId = int(edbInfoId)
-					item.CreateTime = time.Now()
-					item.ModifyTime = time.Now()
-					item.DataTime = dateTime
-					item.Value = val
-					item.Status = 1
-					item.Field = field
-					item.Ticker = ticker
-					item.DataTimestamp = dataTimestamp
-					pbList = append(pbList, item)
-				}
-			}
-		}
-	}
-	if len(pbList) > 0 {
-		err = data_manage.AddEdbDataPb(pbList)
-		if err != nil {
-			return
-		}
-	}
-	return
-}

services/data/data_ths.go

@@ -1 +0,0 @@
-package data

services/data/data_wind.go

@@ -1,85 +0,0 @@
-package data
-
-import (
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"strings"
-	"time"
-)
-
-type EdbDataFromWind struct {
-	Close map[string]float64 `json:"CLOSE"`
-	Dt    map[string]int64   `json:"DT"`
-}
-
-// 万得
-func SyncEdbDataByWind(edbInfoId int64, edbCode, startDate, endDate string) (err error) {
-	defer func() {
-		if err != nil {
-			utils.FileLog.Info("GetEdbDataByWind Err:" + err.Error())
-		}
-	}()
-
-	windUrl := utils.WindServerUrl + `edbInfo/wind?EdbCode=%s&StartDate=%s&EndDate=%s`
-	windUrl = fmt.Sprintf(windUrl, edbCode, startDate, endDate)
-	utils.FileLog.Info("windUrl:" + windUrl)
-	body, err := http.Get(windUrl)
-	bodyStr := string(body)
-	utils.FileLog.Info("wind result:" + bodyStr)
-	if strings.Contains(bodyStr, "html") || strings.Contains(bodyStr, "CWSDService: No data.") {
-		return nil
-	}
-	if err != nil {
-		return
-	}
-	item := new(EdbDataFromWind)
-	err = json.Unmarshal(body, &item)
-	if err != nil {
-		err = errors.New("Err:" + err.Error() + " EdbCode:" + edbCode + "\n" + " BodyStr:" + string(body))
-		return
-	}
-
-	windList := make([]*data_manage.EdbDataWind, 0)
-	for k, v := range item.Dt {
-		dataTimestamp := v
-		v = v / 1000
-		fmt.Println(k, v)
-		t := time.Unix(v, 0)
-		dateTime := t.Format(utils.FormatDate)
-		fmt.Println(dateTime)
-		val := item.Close[k]
-		count, err := data_manage.GetEdbDataWindCount(edbCode, dateTime)
-		if err != nil {
-			return err
-		}
-		if count > 0 {
-			err = data_manage.ModifyEdbDataWind(edbInfoId, edbCode, dateTime, val)
-			if err != nil {
-				return err
-			}
-		} else {
-
-			item := new(data_manage.EdbDataWind)
-			item.EdbCode = edbCode
-			item.EdbInfoId = int(edbInfoId)
-			item.CreateTime = time.Now()
-			item.ModifyTime = time.Now()
-			item.DataTime = dateTime
-			item.Value = val
-			item.Status = 1
-			item.DataTimestamp = dataTimestamp
-			windList = append(windList, item)
-		}
-	}
-	if len(windList) > 0 {
-		err = data_manage.AddEdbDataWind(windList)
-		if err != nil {
-			return
-		}
-	}
-	return
-}

services/data/edb_info.go

@@ -8,237 +8,11 @@ import (
 	"eta_gn/eta_task/services/alarm_msg"
 	"eta_gn/eta_task/utils"
 	"fmt"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
 )
 
-// RefreshDataFromThs 刷新同花顺数据
-func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromThs Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromThs ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromThs Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_THS)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		err = errors.New("GetEdbInfoByCondition:" + err.Error())
-		return
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromWind 刷新万得数据
-func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromWind Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromWind ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromWind Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += ` AND source=? AND no_update = 0 `
-	pars = append(pars, utils.DATA_SOURCE_WIND)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return err
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	fmt.Println("wind刷新结束")
-	return err
-}
-
-// RefreshDataFromPb 刷新彭博数据
-func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromPb Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromPb ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromPb Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	if utils.PbRefreshOpen == "0" {
-		return
-	}
-	var condition string
-	var pars []interface{}
-	var frequencyStr string
-	if utils.PbRefreshFrequency == "" {
-		frequencyStr = "'日度','周度'"
-	} else {
-		frequencyStr = utils.PbRefreshFrequency
-	}
-	condition += " AND source=? AND frequency in (" + frequencyStr + ") "
-	pars = append(pars, utils.DATA_SOURCE_PB)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromPbFinance 刷新彭博财务指标数据
-func RefreshDataFromPbFinance(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromPb Err:" + err.Error())
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromPb ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-			go alarm_msg.SendAlarmMsg("RefreshDataFromPb ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromPbFinance Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_PB_FINANCE)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-
-	}
-	return err
-}
-
 // RefreshDataFromCalculateAll 刷新所有计算指标
 func RefreshDataFromCalculateAll() (err error) {
 	errMsgList := make([]string, 0)
@@ -443,823 +217,6 @@ func ResetEdbInfoIsUpdate(cont context.Context) (err error) {
 	return nil
 }
 
-// RefreshDataFromGoogleTravel RefreshDataFromEic 刷新谷歌出行数据
-func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromGoogleTravel Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromGoogleTravel ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromGoogleTravel ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GOOGLE_TRAVEL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-
-	}
-	return err
-}
-
-// RefreshDataFromEiaSteo 刷新eia steo 报告数据
-func RefreshDataFromEiaSteo(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromEiaSteo Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromEiaSteo ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromEiaSteo ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_EIA_STEO)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromYs 刷新有色数据
-func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromYs Err:" + err.Error())
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromYs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-			go alarm_msg.SendAlarmMsg("RefreshDataFromYs ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromYs Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_YS)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// 刷新钢联数据
-func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromGl Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromGl ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromGl ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromLt 刷新路透数据
-func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromLt ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		utils.FileLog.Info("RefreshDataFromLt刷新结束")
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_LT)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		errMsgList = append(errMsgList, "GetEdbInfoByCondition:"+err.Error())
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		fmt.Println(v.EdbCode, v.Frequency, v.EndDate)
-		startDate := v.StartDate.Format(utils.FormatDate)
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromCoal 刷新煤炭网数据
-func RefreshDataFromCoal(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromCoal Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromCoal ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromCoal ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_COAL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromMysteelChemical 刷新钢联化工数据
-func RefreshDataFromMysteelChemical(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromMysteelChemical Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromMysteelChemical ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromMysteelChemical ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? AND no_update = 0 "
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromComTrade 刷新 UN 数据
-func RefreshDataFromComTrade(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromComTrade Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromComTrade ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromComTrade ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_COM_TRADE)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromSci 刷新 卓创 数据
-func RefreshDataFromSci(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromSci Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromSci ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromSci ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_SCI)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-
-	}
-	return err
-}
-
-// RefreshDataFromNationalStatistics 刷新统计局数据
-func RefreshDataFromNationalStatistics(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromNationalStatistics Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromNationalStatistics ErrMsg:"+err.Error(), 3)
-		}
-
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromNationalStatistics ErrMsg: %s", strings.Join(errMsgList, `<br/>`))
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += ` AND source = ? `
-	pars = append(pars, utils.DATA_SOURCE_NATIONAL_STATISTICS)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-
-	}
-	return err
-}
-
-// RefreshDataFromEic 刷欧洲天然气数据
-func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromEic Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromEic ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GIE)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshJiaYueDataFromBridge 嘉悦物产-刷新数据宝指标
-func RefreshJiaYueDataFromBridge(cont context.Context) (err error) {
-	utils.FileLog.Info(fmt.Sprintf("嘉悦-开始刷新数据宝指标: %s", time.Now().Format(utils.FormatDateTime)))
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("RefreshJiaYueDataFromBridge ErrMsg: %s", err.Error())
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		utils.FileLog.Info(fmt.Sprintf("嘉悦-结束刷新数据宝指标: %s", time.Now().Format(utils.FormatDateTime)))
-	}()
-
-	// 获取来自桥接服务的指标来源
-	cond := ` AND from_bridge = 1`
-	pars := make([]interface{}, 0)
-	sources, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
-	if e != nil {
-		err = fmt.Errorf("获取来自桥接服务的数据源失败, err: %s", e.Error())
-		return
-	}
-	sourceArr := make([]string, 0)
-	for _, v := range sources {
-		if v.EdbSourceId <= 0 {
-			continue
-		}
-		sourceArr = append(sourceArr, strconv.Itoa(v.EdbSourceId))
-	}
-	if len(sourceArr) == 0 {
-		utils.FileLog.Info("RefreshJiaYueDataFromBridge 无数据来源")
-		return
-	}
-
-	// 获取指标
-	edbCond := fmt.Sprintf(` AND source IN (%s)`, utils.GetOrmInReplace(len(sourceArr)))
-	edbPars := make([]interface{}, 0)
-	edbPars = append(edbPars, sourceArr)
-	items, e := data_manage.GetEdbInfoByCondition(edbCond, edbPars, 0)
-	if e != nil {
-		err = fmt.Errorf("GetEdbInfoByCondition err: %s", e.Error())
-		return
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, e := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if e != nil {
-			utils.FileLog.Info(fmt.Sprintf("RefreshEdbData err: %s", e.Error()))
-			//err = fmt.Errorf("RefreshEdbData err: %s", e.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			utils.FileLog.Info(fmt.Sprintf("RefreshEdbData indexCode: %s, err: %s, errMsg: %s", v.EdbCode, resp.Msg, resp.ErrMsg))
-			//err = fmt.Errorf("RefreshEdbData Err: %s; ErrMsg: %s", resp.Msg, resp.ErrMsg)
-			continue
-		}
-	}
-	return
-}
-
-// RefreshDataFromFubao 刷新富宝数据
-func RefreshDataFromFubao(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromFubao Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromFubao ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromFubao Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += ` AND source=? AND no_update = 0 `
-	pars = append(pars, utils.DATA_SOURCE_FUBAO)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return err
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	fmt.Println("Fubao刷新结束")
-	return err
-}
-
-// RefreshDataFromBloomberg 刷新Bloomberg
-func RefreshDataFromBloomberg(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromBloomberg Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromBloomberg ErrMsg:"+err.Error(), 3)
-		}
-		if len(errMsgList) > 0 {
-			errMsg := "RefreshDataFromBloomberg Err:" + strings.Join(errMsgList, "\n")
-			fmt.Println(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += ` AND source = ? AND no_update = 0 `
-	pars = append(pars, utils.DATA_SOURCE_BLOOMBERG)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return err
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	fmt.Println("Bloomberg刷新结束")
-	return err
-}
-
-// RefreshDataFromCCF 刷新CCF化纤信息
-func RefreshDataFromCCF(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("RefreshDataFromCCF err: %v", err)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshDataFromCCF ErrMsg: %s", strings.Join(errMsgList, "\n"))
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		wg.Done()
-	}()
-
-	var condition string
-	var pars []interface{}
-	condition += ` AND source = ? AND no_update = 0 `
-	pars = append(pars, utils.DATA_SOURCE_CCF)
-
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return err
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
-			continue
-		}
-	}
-	fmt.Println("CCF化纤信息刷新结束")
-	return err
-}
-
 // RefreshBaseDataFromSource
 // @Description: 刷新基础数据
 // @author: Roc

services/data/edb_info_calculate.go

@@ -1,277 +0,0 @@
-package data
-
-import (
-	"eta_gn/eta_task/models/data_manage"
-	"fmt"
-	"strings"
-)
-
-type CalculateItems struct {
-	EdbInfoId int
-	DataMap   map[string]float64
-}
-
-func CheckFormula(formula string) map[string]string {
-	mathFormula := []string{"MAX", "MIN", "ABS", "ACOS", "ASIN", "CEIL", "MOD", "POW", "ROUND", "SIGN", "SIN", "TAN", "LOG10", "LOG2", "LOG"}
-
-	str := strings.ToUpper(formula)
-	for _, v := range mathFormula {
-		str = strings.Replace(str, v, "", -1)
-	}
-	str = strings.Replace(str, "(", "", -1)
-	str = strings.Replace(str, ")", "", -1)
-
-	byteMap := make(map[string]string)
-	for i := 0; i < len(str); i++ {
-		byteInt := str[i]
-		if byteInt >= 65 && byteInt <= 90 {
-			byteStr := string(byteInt)
-			if _, ok := byteMap[byteStr]; !ok {
-				byteMap[byteStr] = byteStr
-			}
-		}
-	}
-	return byteMap
-}
-
-func ReplaceFormula(edbInfoIdArr []*data_manage.EdbInfo, valArr map[int]float64, formulaMap map[string]string, formulaStr string, edbInfoIdBytes []string) string {
-	funMap := GetFormulaMap()
-	for k, v := range funMap {
-		formulaStr = strings.Replace(formulaStr, k, v, -1)
-	}
-
-	replaceCount := 0
-	for dk, dv := range edbInfoIdArr {
-		if dk == 0 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 1 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 2 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 3 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 4 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 5 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 6 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 7 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 8 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 9 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 10 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 11 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 12 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 13 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 14 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 15 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 16 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 17 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 18 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 19 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-	}
-	for k, v := range funMap {
-		formulaStr = strings.Replace(formulaStr, v, k, -1)
-	}
-	if replaceCount == len(formulaMap) {
-		return formulaStr
-	} else {
-		return ""
-	}
-}
-
-func GetFormulaMap() map[string]string {
-	funMap := make(map[string]string)
-	funMap["MAX"] = "[@@]"
-	funMap["MIN"] = "[@!]"
-	funMap["ABS"] = "[@#]"
-	funMap["CEIL"] = "[@$]"
-	funMap["COS"] = "[@%]"
-	funMap["FLOOR"] = "[@^]"
-	funMap["MOD"] = "[@&]"
-	funMap["POW"] = "[@*]"
-	funMap["ROUND"] = "[@(]"
-	return funMap
-}
-
-// 修复计算指标与基础指标的关联关系
-func FixEdbInfoCalculateMapping() {
-	fmt.Println("start")
-	data_manage.FixEdbInfoCalculateMapping()
-	fmt.Println("end")
-}

services/data/edb_info_sync.go

@@ -7,45 +7,6 @@ import (
 	"sync"
 )
 
-var lock sync.Mutex
-
-// 同步钢炼数据
-func SyncGlDataBase() {
-	lock.Lock()
-	var err error
-	defer func() {
-		if err != nil {
-			utils.FileLog.Info("SyncGlDataBase Err:" + err.Error())
-		}
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return
-	}
-	for _, v := range items {
-		err = data_manage.RefreshEdbDataByGl(v.EdbInfoId, v.EdbCode, v.StartDate.Format(utils.FormatDate), "")
-		if err != nil {
-			return
-		}
-
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, utils.DATA_SUB_SOURCE_EDB, v.EdbCode)
-		if err != nil {
-			return
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return
-			}
-		}
-	}
-	lock.Unlock()
-}
-
 var manualLock sync.Mutex
 
 // SyncManualDataBase 同步手工数据

services/data/future_good/base_future_good_lib.go

@@ -1,69 +0,0 @@
-package future_good
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models"
-	"eta_gn/eta_task/utils"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-// AddEdbData 添加指标数据
-func AddEdbData(futureGoodEdbCode string) (resp *models.BaseResponse, err error) {
-	param := make(map[string]interface{})
-	param["EdbCode"] = futureGoodEdbCode
-	urlStr := `future_good/add`
-	resp, err = postRefreshEdbData(param, urlStr)
-	return
-}
-
-// RefreshEdbData 刷新指标数据
-func RefreshEdbData(futureGoodEdbInfoId int, futureGoodEdbCode, startDate string) (resp *models.BaseResponse, err error) {
-	param := make(map[string]interface{})
-	param["FutureGoodEdbCode"] = futureGoodEdbCode
-	param["FutureGoodEdbInfoId"] = futureGoodEdbInfoId
-	param["StartDate"] = startDate
-	urlStr := `future_good/refresh`
-	resp, err = postRefreshEdbData(param, urlStr)
-	return
-}
-
-// postRefreshEdbData 刷新指标数据
-func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
-	postUrl := utils.EDB_LIB_URL + urlStr
-	postData, err := json.Marshal(param)
-	if err != nil {
-		return
-	}
-	result, err := HttpPost(postUrl, string(postData), "application/json")
-	if err != nil {
-		return
-	}
-	utils.FileLog.Info("postRefreshEdbData:" + postUrl + ";" + string(postData) + ";result:" + string(result))
-	err = json.Unmarshal(result, &resp)
-	if err != nil {
-		return
-	}
-	return resp, nil
-}
-
-func HttpPost(url, postData string, params ...string) ([]byte, error) {
-	body := ioutil.NopCloser(strings.NewReader(postData))
-	client := &http.Client{}
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	contentType := "application/x-www-form-urlencoded;charset=utf-8"
-	if len(params) > 0 && params[0] != "" {
-		contentType = params[0]
-	}
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("authorization", utils.MD5(utils.APP_EDB_LIB_NAME_EN+utils.EDB_LIB_Md5_KEY))
-	resp, err := client.Do(req)
-	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
-	//fmt.Println("HttpPost:" + string(b))
-	return b, err
-}

services/data/future_good/future_good_edb_info.go

@@ -1,73 +0,0 @@
-package future_good
-
-import (
-	"errors"
-	"eta_gn/eta_task/models/data_manage/future_good"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// RefreshFutureGoodDataFromThs 刷新同花顺的商品期货数据
-func RefreshFutureGoodDataFromThs() (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("RefreshFutureGoodDataFromThs Err: %v", err)
-			//fmt.Println(tips)
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		if len(errMsgList) > 0 {
-			tips := fmt.Sprintf("RefreshFutureGoodDataFromThs部分商品刷新失败, ErrMsg: %s", strings.Join(errMsgList, "\n"))
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-	var condition string
-	var pars []interface{}
-	// 查询继续更新的指标
-	condition += " AND is_stop=? "
-	pars = append(pars, 0)
-	//condition += " AND exchange=? "
-	//pars = append(pars, "上海期货")
-
-	list, err := future_good.GetFutureGoodEdbInfoList(condition, pars)
-	if err != nil {
-		err = errors.New("GetEdbInfoByCondition:" + err.Error())
-		return
-	}
-
-	lenList := len(list)
-	fmt.Println("总共", lenList, "条")
-
-	// 简单限制一下请求速度, 同花顺EDB函数限制为5/s
-	ticker := time.NewTicker(250 * time.Millisecond)
-	defer ticker.Stop()
-	for k, v := range list {
-		<-ticker.C
-
-		fmt.Println("剩余", lenList-k-1, "条")
-		fmt.Println("编码:", v.FutureGoodEdbCode, ";名称:", v.FutureGoodEdbName)
-		var startDateTime time.Time
-		startDateTime = v.EndDate
-		// 如果指标结束日期不是空的话,那么就按照刷配置的刷新周期进行兼容性的刷新吧
-		if v.EndDate.IsZero() {
-			startDateTime = time.Now()
-		}
-		startDate := startDateTime.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		resp, err := RefreshEdbData(v.FutureGoodEdbInfoId, v.FutureGoodEdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, fmt.Sprint(v.FutureGoodEdbCode, "；刷新数据失败,err:", err.Error()))
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, fmt.Sprint(v.FutureGoodEdbCode, "；刷新数据失败,err:", resp.Msg, ";ErrMsg:", resp.ErrMsg))
-			continue
-		}
-
-	}
-	return err
-}

services/data/old_refresh.go

@@ -1,295 +0,0 @@
-package data
-
-import (
-	"errors"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strings"
-	"sync"
-)
-
-// RefreshDataFromDl 刷新广期所数据
-func RefreshDataFromGz(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			errMsg := "刷新广期所数据 ErrMsg:" + err.Error()
-			utils.FileLog.Info(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-
-		if len(errMsgList) > 0 {
-			utils.FileLog.Info("刷新广期所数据 Err：" + strings.Join(errMsgList, "\n"))
-			go alarm_msg.SendAlarmMsg("刷新广期所数据 Err："+strings.Join(errMsgList, "\n"), 3)
-		}
-		wg.Done()
-	}()
-
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GFEX)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, tmpErr := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, fmt.Sprintf("指标ID：%d；指标编码：%s；err：%s", v.EdbInfoId, v.EdbCode, tmpErr.Error()))
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, fmt.Sprintf("指标ID：%d；指标编码：%s；msg：%s；errMsg：%s", v.EdbInfoId, v.EdbCode, resp.Msg, resp.ErrMsg))
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromDl 刷新大商所数据
-func RefreshDataFromDl(wg *sync.WaitGroup) (err error) {
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			errMsg := "刷新大商所数据 ErrMsg:" + err.Error()
-			utils.FileLog.Info(errMsg)
-			go alarm_msg.SendAlarmMsg(errMsg, 3)
-		}
-
-		if len(errMsgList) > 0 {
-			utils.FileLog.Info("刷新大商所数据 Err：" + strings.Join(errMsgList, "\n"))
-			go alarm_msg.SendAlarmMsg("刷新大商所数据 Err："+strings.Join(errMsgList, "\n"), 3)
-		}
-		wg.Done()
-	}()
-
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_DL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, tmpErr := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			errMsgList = append(errMsgList, fmt.Sprintf("指标ID：%d；指标编码：%s；err：%s", v.EdbInfoId, v.EdbCode, tmpErr.Error()))
-			continue
-		}
-		if resp.Ret != 200 {
-			errMsgList = append(errMsgList, fmt.Sprintf("指标ID：%d；指标编码：%s；msg：%s；errMsg：%s", v.EdbInfoId, v.EdbCode, resp.Msg, resp.ErrMsg))
-			continue
-		}
-	}
-	return err
-}
-
-// RefreshDataFromCffex 刷新中金所数据
-func RefreshDataFromCffex(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromCffex Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromCffex ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_CFFEX)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromShfe 刷新上期能源数据
-func RefreshDataFromShfe(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromShfe Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromShfe ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_SHFE)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromSh 刷新上期所数据
-func RefreshDataFromSh(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromSh Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromSh ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_SH)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromZz 刷新郑商所数据
-func RefreshDataFromZz(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromZz Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromZz ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_ZZ)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}

services/data/server_check.go

@@ -1,77 +0,0 @@
-package data
-
-import (
-	"context"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"strings"
-)
-
-//服务检测
-
-// CheckWindDataInterface 检测wind数据服务器
-func CheckWindDataInterface(cont context.Context) (err error) {
-	if utils.WindServerUrl != "" {
-		windServerUrlArr := strings.Split(utils.WindServerUrl, ",")
-		for _, hzDataWindUrl := range windServerUrlArr {
-			go func(urlStr string) {
-				checkUrl := urlStr + `hz_server`
-				body, err := http.Get(checkUrl)
-				if err != nil {
-					msg := fmt.Sprintf("检测：%s ；失败：CheckWindDataInterface ErrMsg:%s", checkUrl, err.Error())
-					go alarm_msg.SendAlarmMsg(msg, 3)
-				} else {
-					result := string(body)
-					if result != `1` {
-						msg := fmt.Sprintf("检测%s ；失败：CheckWindDataInterface ErrMsg:%s", checkUrl, string(body))
-						go alarm_msg.SendAlarmMsg(msg, 3)
-					}
-				}
-			}(hzDataWindUrl)
-		}
-	}
-	return
-}
-
-// CheckLtDataInterface 检测路透数据服务器
-func CheckLtDataInterface(cont context.Context) (err error) {
-	if utils.LtServerUrl != "" {
-		go func() {
-			checkUrl := utils.LtServerUrl + `hz_server`
-			body, err := http.Get(checkUrl)
-			if err != nil {
-				msg := "检测路透数据服务器失败：CheckLtDataInterface ErrMsg:" + err.Error()
-				go alarm_msg.SendAlarmMsg(msg, 3)
-			} else {
-				result := string(body)
-				if result != `"ek true"` {
-					msg := "检测路透数据服务器失败：CheckLtDataInterface ErrMsg:" + string(body)
-					go alarm_msg.SendAlarmMsg(msg, 3)
-				}
-			}
-		}()
-	}
-	return
-}
-
-func CheckPbDataInterface(cont context.Context) (err error) {
-	if utils.PbServerUrl != "" {
-		go func() {
-			checkUrl := utils.PbServerUrl + `hz_server`
-			body, err := http.Get(checkUrl)
-			if err != nil {
-				msg := "检测彭博数据服务器失败：CheckPbDataInterface ErrMsg:" + err.Error()
-				go alarm_msg.SendAlarmMsg(msg, 3)
-			} else {
-				result := string(body)
-				if result != "1" {
-					msg := "检测彭博数据服务器失败：CheckPbDataInterface ErrMsg:" + string(body)
-					go alarm_msg.SendAlarmMsg(msg, 3)
-				}
-			}
-		}()
-	}
-	return
-}

services/data_stat/edb_info_stat.go

@@ -10,6 +10,7 @@ import (
 
 // SetEdbSourceStatTask 设置数据源指标更新情况定时任务
 func SetEdbSourceStatTask(cont context.Context) (err error) {
+	return
 	now := time.Now().Format(utils.FormatDate)
 	if now <= "2023-12-04" { //上线之后隔天再执行
 		return

services/edb_refresh.go

@@ -2,9 +2,6 @@ package services
 
 import (
 	"context"
-	"encoding/json"
-	"eta_gn/eta_task/models"
-	"eta_gn/eta_task/models/data_manage"
 	"eta_gn/eta_task/models/data_manage/edb_refresh"
 	"eta_gn/eta_task/services/alarm_msg"
 	"eta_gn/eta_task/services/data"
@@ -567,216 +564,6 @@ func getPreviousHalfHour(now time.Time) string {
 	return fmt.Sprintf("%02d:%02d", now.Hour(), 0)
 }
 
-// 根据配置把钢联化工和wind指标设置成禁止刷新
-func DisableEdbRefresh(cont context.Context) (err error) {
-	//设置刷新key，如果没有执行完 报错提示
-	cacheKey := "eta_task:DisableEdbRefresh"
-	deleteCache := true
-	defer func() {
-		if deleteCache {
-			utils.Rc.Delete(cacheKey)
-		}
-		if err != nil {
-			tips := "DisableEdbRefresh-钢联化工和wind指标设置成禁止刷新失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 2*time.Minute) {
-		deleteCache = false
-		err = fmt.Errorf("系统处理中，请稍后重试！")
-		return
-	}
-	//查询配置，如果未开启自动设置禁止刷新，则无需处理
-	obj := new(models.BusinessConf)
-	conf, err := obj.GetItemByConfKey("EdbStopRefreshRule")
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			err = fmt.Errorf("未找到配置项，无需处理")
-			return
-		}
-		return
-	}
-	//将json转为结构体
-	rule := new(models.EdbStopRefreshRule)
-	err = json.Unmarshal([]byte(conf.ConfVal), rule)
-	if err != nil {
-		return
-	}
-	//判断是否开启自动设置禁止刷新
-	if rule.IsOpen == 0 {
-		return
-	}
-
-	//获取当前时间
-	now := time.Now()
-	if rule.BaseIndexStopDays > 0 { //设置数据源钢联化工指标禁止更新
-		baseIndexEndDate := now.AddDate(0, 0, -rule.BaseIndexStopDays+1).Format(utils.FormatDate)
-
-		// 查询钢联化工指标，查询创建时间在baseIndexStartDate前，的所有钢联化工指标，分批查询，先查总数，再查列表
-		totalCount, e := data_manage.GetCountRefreshBaseFromMysteelChemicalIndexItemByCreateTime(baseIndexEndDate)
-		if e != nil {
-			err = fmt.Errorf("查询钢联化工指标总数失败：%v", e)
-			return
-		}
-
-		//分页查询
-		pageSize := 100
-		pageNum := (int(totalCount) + 99) / pageSize // 使用整数除法，并添加一页以防有余数
-		stopRefreshIds := make([]int32, 0)
-		for i := 0; i < pageNum; i++ {
-			start := i * pageSize
-			indexItems, e := data_manage.GetRefreshBaseFromMysteelChemicalIndexItemByCreateTime(baseIndexEndDate, start, pageSize)
-			if e != nil {
-				err = fmt.Errorf("分页查询钢联化工指标失败：%v", e)
-				return
-			}
-			if len(indexItems) == 0 {
-				continue
-			}
-			indexCodeList := make([]string, 0)
-			for _, indexItem := range indexItems {
-				indexCodeList = append(indexCodeList, indexItem.IndexCode)
-			}
-			condition := ` AND source=? AND edb_code in (` + utils.GetOrmInReplace(len(indexCodeList)) + `)`
-			var pars []interface{}
-			pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, indexCodeList)
-
-			// 查询指标库里这些指标是否已创建
-			edbList, e := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-			if e != nil {
-				err = fmt.Errorf("查询指标库里这些指标是否被创建失败：%v", e)
-				return
-			}
-			edbMap := make(map[string]bool)
-			for _, edb := range edbList {
-				edbMap[edb.EdbCode] = true
-			}
-			for _, indexItem := range indexItems {
-				// 判断指标是否被创建
-				if _, ok := edbMap[indexItem.IndexCode]; !ok {
-					stopRefreshIds = append(stopRefreshIds, indexItem.BaseFromMysteelChemicalIndexId)
-					if len(stopRefreshIds) > 100 {
-						err = data_manage.SetStopRefreshMysteelChemicalIndex(stopRefreshIds)
-						if err != nil {
-							err = fmt.Errorf("设置禁止刷新失败：%v", err)
-							return
-						}
-						stopRefreshIds = make([]int32, 0)
-					}
-				}
-			}
-		}
-		// 未被创建，则设置禁止刷新
-		if len(stopRefreshIds) > 0 {
-			err = data_manage.SetStopRefreshMysteelChemicalIndex(stopRefreshIds)
-			if err != nil {
-				err = fmt.Errorf("设置禁止刷新失败：%v", err)
-				return
-			}
-		}
-	}
-
-	if rule.EdbStopDays > 0 {
-		// 查询钢联和wind来源的指标
-		edbEndDate := now.AddDate(0, 0, -rule.EdbStopDays+1).Format(utils.FormatDate)
-
-		condition := ` AND no_update=0 AND source in (?,?) AND create_time < ?`
-		var pars []interface{}
-		pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_WIND, edbEndDate)
-		// 查询钢联化工指标和wind指标 分批查询，先查总数，再查列表
-		totalCount, e := data_manage.GetEdbInfoCountByCondition(condition, pars)
-		if e != nil {
-			err = fmt.Errorf("查询钢联化工指标总数失败：%v", e)
-			return
-		}
-
-		//分页查询
-		pageSize := 100
-		pageNum := (int(totalCount) + 99) / pageSize // 使用整数除法，并添加一页以防有余数
-		stopRefreshIds := make([]int, 0)
-		stopRefreshMysteelCode := make([]string, 0)
-		fromEdbIdList := make([]int, 0)
-		for i := 0; i < pageNum; i++ {
-			start := i * pageSize
-			edbItems, e := data_manage.GetEdbInfoPageByCondition(condition, pars, start, pageSize)
-			if e != nil {
-				err = fmt.Errorf("分页查询钢联化工指标失败：%v", e)
-				return
-			}
-			if len(edbItems) == 0 {
-				continue
-			}
-			edbInfoIds := make([]int, 0)
-			fromEdbIdList = make([]int, 0)
-			for _, item := range edbItems {
-				edbInfoIds = append(edbInfoIds, item.EdbInfoId)
-			}
-			// 查询指标库里这些指标 引用情况
-			relationList, e := data_manage.GetEdbInfoRelationByEdbInfoIds(edbInfoIds)
-			if e != nil {
-				err = fmt.Errorf("查询指标库里这些指标是否被创建失败：%v", e)
-				return
-			}
-			edbMap := make(map[int]struct{})
-			for _, item := range relationList {
-				edbMap[item] = struct{}{}
-			}
-			for _, item := range edbItems {
-				if _, ok := edbMap[item.EdbInfoId]; !ok {
-					stopRefreshIds = append(stopRefreshIds, item.EdbInfoId)
-					if item.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-						stopRefreshMysteelCode = append(stopRefreshMysteelCode, item.EdbCode)
-					}
-					if item.EdbInfoType == 0 && item.EdbType == 1 {
-						fromEdbIdList = append(fromEdbIdList, item.EdbInfoId)
-					}
-					// 更新指标禁止刷新状态
-					if len(stopRefreshIds) > 100 {
-						// 查询相关的计算指标
-						calculateEdbIdList := make([]int, 0)
-						if len(fromEdbIdList) > 0 {
-							hasFind := make(map[int]struct{})
-							calculateEdbIdList, err = GetCalculateEdbByFromEdbInfo(fromEdbIdList, calculateEdbIdList, hasFind)
-							if err != nil {
-								err = fmt.Errorf("查询计算指标信息失败：%v", err)
-								return
-							}
-						}
-						err = data_manage.ModifyEdbUpdateStatus(stopRefreshIds, stopRefreshMysteelCode, calculateEdbIdList)
-						if err != nil {
-							err = fmt.Errorf("更新指标禁止刷新状态失败：%v", err)
-							return
-						}
-						stopRefreshIds = []int{}
-						stopRefreshMysteelCode = []string{}
-					}
-				}
-			}
-		}
-
-		// 更新指标禁止刷新状态
-		if len(stopRefreshIds) > 0 {
-			// 查询相关的计算指标
-			calculateEdbIdList := make([]int, 0)
-			if len(fromEdbIdList) > 0 {
-				hasFind := make(map[int]struct{})
-				calculateEdbIdList, err = GetCalculateEdbByFromEdbInfo(fromEdbIdList, calculateEdbIdList, hasFind)
-				if err != nil {
-					err = fmt.Errorf("查询计算指标信息失败：%v", err)
-					return
-				}
-			}
-			err = data_manage.ModifyEdbUpdateStatus(stopRefreshIds, stopRefreshMysteelCode, calculateEdbIdList)
-			if err != nil {
-				err = fmt.Errorf("更新指标禁止刷新状态失败：%v", err)
-				return
-			}
-		}
-	}
-	return
-}
-
 // ConfigRefreshDataGn 根据配置刷新指标数据
 func ConfigRefreshDataGn(cont context.Context) (err error) {
 	errMsgList := make([]string, 0)

services/eia_steo.go

@@ -1,277 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// SyncEiaSteoIndex EIA STEO报告 指标
-func SyncEiaSteoIndex() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromEiaSteoIndexMaxCreateDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_EIA_STEO
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncEiaSteoIndex", method, data)
-	if err != nil {
-		fmt.Println("HttpPost err:", err)
-		utils.FileLog.Info("HttpPost err:", err)
-		return
-	}
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.EiaSteoIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		fmt.Println("json.Unmarshal err:" + err.Error())
-		return err
-	}
-	//获取所有指标信息  某一天的
-	/*allIndex, err := data_manage.GetBaseFromEiaSteoIndexAll(startDate)
-	if err != nil {
-		fmt.Println("get GetBaseFromEiaSteoIndexAll err:" + err.Error())
-		return
-	}
-
-	existIndexMap := make(map[string]*data_manage.BaseFromEiaSteoIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.IndexCode] = v
-	}*/
-
-	for _, zv := range respObj.Data {
-		//if _, ok := existIndexMap[zv.IndexCode]; !ok {
-		if zv.BaseFromEiaSteoIndexId <= 0 {
-			continue
-		}
-		newID, err := data_manage.InsertOrUpdateBaseFromEiaSteoIndex(zv)
-		if err != nil {
-			fmt.Println("InsertOrUpdateBaseFromEiaSteoIndex error:", err)
-		}
-		fmt.Println("InsertOrUpdateBaseFromEiaSteoIndex new indexID:", newID)
-		//}
-	}
-	return err
-}
-
-// SyncEiaSteoIndexData EIA STEO报告 指标
-func SyncEiaSteoIndexData() (err error) {
-	startDate := time.Now().Format(utils.FormatDate) + " 00:00:00"
-
-	method := `index/data/list`
-
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromEiaSteoIndexAll(startDate)
-	if err != nil {
-		fmt.Println("get GetBaseFromEiaSteoIndexAll err:" + err.Error())
-		return
-	}
-	for _, zv := range allIndex {
-
-		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_EIA_STEO
-		data["StartDate"] = startDate
-		data["IndexCode"] = zv.IndexCode
-
-		var result string
-		result, err = HttpPost("SyncEiaSteoIndexData", method, data)
-		if err != nil {
-			fmt.Println("HttpPost err:", err)
-			utils.FileLog.Info("HttpPost err:", err)
-			return
-		}
-		utils.FileLog.Info(result)
-		fmt.Println(result)
-
-		respObj := new(data_manage.EiaSteoIndexDataResp)
-		err = json.Unmarshal([]byte(result), &respObj)
-		if err != nil {
-			fmt.Println("json.Unmarshal err:" + err.Error())
-			return err
-		}
-
-		existDataMap := make(map[int]*data_manage.BaseFromEiaSteoData)
-		allData, err1 := data_manage.GetBaseFromEiaSteoIndexDataAll(startDate)
-		if err1 != nil {
-			fmt.Println("get GetBaseFromEiaSteoIndexDataAll err:" + err1.Error())
-			return
-		}
-		for _, dv := range allData {
-			existDataMap[dv.BaseFromEiaSteoDataId] = dv
-		}
-
-		for _, dv := range respObj.Data {
-			if _, ok := existDataMap[dv.BaseFromEiaSteoDataId]; !ok {
-				newID, err := data_manage.AddBaseFromEiaSteoData(dv)
-				if err != nil {
-					fmt.Println("insert error:", err)
-				}
-				fmt.Println("insert new indexID:", newID)
-			}
-		}
-	}
-	return err
-}
-
-// EIA STEO报告-分类
-func SyncEiaSteoClassify() (err error) {
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_EIA_STEO
-	method := `classify/list`
-	result, err := HttpPost("SyncEiaSteoClassify", method, data)
-	if err != nil {
-		fmt.Println("SyncEiaSteoClassify HttpPost Err:", err.Error())
-		return err
-	}
-	utils.FileLog.Info("SyncEiaSteoClassify:" + result)
-	fmt.Println("SyncEiaSteoClassify result:", result)
-
-	respObj := new(data_manage.EiaSteoClassifyDataResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allClassify, err := data_manage.GetBaseFromEiaSteoClassifyAll()
-	if err != nil {
-		return
-	}
-
-	existClassifyMap := make(map[int]*data_manage.BaseFromEiaSteoClassify)
-	for _, v := range allClassify {
-		existClassifyMap[v.BaseFromEiaSteoClassifyId] = v
-	}
-
-	for _, item := range respObj.Data {
-		if oldClassify, ok := existClassifyMap[item.BaseFromEiaSteoClassifyId]; !ok {
-			newID, err := data_manage.AddBaseEiaSteoClassify(item)
-			if err != nil {
-				fmt.Println("InsertOrUpdateBaseEiaSteoClassify error:", err)
-			}
-			fmt.Println("InsertOrUpdateBaseEiaSteoClassify new indexID:", newID)
-		} else {
-			var upDateCols []string
-			if oldClassify.ClassifyName != item.ClassifyName {
-				oldClassify.ClassifyName = item.ClassifyName
-				upDateCols = append(upDateCols, "ClassifyName")
-			}
-			if oldClassify.ClassifyNameOriginal != item.ClassifyNameOriginal {
-				oldClassify.ClassifyNameOriginal = item.ClassifyNameOriginal
-				upDateCols = append(upDateCols, "ClassifyNameOriginal")
-			}
-			if oldClassify.ParentId != item.ParentId {
-				oldClassify.ParentId = item.ParentId
-				upDateCols = append(upDateCols, "ParentId")
-			}
-			if oldClassify.Level != item.Level {
-				oldClassify.Level = item.Level
-				upDateCols = append(upDateCols, "Level")
-			}
-			if len(upDateCols) > 0 {
-				oldClassify.ModifyTime = time.Now()
-				upDateCols = append(upDateCols, "ModifyTime")
-				err := oldClassify.Update(upDateCols)
-				if err != nil {
-					fmt.Println("UpdateBaseFromEiaSteoClassify error:", err)
-				}
-			}
-			delete(existClassifyMap, oldClassify.BaseFromEiaSteoClassifyId)
-		}
-	}
-	var deleteId []int
-	for k, _ := range existClassifyMap {
-		deleteId = append(deleteId, k)
-	}
-	err = data_manage.BatchDeleteBaseFromEiaSteoClassify(deleteId)
-	if err != nil {
-		fmt.Println("BatchDeleteBaseFromEiaSteoClassify error:", err)
-	}
-	return err
-}
-
-func SyncEiaSteoIndexDataV2() (err error) {
-	startDate := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-
-	method := `index/data/list`
-
-	//获取所有指标信息  某一天的
-	allIndexCode, err := data_manage.GetBaseFromEiaSteoIndexCodeListByDate(startDate)
-	if err != nil {
-		fmt.Println("get GetBaseFromEiaSteoIndexAll err:" + err.Error())
-		utils.FileLog.Info("get GetBaseFromEiaSteoIndexCodeList err:", err)
-		return
-	}
-
-	for _, indexCode := range allIndexCode {
-		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_EIA_STEO
-		data["StartDate"] = startDate
-		data["IndexCode"] = indexCode
-
-		var result string
-		result, err = HttpPost("SyncEiaSteoIndexData", method, data)
-		if err != nil {
-			fmt.Println("HttpPost err:", err)
-			utils.FileLog.Info("HttpPost err:", err)
-			return
-		}
-		utils.FileLog.Info(result)
-		fmt.Println(result)
-
-		respObj := new(data_manage.EiaSteoIndexDataResp)
-		err = json.Unmarshal([]byte(result), &respObj)
-		if err != nil {
-			fmt.Println("json.Unmarshal err:" + err.Error())
-			return err
-		}
-
-		existDataMap := make(map[int]*data_manage.BaseFromEiaSteoData)
-		allData, err1 := data_manage.GetBaseFromEiaSteoIndexDataByIndexCode(indexCode, startDate)
-		if err1 != nil {
-			utils.FileLog.Error("get GetBaseFromEiaSteoIndexDataByDate err:", err1.Error())
-			return
-		}
-		for _, dv := range allData {
-			existDataMap[dv.BaseFromEiaSteoDataId] = dv
-		}
-
-		for _, dv := range respObj.Data {
-			if v, ok := existDataMap[dv.BaseFromEiaSteoDataId]; !ok {
-				newID, err := data_manage.AddBaseFromEiaSteoData(dv)
-				if err != nil {
-					utils.FileLog.Error("add error:", err)
-				}
-				fmt.Println("insert new indexID:", newID)
-			} else {
-				upDateCols := make([]string, 0)
-				if !v.DataTime.Equal(dv.DataTime) {
-					v.DataTime = dv.DataTime
-					upDateCols = append(upDateCols, "data_time")
-				}
-				if v.Value != dv.Value {
-					v.Value = dv.Value
-					v.ModifyTime = dv.ModifyTime
-					upDateCols = append(upDateCols, []string{"value", "modify_time"}...)
-				}
-				if len(upDateCols) > 0 {
-					err = v.Update(upDateCols)
-					if err != nil {
-						utils.FileLog.Error("update error:", err)
-					}
-				}
-			}
-		}
-	}
-	return err
-}

services/eic.go

@@ -1,57 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 天然气
-func SyncRankingFromEic() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromEicIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_GIE
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromEic", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.EicIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromEicIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeEicIndexV2)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromEicIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromEicIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromEicIndexV2(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}
-

services/eta_bridge/demo.go

@@ -1,227 +0,0 @@
-package eta_bridge
-
-import (
-	"context"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-)
-
-// SyncIndexList
-// @Description: 定时同步ETA指标信息变更数据至第三方
-// @author: Roc
-// @datetime 2024-02-28 14:00:45
-// @param cont context.Context
-// @return err error
-func SyncIndexList(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "SyncIndexList-定时同步ETA指标信息变更数据至第三方失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	var condition string
-	var pars []interface{}
-	condition += " AND update_type in (?,?) "
-	pars = append(pars, 1, 2)
-
-	list, err := data_manage.GetEdbInfoUpdateLogByCondition(condition, pars)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	dataList := make([]PushIndexParamDataReq, 0)
-	for _, v := range list {
-		dataList = append(dataList, PushIndexParamDataReq{
-			SourceIndexCode:  v.EdbCode,
-			IndexCode:        fmt.Sprint(v.Source, "_", v.EdbCode),
-			IndexName:        v.EdbName, //todo
-			IndexShortName:   v.EdbName,
-			FrequenceName:    v.Frequency,
-			UnitName:         v.Unit,
-			AssetBeginDate:   v.StartDate,
-			AssetEndDate:     v.EndDate,
-			CreateUser:       v.SysUserRealName,
-			IndexCreateTime:  v.CreateTime.Format(utils.FormatDateTime), //todo
-			UpdateUser:       v.UpdateSysUserRealName,
-			DetailUpdateTime: v.CreateTime.Format(utils.FormatDateTime), //todo
-			IndexUpdateTime:  v.CreateTime.Format(utils.FormatDateTime), //todo
-			OrginSource:      v.SourceName,
-			OrginSysSource:   v.SourceName, // todo
-			SysSource:        "产研平台",   //todo
-			SourceType:       "RPA",        //TODO
-			Status:           1,
-		})
-	}
-
-	lenData := len(dataList)
-	if lenData <= 0 {
-		return
-	}
-
-	req := PushBaseParamReq{
-		SerialID:    utils.GetRandString(32), //todo
-		TableCode:   "",
-		Total:       lenData,
-		IsEmailWarn: 0,
-		Data:        dataList,
-	}
-
-	uri := "/xy/index/pushIndexData"
-	_, e, errMsg := HttpEtaBridgePost(uri, req)
-	if e != nil {
-		err = fmt.Errorf("postRefreshEdbData err: %s", e.Error())
-		fmt.Println(err)
-		return
-	}
-	fmt.Println(errMsg)
-	//if res != nil && res.Ret != 200 {
-	//	err = fmt.Errorf("postRefreshEdbData fail")
-	//	return
-	//}
-	return
-}
-
-// SyncIndexValueList
-// @Description: 定时同步ETA指标日期值的变更数据至第三方
-// @author: Roc
-// @datetime 2024-02-28 14:00:45
-// @param cont context.Context
-// @return err error
-func SyncIndexValueList(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "SyncIndexList-定时同步ETA指标信息变更数据至第三方失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	var condition string
-	var pars []interface{}
-	condition += " AND update_type = ? "
-	pars = append(pars, 0)
-
-	list, err := data_manage.GetEdbInfoUpdateLogByCondition(condition, pars)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	dataList := make([]PushIndexValueItemReq, 0)
-	for _, v := range list {
-		dataList = append(dataList, PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(v.Source, "_", v.SourceName, "_", v.Id)),
-			IndexCode:    fmt.Sprint(v.Source, "_", v.EdbCode),
-			Value:        fmt.Sprint(v.LatestValue),
-			BusinessDate: v.LatestDate,
-			CreateTime:   v.EdbModifyTime,
-			UpdateTime:   v.CreateTime.Format(utils.FormatDateTime), //todo,
-			Status:       "1",
-		})
-	}
-
-	lenData := len(dataList)
-	if lenData <= 0 {
-		return
-	}
-
-	req := PushBaseParamReq{
-		SerialID:    utils.GetRandString(32), //todo
-		TableCode:   "",
-		Total:       lenData,
-		IsEmailWarn: 0,
-		Data:        dataList,
-	}
-
-	uri := "/xy/index/pushIndexValue"
-	_, e, errMsg := HttpEtaBridgePost(uri, req)
-	if e != nil {
-		err = fmt.Errorf("postRefreshEdbData err: %s", e.Error())
-		fmt.Println(err)
-		return
-	}
-	fmt.Println(errMsg)
-	//if res != nil && res.Ret != 200 {
-	//	err = fmt.Errorf("postRefreshEdbData fail")
-	//	return
-	//}
-	return
-}
-
-// SyncEdbClassifyList
-// @Description: 定时同步ETA指标与分类的关系至第三方
-// @author: Roc
-// @datetime 2024-02-28 14:00:45
-// @param cont context.Context
-// @return err error
-func SyncEdbClassifyList(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			tips := "SyncIndexList-定时同步ETA指标信息变更数据至第三方失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	var condition string
-	var pars []interface{}
-
-	list, err := data_manage.GetAllEdbInfoClassifyListByCondition(condition, pars)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	dataLimitList := make([][]PushEdbClassifyItemReq, 0)
-
-	dataList := make([]PushEdbClassifyItemReq, 0)
-	for _, v := range list {
-		dataList = append(dataList, PushEdbClassifyItemReq{
-			Id:         fmt.Sprint(v.EdbInfoId),
-			ClassifyId: v.ClassifyId,
-			IndexCode:  fmt.Sprint(v.Source, "_", v.EdbCode),
-			CreateTime: v.CreateTime.Format(utils.FormatDateTime), //todo
-			CreateUser: v.SysUserRealName,
-			UpdateTime: v.ModifyTime.Format(utils.FormatDateTime), //todo
-			UpdateUser: v.SysUserRealName,
-		})
-		if len(dataList) >= 100 {
-			dataLimitList = append(dataLimitList, dataList)
-			dataList = make([]PushEdbClassifyItemReq, 0)
-		}
-	}
-
-	lenData := len(dataList)
-	if lenData > 0 {
-		dataLimitList = append(dataLimitList, dataList)
-	}
-
-	if len(dataLimitList) < 0 {
-		fmt.Println("无分类数据推送")
-		return
-	}
-	uri := utils.SyncIndexPath + "/pushEdbClassify"
-	for k, tmpDataList := range dataLimitList {
-		req := PushBaseParamReq{
-			SerialID:    utils.GetRandString(32), //todo
-			TableCode:   "",
-			Total:       len(tmpDataList),
-			IsEmailWarn: 0,
-			Data:        tmpDataList,
-		}
-
-		_, e, _ := HttpEtaBridgePost(uri, req)
-		if e != nil {
-			err = fmt.Errorf("第%d组分类数据推送失败，postRefreshEdbData err: %s", k+1, e.Error())
-			fmt.Println(err)
-			continue
-		}
-	}
-
-	return
-}

services/eta_bridge/gn.go

@@ -756,6 +756,9 @@ func LoadGnTempIndexIds() (indexIds []int, err error) {
 	return
 }
 
+// 用户同步的锁
+var lockSyncUser sync.Mutex
+
 func SyncGnUser(cont context.Context) (err error) {
 	lockSyncUser.Lock()
 	defer func() {

services/eta_bridge/handle_data.go

@@ -1,687 +0,0 @@
-package eta_bridge
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"strings"
-)
-
-// handleData
-// @Description: 监听的数据处理
-// @author: Roc
-// @datetime 2024-03-11 14:52:49
-// @param edbUpdateLog *data_manage.EdbUpdateLog
-// @return pushIndexData *PushIndexParamDataReq
-// @return pushEdbClassify *PushEdbClassifyItemReq
-// @return pushIndexValue *PushIndexValueItemReq
-// @return err error
-func handleData(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIndexParamDataReq, pushEdbClassify *PushEdbClassifyItemReq, pushIndexValue *PushIndexValueItemReq, err error) {
-	switch edbUpdateLog.OpType {
-	case "insert":
-		return handleInsert(edbUpdateLog)
-	case "update":
-		return handleUpdate(edbUpdateLog)
-	case "delete":
-		return handleDelete(edbUpdateLog)
-	}
-
-	return
-}
-
-// handleInsert
-// @Description: 新增数据处理
-// @author: Roc
-// @datetime 2024-03-11 14:53:03
-// @param edbUpdateLog *data_manage.EdbUpdateLog
-// @return pushIndexData *PushIndexParamDataReq
-// @return pushEdbClassify *PushEdbClassifyItemReq
-// @return pushIndexValue *PushIndexValueItemReq
-// @return err error
-func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIndexParamDataReq, pushEdbClassify *PushEdbClassifyItemReq, pushIndexValue *PushIndexValueItemReq, err error) {
-	data := edbUpdateLog.NewData
-
-	//指标信息
-	if edbUpdateLog.OpTableName == "edb_info" {
-		var edbInfo *data_manage.EdbInfoItem
-		err = json.Unmarshal([]byte(data), &edbInfo)
-		if err != nil {
-			return
-		}
-
-		// 预测指标不处理
-		if edbInfo.EdbInfoType == 1 {
-			return
-		}
-		// 计算指标不处理
-		if edbInfo.EdbType == 2 {
-			return
-		}
-		// 自有数据不处理
-		if edbInfo.Source == utils.DATA_SOURCE_BUSINESS {
-			return
-		}
-
-		// 获取数据源中指标的基础信息
-		origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.EdbName)
-
-		// 指标信息
-		pushIndexData = &PushIndexParamDataReq{
-			SourceIndexCode:  edbInfo.EdbCode,
-			IndexCode:        getIndexCode(edbInfo.Source, edbInfo.EdbCode),
-			IndexName:        origInfo.EdbName,
-			IndexShortName:   edbInfo.EdbName,
-			FrequenceName:    edbInfo.Frequency,
-			UnitName:         edbInfo.Unit,
-			AssetBeginDate:   edbInfo.StartDate,
-			AssetEndDate:     edbInfo.EndDate,
-			CreateUser:       edbInfo.SysUserRealName,
-			IndexCreateTime:  edbInfo.CreateTime,
-			UpdateUser:       edbInfo.SysUserRealName,
-			DetailUpdateTime: getMaxModifyTime(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbUpdateLog.CreateTime.Format(utils.FormatDateTime)),
-			IndexUpdateTime:  edbInfo.ModifyTime,
-			OrginSource:      edbInfo.SourceName,
-			OrginSysSource:   origInfo.SourceName,
-			SysSource:        "产研平台",
-			SourceType:       getSourceType(edbInfo.Source),
-			Status:           1,
-		}
-
-		// 指标与分类的关系信息
-		pushEdbClassify = &PushEdbClassifyItemReq{
-			Id:         fmt.Sprint(edbInfo.EdbInfoId),
-			ClassifyId: edbInfo.ClassifyId,
-			IndexCode:  getIndexCode(edbInfo.Source, edbInfo.EdbCode),
-			CreateTime: edbInfo.CreateTime,
-			CreateUser: edbInfo.SysUserRealName,
-			UpdateTime: edbInfo.ModifyTime,
-			UpdateUser: edbInfo.SysUserRealName,
-		}
-
-		return
-	}
-
-	// 分类信息
-	//if edbUpdateLog.OpTableName == "edb_classify" {
-	//	var edbClassify *data_manage.EdbClassify
-	//	err = json.Unmarshal([]byte(data), &edbClassify)
-	//	if err != nil {
-	//		return
-	//	}
-	//
-	//	// 指标信息
-	//	pushClassify = PushClassifyItemReq{
-	//		ClassifyId:      int(edbClassify.ClassifyID),
-	//		ClassifyType:    int(edbClassify.ClassifyType),
-	//		ClassifyName:    edbClassify.ClassifyName,
-	//		ParentId:        int(edbClassify.ParentID),
-	//		HasData:         int(edbClassify.HasData),
-	//		CreateTime:      edbClassify.CreateTime.Format(utils.FormatDateTime),
-	//		UpdateTime:      edbClassify.ModifyTime.Format(utils.FormatDateTime),
-	//		SysUserId:       int(edbClassify.SysUserID),
-	//		SysUserRealName: edbClassify.SysUserRealName,
-	//		Level:           int(edbClassify.Level),
-	//		UniqueCode:      edbClassify.UniqueCode,
-	//		SortColumn:      int(edbClassify.Sort),
-	//	}
-	//
-	//	return
-	//}
-
-	// 数据信息
-	if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_") {
-		// 计算指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_calculate") {
-			return
-		}
-		// 预测指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_predict") {
-			return
-		}
-
-		var edbData *data_manage.EdbData
-		err = json.Unmarshal([]byte(data), &edbData)
-		if err != nil {
-			return
-		}
-
-		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
-		if source <= 0 {
-			// 没有找到来源，那就过滤
-			return
-		}
-		// 数据信息
-		pushIndexValue = &PushIndexValueItemReq{
-			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
-			IndexCode:    getIndexCode(source, edbData.EdbCode),
-			Value:        fmt.Sprint(edbData.Value),
-			BusinessDate: edbData.DataTime,
-			CreateTime:   edbData.CreateTime,
-			UpdateTime:   edbData.ModifyTime,
-			Status:       "1",
-		}
-
-		return
-	}
-
-	return
-}
-
-// handleDelete
-// @Description: 删除数据处理
-// @author: Roc
-// @datetime 2024-03-11 14:53:20
-// @param edbUpdateLog *data_manage.EdbUpdateLog
-// @return pushIndexData *PushIndexParamDataReq
-// @return pushEdbClassify *PushEdbClassifyItemReq
-// @return pushIndexValue *PushIndexValueItemReq
-// @return err error
-func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIndexParamDataReq, pushEdbClassify *PushEdbClassifyItemReq, pushIndexValue *PushIndexValueItemReq, err error) {
-	data := edbUpdateLog.OldData
-
-	//指标信息
-	if edbUpdateLog.OpTableName == "edb_info" {
-		var edbInfo *data_manage.EdbInfoItem
-		err = json.Unmarshal([]byte(data), &edbInfo)
-		if err != nil {
-			return
-		}
-
-		// 预测指标不处理
-		if edbInfo.EdbInfoType == 1 {
-			return
-		}
-		// 计算指标不处理
-		if edbInfo.EdbType == 2 {
-			return
-		}
-		// 自有数据不处理
-		if edbInfo.Source == utils.DATA_SOURCE_BUSINESS {
-			return
-		}
-
-		// 获取数据源中指标的基础信息
-		origInfo := getOrigInfo(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.EdbName)
-
-		// 指标信息
-		pushIndexData = &PushIndexParamDataReq{
-			SourceIndexCode:  edbInfo.EdbCode,
-			IndexCode:        getIndexCode(edbInfo.Source, edbInfo.EdbCode),
-			IndexName:        origInfo.EdbName,
-			IndexShortName:   edbInfo.EdbName,
-			FrequenceName:    edbInfo.Frequency,
-			UnitName:         edbInfo.Unit,
-			AssetBeginDate:   edbInfo.StartDate,
-			AssetEndDate:     edbInfo.EndDate,
-			CreateUser:       edbInfo.SysUserRealName,
-			IndexCreateTime:  edbInfo.CreateTime,
-			UpdateUser:       edbInfo.SysUserRealName,
-			DetailUpdateTime: edbUpdateLog.CreateTime.Format(utils.FormatDateTime),
-			IndexUpdateTime:  edbInfo.ModifyTime,
-			OrginSource:      edbInfo.SourceName,
-			OrginSysSource:   origInfo.SourceName,
-			SysSource:        "产研平台",
-			SourceType:       getSourceType(edbInfo.Source),
-			Status:           0,
-		}
-
-		// 指标与分类的关系信息
-		pushEdbClassify = &PushEdbClassifyItemReq{
-			Id:         fmt.Sprint(edbInfo.EdbInfoId),
-			ClassifyId: edbInfo.ClassifyId,
-			IndexCode:  getIndexCode(edbInfo.Source, edbInfo.EdbCode),
-			CreateTime: edbInfo.CreateTime,
-			CreateUser: edbInfo.SysUserRealName,
-			UpdateTime: edbInfo.ModifyTime,
-			UpdateUser: edbInfo.SysUserRealName,
-		}
-
-		return
-	}
-
-	// 分类信息
-	//if edbUpdateLog.OpTableName == "edb_classify" {
-	//	var edbClassify *data_manage.EdbClassify
-	//	err = json.Unmarshal([]byte(data), &edbClassify)
-	//	if err != nil {
-	//		return
-	//	}
-	//
-	//	// 指标信息
-	//	pushClassify = PushClassifyItemReq{
-	//		ClassifyId:      int(edbClassify.ClassifyID),
-	//		ClassifyType:    int(edbClassify.ClassifyType),
-	//		ClassifyName:    edbClassify.ClassifyName,
-	//		ParentId:        int(edbClassify.ParentID),
-	//		HasData:         int(edbClassify.HasData),
-	//		CreateTime:      edbClassify.CreateTime.Format(utils.FormatDateTime),
-	//		UpdateTime:      edbClassify.ModifyTime.Format(utils.FormatDateTime),
-	//		SysUserId:       int(edbClassify.SysUserID),
-	//		SysUserRealName: edbClassify.SysUserRealName,
-	//		Level:           int(edbClassify.Level),
-	//		UniqueCode:      edbClassify.UniqueCode,
-	//		SortColumn:      int(edbClassify.Sort),
-	//	}
-	//
-	//	return
-	//}
-
-	// 数据信息
-	if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_") {
-		// 计算指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_calculate") {
-			return
-		}
-		// 预测指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_predict") {
-			return
-		}
-
-		var edbData *data_manage.EdbData
-		err = json.Unmarshal([]byte(data), &edbData)
-		if err != nil {
-			return
-		}
-
-		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
-		if source <= 0 {
-			// 没有找到来源，那就过滤
-			return
-		}
-		// 数据信息
-		pushIndexValue = &PushIndexValueItemReq{
-			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
-			IndexCode:    getIndexCode(source, edbData.EdbCode),
-			Value:        fmt.Sprint(edbData.Value),
-			BusinessDate: edbData.DataTime,
-			CreateTime:   edbData.CreateTime,
-			UpdateTime:   edbData.ModifyTime,
-			Status:       "0",
-		}
-
-		return
-	}
-
-	return
-}
-
-// handleUpdate
-// @Description: 更新数据处理
-// @author: Roc
-// @datetime 2024-03-11 14:53:35
-// @param edbUpdateLog *data_manage.EdbUpdateLog
-// @return pushIndexData *PushIndexParamDataReq
-// @return pushEdbClassify *PushEdbClassifyItemReq
-// @return pushIndexValue *PushIndexValueItemReq
-// @return err error
-func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIndexParamDataReq, pushEdbClassify *PushEdbClassifyItemReq, pushIndexValue *PushIndexValueItemReq, err error) {
-	oldData := edbUpdateLog.OldData
-	newData := edbUpdateLog.NewData
-
-	//指标信息
-	if edbUpdateLog.OpTableName == "edb_info" {
-		var oldEdbInfo *data_manage.EdbInfoItem
-		err = json.Unmarshal([]byte(oldData), &oldEdbInfo)
-		if err != nil {
-			return
-		}
-
-		// 预测指标不处理
-		if oldEdbInfo.EdbInfoType == 1 {
-			return
-		}
-		// 计算指标不处理
-		if oldEdbInfo.EdbType == 2 {
-			return
-		}
-		// 自有数据不处理
-		if oldEdbInfo.Source == utils.DATA_SOURCE_BUSINESS {
-			return
-		}
-
-		var newEdbInfo *data_manage.EdbInfoItem
-		err = json.Unmarshal([]byte(newData), &newEdbInfo)
-		if err != nil {
-			return
-		}
-
-		isUpdateEdbInfo := checkUpdateType(oldEdbInfo, newEdbInfo)
-		// 指标信息
-		if isUpdateEdbInfo {
-
-			// 获取数据源中指标的基础信息
-			origInfo := getOrigInfo(newEdbInfo.Source, newEdbInfo.SubSource, newEdbInfo.EdbCode, newEdbInfo.EdbName)
-
-			pushIndexData = &PushIndexParamDataReq{
-				SourceIndexCode:  newEdbInfo.EdbCode,
-				IndexCode:        getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
-				IndexName:        origInfo.EdbName,
-				IndexShortName:   newEdbInfo.EdbName,
-				FrequenceName:    newEdbInfo.Frequency,
-				UnitName:         newEdbInfo.Unit,
-				AssetBeginDate:   newEdbInfo.StartDate,
-				AssetEndDate:     newEdbInfo.EndDate,
-				CreateUser:       newEdbInfo.SysUserRealName,
-				IndexCreateTime:  newEdbInfo.CreateTime,
-				UpdateUser:       newEdbInfo.SysUserRealName,
-				DetailUpdateTime: getMaxModifyTime(newEdbInfo.Source, newEdbInfo.SubSource, newEdbInfo.EdbCode, edbUpdateLog.CreateTime.Format(utils.FormatDateTime)),
-				IndexUpdateTime:  newEdbInfo.ModifyTime,
-				OrginSource:      newEdbInfo.SourceName,
-				OrginSysSource:   origInfo.SourceName,
-				SysSource:        "产研平台",
-				SourceType:       getSourceType(newEdbInfo.Source),
-				Status:           1,
-			}
-		}
-
-		// 指标与分类的关系信息
-		if oldEdbInfo.ClassifyId != newEdbInfo.ClassifyId {
-			pushEdbClassify = &PushEdbClassifyItemReq{
-				Id:         fmt.Sprint(newEdbInfo.EdbInfoId),
-				ClassifyId: newEdbInfo.ClassifyId,
-				IndexCode:  getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
-				CreateTime: newEdbInfo.CreateTime,
-				CreateUser: newEdbInfo.SysUserRealName,
-				UpdateTime: newEdbInfo.ModifyTime,
-				UpdateUser: newEdbInfo.SysUserRealName,
-			}
-		}
-
-		return
-	}
-
-	// 数据信息
-	if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_") {
-		// 计算指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_calculate") {
-			return
-		}
-		// 预测指标不处理
-		if strings.HasPrefix(edbUpdateLog.OpTableName, "edb_data_predict") {
-			return
-		}
-
-		var edbData *data_manage.EdbData
-		err = json.Unmarshal([]byte(newData), &edbData)
-		if err != nil {
-			return
-		}
-
-		source, subSource := data_manage.GetSourceAndSubSourceTableName(edbUpdateLog.OpTableName, edbData.EdbCode)
-		if source <= 0 {
-			// 没有找到来源，那就过滤
-			return
-		}
-		// 数据信息
-		pushIndexValue = &PushIndexValueItemReq{
-			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
-			IndexCode:    getIndexCode(source, edbData.EdbCode),
-			Value:        fmt.Sprint(edbData.Value),
-			BusinessDate: edbData.DataTime,
-			CreateTime:   edbData.CreateTime,
-			UpdateTime:   edbData.ModifyTime,
-			Status:       "1",
-		}
-
-		return
-	}
-
-	// 上面都没有匹配到的话，那就是数据源的
-	return handleUpdateDataSource(edbUpdateLog)
-
-}
-
-// handleUpdateDataSource
-// @Description: 更新数据处理（数据源的基础数据）
-// @author: Roc
-// @datetime 2024-03-11 14:53:35
-// @param edbUpdateLog *data_manage.EdbUpdateLog
-// @return pushIndexData *PushIndexParamDataReq
-// @return pushEdbClassify *PushEdbClassifyItemReq
-// @return pushIndexValue *PushIndexValueItemReq
-// @return err error
-func handleUpdateDataSource(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIndexParamDataReq, pushEdbClassify *PushEdbClassifyItemReq, pushIndexValue *PushIndexValueItemReq, err error) {
-	oldData := edbUpdateLog.OldData
-	newData := edbUpdateLog.NewData
-
-	isUpdateIndexInfo := false
-	indexName := ``
-	indexSourceName := ``
-
-	source := 0
-	edbCode := ``
-
-	// 钢联
-	if edbUpdateLog.OpTableName == "base_from_mysteel_chemical_index" {
-		var oldEdbInfo *data_manage.BaseFromMysteelChemicalIndexItem
-		err = json.Unmarshal([]byte(oldData), &oldEdbInfo)
-		if err != nil {
-			return
-		}
-
-		var newEdbInfo *data_manage.BaseFromMysteelChemicalIndexItem
-		err = json.Unmarshal([]byte(newData), &newEdbInfo)
-		if err != nil {
-			return
-		}
-
-		if oldEdbInfo.IndexName != newEdbInfo.IndexName {
-			isUpdateIndexInfo = true
-		} else if oldEdbInfo.Source != newEdbInfo.Source {
-			isUpdateIndexInfo = true
-		}
-		if isUpdateIndexInfo {
-			indexName = newEdbInfo.IndexName
-			indexSourceName = newEdbInfo.Source
-			edbCode = newEdbInfo.IndexCode
-			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-		}
-	} else if edbUpdateLog.OpTableName == "base_from_smm_index" {
-		// 有色
-		var oldEdbInfo *data_manage.BaseFromSmmIndexItem
-		err = json.Unmarshal([]byte(oldData), &oldEdbInfo)
-		if err != nil {
-			return
-		}
-
-		var newEdbInfo *data_manage.BaseFromSmmIndexItem
-		err = json.Unmarshal([]byte(newData), &newEdbInfo)
-		if err != nil {
-			return
-		}
-
-		if oldEdbInfo.IndexName != newEdbInfo.IndexName {
-			isUpdateIndexInfo = true
-		} else if oldEdbInfo.Interface != newEdbInfo.Interface {
-			isUpdateIndexInfo = true
-		}
-		if isUpdateIndexInfo {
-			indexName = newEdbInfo.IndexName
-			indexSourceName = newEdbInfo.Interface
-			edbCode = newEdbInfo.IndexCode
-			source = utils.DATA_SOURCE_YS
-		}
-	}
-
-	// 数据源的指标信息变更了
-	if isUpdateIndexInfo {
-		newEdbInfo, tmpErr := data_manage.GetEdbInfoItemByCodeAndSource(source, edbCode)
-		if tmpErr != nil {
-			if tmpErr.Error() != utils.ErrNoRow() {
-				err = tmpErr
-				return
-			}
-			return
-		}
-		pushIndexData = &PushIndexParamDataReq{
-			SourceIndexCode:  newEdbInfo.EdbCode,
-			IndexCode:        getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
-			IndexName:        indexName,
-			IndexShortName:   newEdbInfo.EdbName,
-			FrequenceName:    newEdbInfo.Frequency,
-			UnitName:         newEdbInfo.Unit,
-			AssetBeginDate:   newEdbInfo.StartDate,
-			AssetEndDate:     newEdbInfo.EndDate,
-			CreateUser:       newEdbInfo.SysUserRealName,
-			IndexCreateTime:  newEdbInfo.CreateTime,
-			UpdateUser:       newEdbInfo.SysUserRealName,
-			DetailUpdateTime: getMaxModifyTime(newEdbInfo.Source, newEdbInfo.SubSource, newEdbInfo.EdbCode, edbUpdateLog.CreateTime.Format(utils.FormatDateTime)),
-			IndexUpdateTime:  newEdbInfo.ModifyTime,
-			OrginSource:      newEdbInfo.SourceName,
-			OrginSysSource:   indexSourceName,
-			SysSource:        "产研平台",
-			SourceType:       getSourceType(newEdbInfo.Source),
-			Status:           1,
-		}
-	}
-
-	return
-}
-
-// getSourceType
-// @Description: 获取指标来源类型
-// @author: Roc
-// @datetime 2024-03-01 13:40:03
-// @param source int
-// @return string
-func getSourceType(source int) string {
-	switch source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_YS, utils.DATA_SOURCE_BAIINFO, utils.DATA_SOURCE_SCI: //钢联,有色，百川盈孚，红桃3
-		return "RPA"
-	case utils.DATA_SOURCE_MANUAL:
-		return "手工"
-	default:
-		return "接口"
-	}
-}
-
-// checkUpdateType
-// @Description: 检查指标更新状态
-// @author: Roc
-// @datetime 2024-03-11 16:35:22
-// @param oldEdbInfo *data_manage.EdbInfoItem
-// @param newEdbInfo *data_manage.EdbInfoItem
-// @return isUpdateEdbInfo bool
-func checkUpdateType(oldEdbInfo, newEdbInfo *data_manage.EdbInfoItem) (isUpdateEdbInfo bool) {
-	// eta内部名称
-	if oldEdbInfo.EdbName != newEdbInfo.EdbName {
-		isUpdateEdbInfo = true
-		return
-	}
-	if oldEdbInfo.Frequency != newEdbInfo.Frequency {
-		isUpdateEdbInfo = true
-		return
-	}
-	if oldEdbInfo.Unit != newEdbInfo.Unit {
-		isUpdateEdbInfo = true
-		return
-	}
-	//if oldEdbInfo.StartDate != newEdbInfo.StartDate {
-	//	isUpdateEdbInfo = true
-	//	return
-	//}
-	//if oldEdbInfo.EndDate != newEdbInfo.EndDate {
-	//	isUpdateEdbInfo = true
-	//	return
-	//}
-	//if oldEdbInfo.SysUserId != newEdbInfo.SysUserId {
-	//	isUpdateEdbInfo = true
-	//	return
-	//}
-	//if oldEdbInfo.SysUserRealName != newEdbInfo.SysUserRealName {
-	//	isUpdateEdbInfo = true
-	//	return
-	//}
-
-	return
-}
-
-// OrigInfo
-// @Description: 数据源中的指标基础信息
-type OrigInfo struct {
-	EdbName    string
-	SourceName string
-}
-
-// getOrigInfo
-// @Description: 获取数据源中的指标基础信息
-// @author: Roc
-// @datetime 2024-03-11 16:45:34
-// @param source int
-// @param subSource int
-// @param edbCode string
-// @param edbName string
-// @return origInfo OrigInfo
-func getOrigInfo(source, subSource int, edbCode, edbName string) (origInfo OrigInfo) {
-	switch source {
-	case utils.DATA_SOURCE_THS, utils.DATA_SOURCE_WIND: // 同花顺、wind
-		origInfo.SourceName = "经济数据库"
-		if subSource == utils.DATA_SUB_SOURCE_DATE {
-			origInfo.SourceName = "日期序列"
-		}
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
-		edbInfo, err := data_manage.GetBaseFromMysteelChemicalIndexItemByCode(edbCode)
-		if err != nil {
-			return
-		}
-		origInfo.EdbName = edbInfo.IndexName
-		origInfo.SourceName = edbInfo.Source
-	// 钢联化工
-	case utils.DATA_SOURCE_YS: // 有色
-		edbInfo, err := data_manage.GetBaseFromSmmIndexItemItemByCode(edbCode)
-		if err != nil {
-			return
-		}
-		origInfo.EdbName = edbInfo.IndexName
-		origInfo.SourceName = edbInfo.Interface
-	}
-
-	// 如果原始名称为空，则使用ETA指标库的名称作为原始名称
-	if origInfo.EdbName == `` {
-		origInfo.EdbName = edbName
-	}
-
-	return
-}
-
-// getMaxModifyTime
-// @Description:  获取eta指标明细中的指标最大修改时间
-// @author: Roc
-// @datetime 2024-03-11 17:10:28
-// @param source int
-// @param edbCode string
-// @param addUpdateTime string
-// @return modifyTime string
-func getMaxModifyTime(source, subSource int, edbCode, addUpdateTime string) (modifyTime string) {
-	modifyTime, err := data_manage.GetEdbInfoMaxModifyTime(source, subSource, edbCode)
-	if err != nil {
-		modifyTime = addUpdateTime
-		return
-	}
-
-	return
-}
-
-// getIndexCode
-// @Description: 指标编码生成
-// @author: Roc
-// @datetime 2024-03-20 17:29:27
-// @param source int
-// @param edbCode string
-// @return string
-func getIndexCode(source int, edbCode string) string {
-	return fmt.Sprint(source, "_", edbCode)
-}
-
-// getIndexDataId
-// @Description: 获取数据id
-// @author: Roc
-// @datetime 2024-03-20 17:36:53
-// @param source int
-// @param subSource int
-// @param edbDataId int
-// @return string
-func getIndexDataId(source, subSource int, edbDataId int32) string {
-	return utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbDataId))
-}

services/eta_bridge/xy.go

@@ -1,702 +0,0 @@
-package eta_bridge
-
-import (
-	"context"
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/services/eta_hub"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/uuid"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-)
-
-// 用户同步的锁
-var lockSyncUser sync.Mutex
-
-// SyncUser
-// @Description: 定时同步ETA指标信息变更数据至第三方
-// @author: Roc
-// @datetime 2024-02-28 14:00:45
-// @param cont context.Context
-// @return err error
-func SyncUser(cont context.Context) (err error) {
-	lockSyncUser.Lock()
-	defer func() {
-		if err != nil {
-			tips := "SyncUser-定时将第三方的用户数据同步到ETA失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		lockSyncUser.Unlock()
-	}()
-
-	uri := "/xy/user/pull"
-	_, err, _ = HttpEtaBridgeGet(uri)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// PushBaseParamReq
-// @Description: 业务报文
-type PushBaseParamReq struct {
-	SerialID    string      `json:"serialID" description:"流水号"`
-	TableCode   string      `json:"tableCode" description:"数据表编码"`
-	Total       int         `json:"total" description:"本次落表数据总数"`
-	IsEmailWarn int         `json:"isEmailWarn" description:"是否发送预警邮件，（1-是 0-否）"`
-	Data        interface{} `json:"data" description:"报文体"`
-}
-
-// PushIndexParamDataReq
-// @Description: 指标数据结构
-type PushIndexParamDataReq struct {
-	SourceIndexCode string `json:"source_index_code" description:"上游来源指标ID"`
-	IndexCode       string `json:"index_code" description:"数仓加工的指标ID，来源+来源ID，使用下划线连接，MST000ID00013242"`
-	IndexName       string `json:"index_name" description:"外部来源的指标名称"`
-	IndexShortName  string `json:"index_short_name" description:"系统内的指标名称/简称"`
-	FrequenceName   string `json:"frequence_name" description:"指标频度，如：日度、周度、月度"`
-	UnitName        string `json:"unit_name" description:"指标单位，如：元/吨、千克、立方米"`
-	//CountryName          string `json:"country_name" description:""`
-	//ProvinceName         string `json:"province_name" description:""`
-	//AreaName             string `json:"area_name" description:""`
-	//CityName             string `json:"city_name" description:""`
-	//CountyName           string `json:"county_name" description:""`
-	//RegionName           string `json:"region_name" description:""`
-	//CompanyName          string `json:"company_name" description:""`
-	//BreedName            string `json:"breed_name" description:""`
-	//MaterialName         string `json:"material_name" description:""`
-	//SpecName             string `json:"spec_name" description:""`
-	//MarketName           string `json:"market_name" description:""`
-	//DerivativeType       string `json:"derivative_type" description:""`
-	//ContractName         string `json:"contract_name" description:""`
-	//AuthKindName         string `json:"auth_kind_name" description:""`
-	//CustomSmallClassName string `json:"custom_small_class_name" description:""`
-	AssetBeginDate   string `json:"asset_begin_date" description:"业务字段，指标明细数据的业务日期开始时间;格式yyyy-mm-dd"`
-	AssetEndDate     string `json:"asset_end_date" description:"业务字段，指标明细数据的业务日期结束时间;格式yyyy-mm-dd"`
-	CreateUser       string `json:"create_user" description:"创建人姓名"`
-	IndexCreateTime  string `json:"index_create_time" description:"指标基础信息创建时间戳;格式yyyy-mm-dd hh:mi:ss"`
-	UpdateUser       string `json:"update_user" description:"更新人姓名"`
-	DetailUpdateTime string `json:"detail_update_time" description:"指标明细信息更新时间戳;格式yyyy-mm-dd hh:mi:ss"`
-	IndexUpdateTime  string `json:"index_update_time" description:"指标基础信息更新时间戳;格式yyyy-mm-dd hh:mi:ss"`
-	//DutyDept             string `json:"duty_dept" description:""`
-	//BusinessDept         string `json:"business_dept" description:""`
-	OrginSource    string `json:"orgin_source" description:"外部数据原始来源，如国家统计局、钢联等"`
-	OrginSysSource string `json:"orgin_sys_source" description:"外部来源系统，即数据供应商，如钢联、wind、同花顺"`
-	SysSource      string `json:"sys_source" description:"内部来源系统，如产研平台、市价平台"`
-	SourceType     string `json:"source_type" description:"数据接入方式，手工、接口、RPA"`
-	//EtlTime              string `json:"etl_time" description:""`
-	Status int `json:"status" description:"逻辑删除：0-失效，1-有效"`
-}
-
-// PushIndexValueItemReq
-// @Description: 指标日期值数据结构
-type PushIndexValueItemReq struct {
-	Id           string `json:"id"`
-	IndexCode    string `json:"index_code" description:"指标代码"`
-	Value        string `json:"value" description:"数值"`
-	BusinessDate string `json:"business_date" description:"业务日期（数据日期）"`
-	CreateTime   string `json:"create_time" description:"数据进入ETA的时间"`
-	UpdateTime   string `json:"update_time" description:"eta库中修改数据的时间"`
-	Status       string `json:"status" description:"逻辑删除使用，0-禁用，1-启用"`
-}
-
-// PushClassifyItemReq
-// @Description: 指标分类数据结构
-type PushClassifyItemReq struct {
-	ClassifyId      int    `json:"classify_id" description:"自增id"`
-	ClassifyType    int    `json:"classify_type" description:"分类类型，0：普通指标分类，1：预测指标分类"`
-	ClassifyName    string `json:"classify_name" description:"分类名称"`
-	ParentId        int    `json:"parent_id" description:"父级id"`
-	HasData         int    `json:"has_data" description:"是否存在指标数据，1：有，2：无"`
-	CreateTime      string `json:"create_time" description:"创建时间"`
-	UpdateTime      string `json:"update_time" description:"修改时间"`
-	SysUserId       int    `json:"sys_user_id" description:"创建人id"`
-	SysUserRealName string `json:"sys_user_real_name" description:"创建人姓名"`
-	Level           int    `json:"level" description:"层级"`
-	UniqueCode      string `json:"unique_code" description:"唯一编码"`
-	SortColumn      int    `json:"sort_column" description:"排序字段,越小越靠前，默认值：10"`
-}
-
-// PushEdbClassifyItemReq
-// @Description: 指标与目录的关系请求结构
-type PushEdbClassifyItemReq struct {
-	Id         string `json:"id" description:"唯一主键"`
-	ClassifyId int    `json:"classify_id" description:"目录分类ID"`
-	IndexCode  string `json:"index_code" description:"指标ID"`
-	CreateTime string `json:"create_time" description:"创建时间"`
-	CreateUser string `json:"create_user" description:"创建人"`
-	UpdateTime string `json:"update_time" description:"修改时间"`
-	UpdateUser string `json:"update_user" description:"修改人"`
-}
-
-// 同步指标分类锁
-var lockSyncClassify sync.Mutex
-
-// SyncClassifyList
-// @Description: 定时同步ETA分类数据至第三方
-// @author: Roc
-// @datetime 2024-02-28 14:00:45
-// @param cont context.Context
-// @return err error
-func SyncClassifyList(cont context.Context) (err error) {
-	lockSyncClassify.Lock()
-	defer func() {
-		if err != nil {
-			tips := "SyncIndexList-定时同步ETA指标分类变更数据至第三方失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		lockSyncClassify.Unlock()
-	}()
-
-	var condition string
-	var pars []interface{}
-
-	// 普通指标分类
-	condition = " AND classify_type = ? "
-	pars = append(pars, 0)
-
-	list, err := data_manage.GetAllEdbClassifyListByCondition(condition, pars)
-	if err != nil {
-		utils.FileLog.Error("获取分类列表数据失败:" + err.Error())
-		return
-	}
-
-	dataLimitList := make([][]PushClassifyItemReq, 0)
-
-	dataList := make([]PushClassifyItemReq, 0)
-	for _, v := range list {
-		dataList = append(dataList, PushClassifyItemReq{
-			ClassifyId:      int(v.ClassifyID),
-			ClassifyType:    int(v.ClassifyType),
-			ClassifyName:    v.ClassifyName,
-			ParentId:        int(v.ParentID),
-			HasData:         int(v.HasData),
-			CreateTime:      v.CreateTime.Format(utils.FormatDateTime),
-			UpdateTime:      v.ModifyTime.Format(utils.FormatDateTime),
-			SysUserId:       int(v.SysUserID),
-			SysUserRealName: v.SysUserRealName,
-			Level:           int(v.Level),
-			UniqueCode:      v.UniqueCode,
-			SortColumn:      int(v.Sort),
-		})
-		if len(dataList) >= 100 {
-			dataLimitList = append(dataLimitList, dataList)
-			dataList = make([]PushClassifyItemReq, 0)
-		}
-	}
-
-	lenData := len(dataList)
-	if lenData > 0 {
-		dataLimitList = append(dataLimitList, dataList)
-	}
-
-	if len(dataLimitList) < 0 {
-		//fmt.Println("无分类数据推送")
-		return
-	}
-
-	errDataList := make([]PushClassifyItemReq, 0)
-	errList := make([]string, 0)
-	defer func() {
-		if len(errList) > 0 {
-			dataByte, err := json.Marshal(errDataList)
-			if err != nil {
-				dataByte = []byte("序列化分类列表数据失败" + err.Error())
-			}
-			utils.FileLog.Info("pushIndexClassify errList:%s；推送失败的分类列表数据列表：%s", strings.Join(errList, "\n"), string(dataByte))
-		}
-	}()
-	for k, tmpDataList := range dataLimitList {
-		req := PushBaseParamReq{
-			SerialID:    uuid.NewUUID().Hex32(),
-			TableCode:   "",
-			Total:       len(tmpDataList),
-			IsEmailWarn: 0,
-			Data:        tmpDataList,
-		}
-
-		uri := "/xy/index/pushClassify"
-		_, e, _ := HttpEtaBridgePost(uri, req)
-		if e != nil {
-			errList = append(errList, fmt.Sprintf("第%d组分类列表数据推送失败，postRefreshEdbData err: %s", k+1, e.Error()))
-			errDataList = append(errDataList, dataList...)
-			continue
-		}
-	}
-
-	return
-}
-
-// 同步指标信息锁
-var lockSyncIndex sync.Mutex
-
-// SyncIndex
-// @Description: 定时同步指标信息
-// @author: Roc
-// @datetime 2024-03-07 17:39:34
-// @param cont context.Context
-// @return err error
-func SyncIndex(cont context.Context) (err error) {
-	lockSyncIndex.Lock()
-	defer func() {
-		if err != nil {
-			tips := "SyncIndex-定时同步ETA指标信息变更数据至第三方失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		lockSyncIndex.Unlock()
-	}()
-
-	// 获取当前最大ID
-	logMaxId, err := data_manage.GetEdbUpdateLogMaxId()
-	if err != nil {
-		return
-	}
-
-	var currLogId int64
-	// 当前已经操作的最大ID
-	currLogId, err = utils.Rc.GetInt64(utils.CACHE_EDB_UPDATE_LOG_ID)
-	err = fmt.Errorf(utils.RedisNoKeyErr)
-	if err != nil {
-		// 如果不是没找到key，那么说明是redis报错
-		if err.Error() != utils.RedisNoKeyErr {
-			return
-		}
-		err = nil
-		// 查找当前已经处理了的日志最大ID
-		currLogId, err = data_manage.GetEdbUpdateLogMaxHandleId()
-		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
-				utils.FileLog.Error("查找当前已经处理了的日志最大ID失败：" + err.Error())
-			} else {
-				err = nil
-			}
-			currLogId = 0
-		}
-	}
-
-	// 遍历获取下一页的数据
-	for currId := currLogId; currId < logMaxId; {
-		currId = handlePush(currId, logMaxId)
-	}
-
-	return
-}
-
-// handlePush
-// @Description: 推送处理
-// @author: Roc
-// @datetime 2024-03-07 19:20:19
-// @param currLogIdStr int64
-// @param logMaxId int64
-// @return lastId int64
-func handlePush(currLogIdStr, logMaxId int64) (lastId int64) {
-	lastId = currLogIdStr
-
-	// 查询当次需要同步的数据
-	var condition string
-	var pars []interface{}
-
-	condition += " AND id > ? AND id <= ?"
-	pars = append(pars, currLogIdStr, logMaxId)
-
-	list, err := data_manage.GetEdbUpdateLogByCondition(condition, pars)
-	if err != nil {
-		utils.FileLog.Error("获取变更日志失败:" + err.Error())
-		return
-	}
-
-	pushIndexList := make([]*PushIndexParamDataReq, 0)
-	pushEdbClassifyList := make([]*PushEdbClassifyItemReq, 0)
-	pushIndexValueList := make([]*PushIndexValueItemReq, 0)
-
-	idList := make([]int64, 0)
-	for _, v := range list {
-		lastId = v.Id
-		idList = append(idList, v.Id)
-		pushIndexData, pushEdbClassifyData, pushIndexValueData, tmpErr := handleData(v)
-		if tmpErr != nil {
-			err = tmpErr
-			utils.FileLog.Error("获取待处理的数据失败:" + err.Error())
-			continue
-		}
-
-		if pushIndexData != nil {
-			pushIndexList = append(pushIndexList, pushIndexData)
-		}
-
-		if pushEdbClassifyData != nil {
-			pushEdbClassifyList = append(pushEdbClassifyList, pushEdbClassifyData)
-		}
-
-		if pushIndexValueData != nil {
-			pushIndexValueList = append(pushIndexValueList, pushIndexValueData)
-		}
-	}
-
-	pushIndex(pushIndexList)
-	pushIndexClassify(pushEdbClassifyList)
-	pushIndexValue(pushIndexValueList)
-
-	// 标记处理
-	err = data_manage.HandleUpdateLogByIds(idList, time.Now().Format(utils.FormatDateTime))
-	if err != nil {
-		utils.FileLog.Error("批量处理指标更新记录失败:" + err.Error())
-	}
-
-	utils.Rc.Put(utils.CACHE_EDB_UPDATE_LOG_ID, lastId, 31*24*time.Hour)
-
-	return
-}
-
-const pushBatchSize = 100
-
-// pushIndex
-// @Description: 指标信息数据推送
-// @author: Roc
-// @datetime 2024-03-07 16:35:02
-// @param allPushList []*PushIndexParamDataReq
-func pushIndex(allPushList []*PushIndexParamDataReq) {
-	lenDataList := len(allPushList)
-	if lenDataList <= 0 {
-		return
-	}
-	uri := utils.SyncIndexPath + "/pushIndexData"
-
-	errDataList := make([]*PushIndexParamDataReq, 0)
-	errList := make([]string, 0)
-	defer func() {
-		if len(errList) > 0 {
-			dataByte, err := json.Marshal(errDataList)
-			if err != nil {
-				dataByte = []byte("序列化指标信息数据失败" + err.Error())
-			}
-			utils.FileLog.Info("pushIndex errList:%s；推送失败的指标信息数据列表：%s", strings.Join(errList, "\n"), string(dataByte))
-		}
-	}()
-
-	dataLimitList := make([][]*PushIndexParamDataReq, 0)
-
-	for i := 0; i < lenDataList; i += pushBatchSize {
-		endIndex := min(i+pushBatchSize, lenDataList)
-		tempSlice := allPushList[i:endIndex]
-		dataLimitList = append(dataLimitList, tempSlice)
-	}
-
-	for k, dataList := range dataLimitList {
-		req := PushBaseParamReq{
-			SerialID:    uuid.NewUUID().Hex32(),
-			TableCode:   "",
-			Total:       len(dataList),
-			IsEmailWarn: 0,
-			Data:        dataList,
-		}
-
-		_, e, _ := HttpEtaBridgePost(uri, req)
-		if e != nil {
-			errList = append(errList, fmt.Sprintf("第%d组指标信息数据推送失败，postRefreshEdbData err: %s", k+1, e.Error()))
-			errDataList = append(errDataList, dataList...)
-			continue
-		}
-	}
-
-}
-
-// pushIndexValue
-// @Description: 指标明细数据推送
-// @author: Roc
-// @datetime 2024-03-07 16:32:47
-// @param allPushList []*PushIndexValueItemReq
-func pushIndexValue(allPushList []*PushIndexValueItemReq) {
-	lenDataList := len(allPushList)
-	if lenDataList <= 0 {
-		return
-	}
-	uri := utils.SyncIndexPath + "/pushIndexValue"
-
-	errDataList := make([]*PushIndexValueItemReq, 0)
-	errList := make([]string, 0)
-	defer func() {
-		if len(errList) > 0 {
-			dataByte, err := json.Marshal(errDataList)
-			if err != nil {
-				dataByte = []byte("序列化指标明细数据失败" + err.Error())
-			}
-			utils.FileLog.Info("pushIndexValue errList:%s；推送失败的指标信息数据列表：%s", strings.Join(errList, "\n"), string(dataByte))
-		}
-	}()
-
-	dataLimitList := make([][]*PushIndexValueItemReq, 0)
-
-	for i := 0; i < lenDataList; i += pushBatchSize {
-		endIndex := min(i+pushBatchSize, lenDataList)
-		tempSlice := allPushList[i:endIndex]
-		dataLimitList = append(dataLimitList, tempSlice)
-	}
-
-	for k, dataList := range dataLimitList {
-		req := PushBaseParamReq{
-			SerialID:    uuid.NewUUID().Hex32(),
-			TableCode:   "",
-			Total:       len(dataList),
-			IsEmailWarn: 0,
-			Data:        dataList,
-		}
-
-		_, e, _ := HttpEtaBridgePost(uri, req)
-		if e != nil {
-			errList = append(errList, fmt.Sprintf("第%d组指标明细数据推送失败，postRefreshEdbData err: %s", k+1, e.Error()))
-			errDataList = append(errDataList, dataList...)
-			continue
-		}
-	}
-
-	return
-}
-
-// pushIndexClassify
-// @Description: 指标与分类的关系推送
-// @author: Roc
-// @datetime 2024-03-07 16:32:47
-// @param allPushList []*PushIndexValueItemReq
-func pushIndexClassify(allPushList []*PushEdbClassifyItemReq) {
-	lenDataList := len(allPushList)
-	if lenDataList <= 0 {
-		return
-	}
-	uri := utils.SyncIndexPath + "/pushEdbClassify"
-
-	errDataList := make([]*PushEdbClassifyItemReq, 0)
-	errList := make([]string, 0)
-	defer func() {
-		if len(errList) > 0 {
-			dataByte, err := json.Marshal(errDataList)
-			if err != nil {
-				dataByte = []byte("序列化指标明细数据失败" + err.Error())
-			}
-			utils.FileLog.Info("pushIndexClassify errList:%s；推送失败的指标所属分类明细数据列表：%s", strings.Join(errList, "\n"), string(dataByte))
-		}
-	}()
-
-	dataLimitList := make([][]*PushEdbClassifyItemReq, 0)
-
-	for i := 0; i < lenDataList; i += pushBatchSize {
-		endIndex := min(i+pushBatchSize, lenDataList)
-		tempSlice := allPushList[i:endIndex]
-		dataLimitList = append(dataLimitList, tempSlice)
-	}
-
-	for k, dataList := range dataLimitList {
-		req := PushBaseParamReq{
-			SerialID:    uuid.NewUUID().Hex32(),
-			TableCode:   "",
-			Total:       len(dataList),
-			IsEmailWarn: 0,
-			Data:        dataList,
-		}
-
-		_, e, _ := HttpEtaBridgePost(uri, req)
-		if e != nil {
-			errList = append(errList, fmt.Sprintf("第%d组指标所属分类数据推送失败，postRefreshEdbData err: %s", k+1, e.Error()))
-			errDataList = append(errDataList, dataList...)
-			continue
-		}
-	}
-
-	return
-}
-
-// 辅助函数：返回a和b中的较小值
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-// 同步crm指标信息锁
-var lockGetCrmIndex sync.Mutex
-
-// SyncXyCrmIndex
-// @Description: 定时同步CRM指标信息
-// @author: Roc
-// @datetime 2024-5-22 10:46:08
-// @param cont context.Context
-// @return err error
-func SyncXyCrmIndex(cont context.Context) (err error) {
-	lockGetCrmIndex.Lock()
-	errMsgList := make([]string, 0)
-	defer func() {
-		if err != nil {
-			tips := "SyncXyCrmIndex-定时同步CRM数据到ETA平台失败, ErrMsg:\n" + err.Error()
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		if len(errMsgList) > 0 {
-			tips := "SyncXyCrmIndex-定时同步CRM数据到ETA平台失败, ErrMsg:\n" + strings.Join(errMsgList, "\n")
-			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-		lockGetCrmIndex.Unlock()
-		fmt.Println("end SyncXyCrmIndex")
-	}()
-
-	// 未配置资产包合数据分区，那么就不执行
-	if utils.SyncCrmAssetPkgCd == `` || utils.SyncCrmDataSourceType == `` {
-		return
-	}
-
-	var lastUpdateTimeStr string                                   // 上一次更新的时间
-	nowTimeStr := time.Now().Format(utils.FormatDateTimeUnSpaceV2) // 这次更新的时间
-
-	key := data_manage.CrmIndexLastUpdateTime
-	sysInteractionLog, err := data_manage.GetBusinessSysInteractionLogByKey(key)
-	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
-			return
-		}
-		//lastUpdateTime := time.Now().Format("2006-01-02 15:04:05")
-	} else {
-		if sysInteractionLog.InteractionVal != `` {
-			lastUpdateTimeStr = sysInteractionLog.InteractionVal
-		}
-	}
-
-	syncCrmAssetPkgCd := utils.SyncCrmAssetPkgCd
-	syncCrmAssetPkgCdList := strings.Split(syncCrmAssetPkgCd, ",")
-
-	for _, assetPkgCd := range syncCrmAssetPkgCdList {
-		err, errMsgList = syncCrmIndex(assetPkgCd, 1, utils.SyncCrmIndexNum, lastUpdateTimeStr)
-	}
-
-	// 修改最后的更新时间
-	modifyCrmIndexLastUpdateTime(nowTimeStr)
-
-	return
-}
-
-// syncCrmIndex
-// @Description: 开始同步CRM指标信息
-// @author: Roc
-// @datetime 2024-05-17 15:55:11
-// @param assetPkgCd string
-// @param currIndex int
-// @param pageSize int
-// @param lastUpdateTimeStr string
-// @return err error
-// @return errMsgList []string
-func syncCrmIndex(assetPkgCd string, currIndex, pageSize int, baseLastUpdateTimeStr string) (err error, errMsgList []string) {
-	errMsgList = make([]string, 0)
-
-	lastUpdateTimeStr := baseLastUpdateTimeStr
-	if lastUpdateTimeStr != `` {
-		lastUpdateTimeStr = url.QueryEscape(lastUpdateTimeStr)
-	}
-	uri := fmt.Sprintf("%s/getCrmData?index_pkg_code=%s&data_source_type=%s&current_index=%d&page_size=%d&detail_last_update_start_time=%s", utils.SyncCrmIndexPath, assetPkgCd, utils.SyncCrmDataSourceType, currIndex, pageSize, lastUpdateTimeStr)
-	bResult, err, _ := HttpEtaBridgeGet(uri)
-	if err != nil {
-		return
-	}
-
-	result := new(EtaBridgeDataRespAndBusinessData)
-	err = json.Unmarshal(bResult, &result)
-	if err != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", err.Error(), string(bResult))
-		utils.FileLog.Info("桥接服务get请求失败:\n" + string(bResult))
-		return
-	}
-
-	//totalPage := result.Data.Paging.Pages
-
-	for _, v := range result.Data.List {
-		tmpErr := pushCrmDataToHub(v)
-		if tmpErr != nil {
-			errMsgList = append(errMsgList, tmpErr.Error())
-		}
-
-	}
-
-	// 如果还有下一页，那么就继续请求下一页
-	if currIndex < result.Data.Paging.Pages {
-		_, tmpErrMsgList := syncCrmIndex(assetPkgCd, currIndex+1, utils.SyncCrmIndexNum, baseLastUpdateTimeStr)
-		errMsgList = append(errMsgList, tmpErrMsgList...)
-	}
-
-	return
-}
-
-// pushCrmDataToHub
-// @Description: 调用hub服务，将数据推送到eta
-// @author: Roc
-// @datetime 2024-05-17 15:55:24
-// @param data interface{}
-// @return err error
-func pushCrmDataToHub(data interface{}) (err error) {
-	uri := `/edb/push`
-	_, err, _ = eta_hub.HttpEtaHubPost(uri, data)
-
-	//result := new(EtaBridgeDataRespAndBusinessData)
-	//err = json.Unmarshal(bResult, &result)
-	//if err != nil {
-	//	err = fmt.Errorf("result unmarshal err: %s\nresult: %s", err.Error(), string(bResult))
-	//	utils.FileLog.Info("桥接服务get请求失败:\n" + string(bResult))
-	//	return
-	//}
-
-	return
-}
-
-// modifyCrmIndexLastUpdateTime
-// @Description: 修改crm指标的最近拉取的时间
-// @author: Roc
-// @datetime 2024-05-17 11:32:32
-// @param fileName string
-// @param position uint32
-// @return err error
-func modifyCrmIndexLastUpdateTime(lastUpdateTime string) {
-	var err error
-	defer func() {
-		if err != nil {
-			utils.FileLog.Error("修改binlog文件名称和位置异常,lastUpdateTime", lastUpdateTime, ",err：", err)
-		}
-	}()
-
-	// fileName 变更
-	key := data_manage.CrmIndexLastUpdateTime
-	fileNameLog, err := data_manage.GetBusinessSysInteractionLogByKey(key)
-	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
-			return
-		}
-		err = nil
-		fileNameLog = &data_manage.BusinessSysInteractionLog{
-			//ID:             0,
-			InteractionKey: key,
-			InteractionVal: lastUpdateTime,
-			Remark:         "crm拉取数据的最近更新时间",
-			ModifyTime:     time.Now(),
-			CreateTime:     time.Now(),
-		}
-		err = fileNameLog.Create()
-		if err != nil {
-			return
-		}
-	} else {
-		fileNameLog.InteractionVal = lastUpdateTime
-		fileNameLog.ModifyTime = time.Now()
-		err = fileNameLog.Update([]string{"InteractionVal", "ModifyTime"})
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}

services/icpi.go

@@ -1,174 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// ICPI消费指数指标数据同步
-func SyncBaseFromIcpi() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromIcpiIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_ICPI
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromIcpi", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.IcpiIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		utils.FileLog.Info("err:", err.Error())
-		fmt.Println("err:", err.Error())
-		return err
-	}
-	//获取所有指标信息  某一天的
-	/*allIndex, err := data_manage.GetBaseFromIcpiIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromIcpiIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromIcpiIndexId] = v
-	}*/
-
-	icpiObj := new(data_manage.BaseFromIcpiIndex)
-
-	for _, zv := range respObj.Data {
-		newID, err := icpiObj.InsertOrUpdateBaseFromIcpiIndex(zv)
-		if err != nil {
-			fmt.Println("InsertOrUpdateBaseFromIcpiIndex error:", err)
-		}
-		fmt.Println("InsertOrUpdateBaseFromIcpiIndex new indexID:", newID)
-	}
-	return err
-}
-
-// ICPI消费指数-分类
-func SyncBaseFromIcpiClassify() (err error) {
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_ICPI
-	method := `classify/list`
-	result, err := HttpPost("SyncBaseFromIcpiClassify", method, data)
-	if err != nil {
-		fmt.Println("SyncBaseFromIcpiClassify HttpPost Err:", err.Error())
-	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncBaseFromIcpiClassify result:", result)
-
-	respObj := new(data_manage.IcpiClassifyResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有分类
-	/*	allClassify, err := data_manage.GetBaseFromIcpiClassifyAll()
-		if err != nil {
-			return
-		}
-
-		existIndexMap := make(map[int]*data_manage.BaseFromIcpiClassify)
-		for _, v := range allClassify {
-			existIndexMap[v.BaseFromIcpiClassifyId] = v
-		}*/
-
-	for _, item := range respObj.Data {
-		//if _, ok := existIndexMap[item.BaseFromIcpiClassifyId]; !ok {
-		newID, err := data_manage.InsertOrUpdateBaseFromIcpiClassify(item)
-		if err != nil {
-			fmt.Println("InsertOrUpdateBaseFromIcpiClassify error:", err)
-		}
-		fmt.Println("InsertOrUpdateBaseFromIcpiClassify new indexID:", newID)
-		//}
-	}
-	return err
-}
-
-// ICPI消费指数-数据
-func SyncBaseFromIcpiData() (err error) {
-	startDate := time.Now().Format(utils.FormatDate) + " 00:00:00"
-	//var startDate string
-	maxDate, err := data_manage.GetBaseFromIcpiMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/data/list_page`
-
-	existDataMap := make(map[string]*data_manage.BaseFromIcpiData)
-	allData, err1 := data_manage.GetAllBaseFromIcpiDataList(startDate)
-	if err1 != nil {
-		fmt.Println("get GetAllBaseFromIcpiDataList err:" + err1.Error())
-		return
-	}
-	for _, dv := range allData {
-		tmpKey := dv.IndexCode + "_" + dv.DataTime
-		existDataMap[tmpKey] = dv
-	}
-
-	//获取所有指标信息  某一天的
-	maxPage := 1
-
-	for currPage := 0; currPage < maxPage; currPage++ {
-		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_ICPI
-		data["StartDate"] = startDate
-		data["CurrPage"] = currPage
-		data["PageSize"] = 500 //
-
-		var result string
-		result, err = HttpPost("SyncBaseFromIcpiData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
-
-		respObj := new(data_manage.BaseFromIcpiDataResp)
-		err = json.Unmarshal([]byte(result), &respObj)
-		if err != nil {
-			fmt.Println("json.Unmarshal err:" + err.Error())
-			return err
-		}
-		if respObj.Ret != 200 {
-			err = errors.New(respObj.ErrMsg)
-			return
-		}
-		// 总页码数
-		maxPage = respObj.Data.Paging.Pages
-
-		addDataList := make([]*data_manage.BaseFromIcpiData, 0)
-		if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
-			for _, dv := range respObj.Data.List {
-				tmpKey := dv.IndexCode + "_" + dv.DataTime
-				if _, ok := existDataMap[tmpKey]; !ok {
-					addDataList = append(addDataList, dv)
-					existDataMap[tmpKey] = dv
-				}
-			}
-		}
-
-		// 最后如果还有数据未插入，那么继续插入吧
-		if len(addDataList) > 0 {
-			_, err = data_manage.MultiAddBaseFromIcpiDataIndex(addDataList)
-			if err != nil {
-				fmt.Println("MultiAddBaseFromIcpiDataIndex error:", err)
-			}
-		}
-	}
-
-	return err
-}

services/meeting_probabilities.go

@@ -1,60 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 同步
-func SyncMeetingProbabilities() (err error) {
-
-	var startDate string
-	maxDate, err := data_manage.GetMeetingProbabilitiesMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = 61
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncMeetingProbabilities", method, data)
-	if err != nil {
-		fmt.Println("SyncMeetingProbabilities HttpPost Err:", err.Error())
-	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncMeetingProbabilities result:", result)
-
-	respObj := new(data_manage.MeetingProbabilitiesResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetMeetingProbabilitiesAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.MeetingProbabilities)
-	for _, v := range allIndex {
-		existIndexMap[v.MeetingInfoId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.MeetingInfoId]; !ok {
-			newID, err := data_manage.AddMeetingProbabilities(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

services/report.go

@@ -360,33 +360,23 @@ func sendMiniProgramReportWxMsg(report *models.Report) (err error) {
 	}
 
 	var openIdArr []string
-	// 如果是弘则，且报告分类是晨报，那么就所有人推送
-	if (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox || utils.BusinessCode == utils.BusinessCodeDebug) && report.ClassifyNameFirst == "晨报" {
-		// 如果是章节，那就推送所有用户
-		openIdArr, err = models.GetOpenIdArr()
-		if err != nil {
-			msg = "get GetOpenIdArr err:" + err.Error()
-			return
-		}
-	} else {
-		minClassifyId, _, err := getMinClassify(report)
-		if err != nil {
-			msg = "获取报告的最小分类失败 err:" + err.Error()
-			return err
-		}
+	minClassifyId, _, err := getMinClassify(report)
+	if err != nil {
+		msg = "获取报告的最小分类失败 err:" + err.Error()
+		return err
+	}
 
-		// 判断分类是否存在
-		_, err = models.GetClassifyById(minClassifyId)
-		if err != nil {
-			msg = "获取报告分类失败 err:" + err.Error()
-			return err
-		}
-		// 获取该分类关联的openid列表
-		openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
-		if err != nil {
-			msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
-			return err
-		}
+	// 判断分类是否存在
+	_, err = models.GetClassifyById(minClassifyId)
+	if err != nil {
+		msg = "获取报告分类失败 err:" + err.Error()
+		return err
+	}
+	// 获取该分类关联的openid列表
+	openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
+	if err != nil {
+		msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
+		return err
 	}
 
 	// TODO 弘则的文案是不是要去掉

services/smart_report.go

@@ -1,145 +0,0 @@
-package services
-
-import (
-	"context"
-	"eta_gn/eta_task/models"
-	"eta_gn/eta_task/services/alarm_msg"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"html"
-	"strconv"
-	"time"
-)
-
-// PublishSmartReport 定时发布智能研报
-func PublishSmartReport(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			go alarm_msg.SendAlarmMsg("PublishSmartReport-定时发布智能研报失败, ErrMsg:\n"+err.Error(), 3)
-		}
-	}()
-
-	now := time.Now().Format(utils.FormatDateTimeMinute)
-	startTime := now + ":00"
-	endTime := now + ":59"
-
-	list, e := models.GetPrePublishSmartReports(startTime, endTime)
-	if e != nil {
-		err = fmt.Errorf("GetPrePublishSmartReports err: %s", e.Error())
-		return
-	}
-	listLen := len(list)
-	if listLen == 0 {
-		return
-	}
-
-	// 比对时间(分钟), 时间相等则发布并推送
-	for i := 0; i < listLen; i++ {
-		item := list[i]
-		var publishTime time.Time
-		// 如果报告曾经发布过，并且已经发送过模版消息，则发布时间为原发布时间
-		if item.MsgIsSend == 1 && !item.PublishTime.IsZero() {
-			publishTime = item.PublishTime
-		} else {
-			publishTime = time.Now()
-		}
-		// 发布报告, 同时更新消息推送状态, 消息推送目前仅为预留功能, 后面小程序需要售卖的时候再细化消息推送
-		if err = models.PublishSmartReportById(item.SmartReportId, publishTime); err != nil {
-			return
-		}
-
-		// 写入队列
-		var queue models.Report2ImgQueueReq
-		queue.ReportType = 2
-		queue.ReportCode = item.ReportCode
-		_ = utils.Rc.LPush(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, queue)
-
-		// 生成音频, 更新ES
-		go func() {
-			if item.VideoUrl == "" {
-				SmartReportBuildVideoAndUpdate(item)
-			}
-			_ = SmartReportElasticUpsert(item.SmartReportId, 2)
-		}()
-
-		recordItem := &models.ReportStateRecord{
-			ReportId:   item.SmartReportId,
-			ReportType: 2,
-			State:      2,
-			AdminId:    item.AdminId,
-			AdminName:  item.AdminRealName,
-			CreateTime: time.Now(),
-		}
-		go func() {
-			_, _ = models.AddReportStateRecord(recordItem)
-		}()
-	}
-	return
-}
-
-// SmartReportBuildVideoAndUpdate 生成音频
-func SmartReportBuildVideoAndUpdate(item *models.SmartReport) {
-	if item == nil {
-		return
-	}
-	var err error
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("智能研报-音频生成, errMsg: %s", err.Error())
-			go alarm_msg.SendAlarmMsg(tips, 2)
-		}
-	}()
-
-	videoUrl, videoName, videoSize, videoPlaySeconds, e := CreateReportVideo(item.Title, item.Content, time.Now().Local().Format(utils.FormatDateTime))
-	if e != nil {
-		err = fmt.Errorf("create audio err: %s", e.Error())
-		return
-	}
-	item.VideoUrl = videoUrl
-	item.VideoName = videoName
-	item.VideoSize = videoSize
-	item.VideoPlaySeconds = fmt.Sprintf("%.2f", videoPlaySeconds)
-	item.ModifyTime = time.Now().Local()
-	cols := []string{"VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds", "ModifyTime"}
-	if e = item.Update(cols); e != nil {
-		err = fmt.Errorf("smart report update err: %s", e.Error())
-		return
-	}
-}
-
-// SmartReportElasticUpsert 新增/编辑报告es
-func SmartReportElasticUpsert(smartReportId int, state int) (err error) {
-	if smartReportId <= 0 {
-		return
-	}
-
-	reportOB := new(models.SmartReport)
-	item, e := reportOB.GetItemById(smartReportId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			// 可能被删了就直接忽略掉
-			return
-		}
-		err = fmt.Errorf("获取报告失败, Err: %s", e.Error())
-		return
-	}
-
-	esReport := new(models.ElasticSmartReport)
-	esReport.SmartReportId = item.SmartReportId
-	esReport.Title = item.Title
-	esReport.Abstract = item.Abstract
-	esReport.BodyContent = utils.TrimHtml(html.UnescapeString(item.Content))
-	esReport.PublishTime = item.PublishTime.Format(utils.FormatDateTime)
-	esReport.PublishState = state
-	esReport.Author = item.Author
-	esReport.ClassifyIdFirst = item.ClassifyIdFirst
-	esReport.ClassifyNameFirst = item.ClassifyNameFirst
-	esReport.ClassifyIdSecond = item.ClassifyIdSecond
-	esReport.ClassifyNameSecond = item.ClassifyNameSecond
-	esReport.StageStr = strconv.Itoa(item.Stage)
-	esReport.Frequency = item.Frequency
-	if err = EsAddOrEditSmartReport(utils.SmartReportIndexName, strconv.Itoa(item.SmartReportId), esReport); err != nil {
-		return
-	}
-	return
-}

services/sync_hz_data.go

@@ -1,163 +0,0 @@
-package services
-
-import (
-	"context"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 同步指标
-func SyncHzDataIndex(cont context.Context) (err error) {
-	fmt.Println("SyncHzDataIndex start:", time.Now().Format(utils.FormatDateTime))
-	//郑州交易所
-	go SyncRankingFromZhengzhou()
-	//if err != nil {
-	//	fmt.Println("SyncRankingFromZhengzhou Err:" + err.Error())
-	//	return
-	//}
-
-	//大商所
-	//go SyncRankingFromDalian()
-	//if err != nil {
-	//	fmt.Println("SyncRankingFromDalian Err:" + err.Error())
-	//	return
-	//}
-
-	//上期所
-	go SyncRankingFromShanghai()
-	//if err != nil {
-	//	fmt.Println("SyncRankingFromDalian Err:" + err.Error())
-	//	return
-	//}
-
-	//中金所
-	go SyncRankingFromCffex()
-	//if err != nil {
-	//	fmt.Println("SyncRankingFromCffex Err:" + err.Error())
-	//	return
-	//}
-
-	//上期能源
-	go SyncRankingFromIne()
-	//if err != nil {
-	//	fmt.Println("SyncRankingFromIne Err:" + err.Error())
-	//	return
-	//}
-
-	//欧洲天然气
-	err = SyncRankingFromEic()
-	if err != nil {
-		fmt.Println("SyncRankingFromEic Err:" + err.Error())
-		return
-	}
-
-	//谷歌出行数据
-	err = SyncChangesVisitorsCovid()
-	if err != nil {
-		fmt.Println("SyncChangesVisitorsCovid Err:" + err.Error())
-		return
-	}
-
-	// EiaSteo
-	err = SyncEiaSteoClassify()
-	if err != nil {
-		fmt.Println("SyncEiaSteoClassify Err:" + err.Error())
-		return
-	}
-	err = SyncEiaSteoIndex()
-	if err != nil {
-		fmt.Println("SyncEiaSteoIndex Err:" + err.Error())
-		return
-	}
-
-	// UN联合国数据
-	err = SyncComTradeIndex()
-	if err != nil {
-		fmt.Println("SyncComTradeIndexAndData Err:" + err.Error())
-		return
-	}
-
-	// 美联储加息概率
-	err = SyncMeetingProbabilities()
-	if err != nil {
-		fmt.Println("SyncMeetingProbabilities Err:" + err.Error())
-		return
-	}
-
-	//广期所
-	{
-		//分类信息
-		err = SyncFromGuangzhouClassify()
-		if err != nil {
-			fmt.Println("SyncFromGuangzhouClassify Err:" + err.Error())
-			return
-		}
-		//合约信息
-		err = SyncFromGuangzhouContract()
-		if err != nil {
-			fmt.Println("SyncFromGuangzhouContract Err:" + err.Error())
-			return
-		}
-		//指标信息
-		err = SyncFromGuangzhouIndex()
-		if err != nil {
-			fmt.Println("SyncFromGuangzhouIndex Err:" + err.Error())
-			return
-		}
-		//数据
-		err = SyncFromGuangzhouTradeData()
-		if err != nil {
-			fmt.Println("SyncFromGuangzhouTradeData Err:" + err.Error())
-			return
-		}
-	}
-
-	//ICPI
-	{
-		//分类信息
-		err = SyncBaseFromIcpiClassify()
-		if err != nil {
-			fmt.Println("SyncBaseFromIcpiClassify Err:" + err.Error())
-			return
-		}
-		//指标信息
-		err = SyncBaseFromIcpi()
-		if err != nil {
-			fmt.Println("SyncBaseFromIcpi Err:" + err.Error())
-			return
-		}
-		err = SyncBaseFromIcpiData()
-		if err != nil {
-			fmt.Println("SyncBaseFromIcpiData Err:" + err.Error())
-			return
-		}
-	}
-
-	// 同步指标数据
-	SyncHzDataIndexData()
-
-	fmt.Println("SyncHzDataIndex end:", time.Now().Format(utils.FormatDateTime))
-	return err
-}
-
-// SyncHzDataIndexData 同步指标数据
-func SyncHzDataIndexData() {
-	var err error
-	//EiaSteo
-	err = SyncEiaSteoIndexDataV2()
-	if err != nil {
-		fmt.Println("SyncEiaSteoIndexData Err:" + err.Error())
-		return
-	}
-
-	// 同步un数据
-	err = SyncComTradeData()
-	if err != nil {
-		fmt.Println("SyncComTradeData Err:" + err.Error())
-		return
-	}
-
-	//
-	fmt.Println(err)
-}

services/task.go

@@ -3,7 +3,6 @@ package services
 import (
 	"context"
 	"eta_gn/eta_task/services/data"
-	"eta_gn/eta_task/services/data/future_good"
 	"eta_gn/eta_task/services/data_stat"
 	"eta_gn/eta_task/utils"
 	"fmt"
@@ -19,9 +18,6 @@ func Task() {
 	if utils.RunMode == "release" || utils.IsStartReleaseTask {
 		releaseTask()
 	}
-	// 定时发布智能研报
-	publishSmartReport := task.NewTask("publishSmartReport", "0 */1 * * * *", PublishSmartReport)
-	task.AddTask("定时发布智能研报", publishSmartReport)
 
 	// 定时发布研报
 	publishReport := task.NewTask("publishReport", "0 */1 * * * *", PublishReport)
@@ -33,26 +29,12 @@ func Task() {
 
 	GnTask()
 
-	// 测试-刷新同花顺高频, 上线前删除
-	//if utils.RunMode == "debug" {
-	//	refreshThsHfBase := task.NewTask("refreshThsHfBase", "0 30 12 * * *", data.RefreshBaseFromThsHfIndex)
-	//	task.AddTask("refreshThsHfBase", refreshThsHfBase)
-	//}
-
 	task.StartTask()
 	fmt.Println("task end")
 }
 
 // 生产环境需要走的任务
 func releaseTask() {
-	//同步指标
-	if utils.BusinessCode != utils.BusinessCodeRelease {
-		syncHzDataIndex := task.NewTask("syncHzDataIndex", "0 10,20,40,50 16,18 * * *", SyncHzDataIndex)
-		task.AddTask("syncHzDataIndex", syncHzDataIndex)
-
-		syncRankingFromDalian := task.NewTask("syncRankingFromDalian", "0 30,40,50 16,18 * * *", SyncRankingFromDalian)
-		task.AddTask("syncRankingFromDalian", syncRankingFromDalian)
-	}
 	// 定时统计交易所的持仓分析数据
 	initPositionTask := task.NewTask("initPositionTask", "0 20,40 16-19 * * *", data.InitPositionTask)
 	task.AddTask("initPositionTask", initPositionTask)
@@ -65,14 +47,6 @@ func releaseTask() {
 	configRefreshData := task.NewTask("syncBaseDataExt", "0 */30 * * * * ", ConfigRefreshDataGn)
 	task.AddTask("configRefreshData", configRefreshData)
 
-	// 定时禁用钢联化工和wind指标的刷新状态
-	//disableEdbRefresh := task.NewTask("disableEdbRefresh", "0 0 10 * * *", DisableEdbRefresh)
-	//task.AddTask("disableEdbRefresh", disableEdbRefresh)
-
-	//同步弘则数据库中来自，钢联，隆众，有色,人工等基础数据--每隔五分钟，同步一次最新数据
-	//syncBaseData := task.NewTask("syncBaseData", "0 */5 * * * * ", SyncBaseData)
-	//task.AddTask("syncBaseData", syncBaseData)
-
 	syncBaseDataExt := task.NewTask("syncBaseDataExt", "0 */30 * * * * ", SyncBaseDataExt)
 	task.AddTask("syncBaseDataExt", syncBaseDataExt)
 
@@ -80,22 +54,6 @@ func releaseTask() {
 	resetEdbInfoIsUpdate := task.NewTask("resetEdbInfoIsUpdate", "0 0 0 * * *", data.ResetEdbInfoIsUpdate)
 	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
 
-	// 刷新商品数据
-	refreshFutureGoodData := task.NewTask("refreshFutureGoodData", "0 30 0,19 * * *", RefreshFutureGoodData)
-	task.AddTask("refreshFutureGoodData", refreshFutureGoodData)
-
-	//刷新交易所指标数据
-	refreshTradeData := task.NewTask("refreshData", "0 1 4 * * *", RefreshTradeData)
-	task.AddTask("refreshTradeData", refreshTradeData)
-
-	//刷新欧洲天然气指标数据
-	refreshEicData := task.NewTask("refreshData", "0 1 3,7 * * *", RefreshEicData)
-	task.AddTask("refreshEicData", refreshEicData)
-
-	//检测数据服务器
-	checkDataServer := task.NewTask("checkDataServer", "0 */2 * * * * ", checkDataServer)
-	task.AddTask("checkDataServer", checkDataServer)
-
 	//删除日志 report_save_log，ppt_v2_save_log，保留一个月的
 	deleteLog := task.NewTask("syncSubStatus", "0 0 2 2 * *", DeleteLog)
 	task.AddTask("deleteLog", deleteLog)
@@ -111,10 +69,6 @@ func releaseTask() {
 	// 每天清理三个月前的用户操作日志
 	clearAdminOperateLog := task.NewTask("clearAdminOperateLog", "0 20 23 * * *", ClearAdminOperateLog)
 	task.AddTask("定时清理用户操作日志", clearAdminOperateLog)
-
-	// 刷新同花顺高频
-	refreshThsHfBase := task.NewTask("refreshThsHfBase", "0 0 0,6,9,12,15,18,21 * * *", data.RefreshBaseFromThsHfIndex)
-	task.AddTask("refreshThsHfBase", refreshThsHfBase)
 }
 
 func RefreshData(cont context.Context) (err error) {
@@ -161,19 +115,6 @@ func RefreshData(cont context.Context) (err error) {
 	return
 }
 
-// SyncBaseData 刷新基础数据
-func SyncBaseData(cont context.Context) (err error) {
-	now := time.Now()
-	if now.Hour() == 0 || now.Hour() == 19 {
-		return nil
-	}
-	//同步钢联基础数据
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		go data.SyncGlDataBase()
-	}
-	return
-}
-
 // SyncBaseDataExt 刷新基础数据
 func SyncBaseDataExt(cont context.Context) (err error) {
 	now := time.Now()
@@ -187,79 +128,6 @@ func SyncBaseDataExt(cont context.Context) (err error) {
 	return
 }
 
-// RefreshFutureGoodData 刷新商品数据
-func RefreshFutureGoodData(cont context.Context) (err error) {
-	future_good.RefreshFutureGoodDataFromThs()
-	fmt.Println("Refresh End")
-	return
-}
-
-// RefreshTradeData 刷新交易所数据
-func RefreshTradeData(cont context.Context) (err error) {
-	wg := sync.WaitGroup{}
-	wg.Add(6)
-
-	//郑商所
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_ZZ)
-	//上期所
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_SH)
-	//上期能源
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_SHFE)
-	//中金所
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_CFFEX)
-	//大商所
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_DL)
-	//广期所数据
-	go data.RefreshBaseDataFromSource(&wg, utils.DATA_SOURCE_GFEX)
-
-	wg.Wait()
-
-	//计算指标
-	data.RefreshDataFromCalculateAll()
-
-	// 刷新所有的基础预测指标
-	data.RefreshBasePredictDataAll()
-
-	// 计算预测指标
-	data.RefreshPredictDataFromCalculateAll()
-
-	return
-}
-
-// RefreshEicData 刷新欧洲天然气数据
-func RefreshEicData(cont context.Context) (err error) {
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-
-	//欧洲天然气
-	go data.RefreshDataFromEic(&wg)
-	wg.Wait()
-	////计算指标
-	//data.RefreshDataFromCalculateAll()
-	//
-	//// 刷新所有的基础预测指标
-	//data.RefreshBasePredictDataAll()
-	//
-	//// 计算预测指标
-	//data.RefreshPredictDataFromCalculateAll()
-
-	return
-}
-
-// 检测数据服务
-func checkDataServer(cont context.Context) (err error) {
-	//检测wind新服务器
-	go data.CheckWindDataInterface(cont)
-	//检测同花顺数据服务器
-	//go data.CheckThsDataInterface(cont)
-
-	//检测路透数据服务器
-	go data.CheckLtDataInterface(cont)
-	//检测彭博
-	go data.CheckPbDataInterface(cont)
-	return
-}
-
 func TaskInit() {
 	fmt.Println("TaskInit start")
 	//data.InitGuangzhouPositionTask()

services/task_xy.go

@@ -1,60 +0,0 @@
-package services
-
-import (
-	"eta_gn/eta_task/services/eta_bridge"
-	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/task"
-)
-
-func XyTask() {
-	if utils.IsXy != "1" {
-		return
-	}
-
-	//eta_bridge.SyncIndexList(nil)
-	//eta_bridge.SyncIndexValueList(nil)
-	//eta_bridge.SyncClassifyList(nil)
-	//eta_bridge.SyncEdbClassifyList(nil)
-	//eta_bridge.SyncIndex(nil)
-	//return
-
-	// 用户信息
-	if utils.SyncUserPath != `` {
-		syncUserTime := utils.SyncUserTime
-		if syncUserTime == `` {
-			syncUserTime = "0 0 * * * *"
-		}
-		// 每小时同步一次用户列表
-		syncUser := task.NewTask("syncUser", syncUserTime, eta_bridge.SyncUser)
-		task.AddTask("定时同步用户账号", syncUser)
-	}
-
-	// 指标相关
-	if utils.SyncIndexPath != `` {
-		// 每天同步一次指标与分类关系的列表
-		syncIndexClassifyTime := utils.SyncIndexClassifyTime
-		if syncIndexClassifyTime == `` {
-			syncIndexClassifyTime = "0 0 0 * * *"
-		}
-		syncIndexClassify := task.NewTask("syncIndexClassify", syncIndexClassifyTime, eta_bridge.SyncClassifyList)
-		task.AddTask("定时同步指标与分类关系", syncIndexClassify)
-
-		// 每小时同步一次指标列表
-		syncIndexTime := utils.SyncIndexTime
-		if syncIndexTime == `` {
-			syncIndexTime = "0 0 * * * *"
-		}
-		syncIndex := task.NewTask("syncIndex", syncIndexTime, eta_bridge.SyncIndex)
-		task.AddTask("定时同步指标信息", syncIndex)
-	}
-
-	if utils.SyncCrmIndexPath != `` {
-		// 每小时同步一次指标列表
-		syncIndexTime := utils.SyncCrmIndexTime
-		if syncIndexTime == `` {
-			syncIndexTime = "0 0 * * * *"
-		}
-		syncXyCrmIndex := task.NewTask("syncXyCrmIndex", syncIndexTime, eta_bridge.SyncXyCrmIndex)
-		task.AddTask("定时同步crm指标信息", syncXyCrmIndex)
-	}
-}

services/trade_cffex.go

@@ -1,56 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 中金交易所持单排名
-func SyncRankingFromCffex() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeCffexIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_CFFEX
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromCffex", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.CffexIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeCffexIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeCffexIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeCffexIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromTradeCffexIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeCffexIndex(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

services/trade_dalian.go

@@ -1,57 +0,0 @@
-package services
-
-import (
-	"context"
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 大连商品交易所持单排名
-func SyncRankingFromDalian(cont context.Context) (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeDalianIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_DL
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromDalian", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.DalianIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeDalianDataList(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeDalianIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeDalianIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromTradeDalianIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeDalianIndex(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

services/trade_guangzhou.go

@@ -1,209 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 广州商品交易所-分类
-func SyncFromGuangzhouClassify() (err error) {
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_GFEX
-	method := `classify/list`
-	result, err := HttpPost("SyncFromGuangzhouClassify", method, data)
-	if err != nil {
-		fmt.Println("SyncFromGuangzhouClassify HttpPost Err:", err.Error())
-		return err
-	}
-	utils.FileLog.Info("SyncFromGuangzhouClassify:" + result)
-	fmt.Println("SyncFromGuangzhouClassify result:", result)
-
-	respObj := new(data_manage.GuangzhouClassifyResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allClassify, err := data_manage.GetBaseFromTradeGuangzhouClassifyAll()
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeGuangzhouClassify)
-	for _, v := range allClassify {
-		existIndexMap[v.BaseFromTradeGuangzhouClassifyId] = v
-	}
-
-	for _, item := range respObj.Data {
-		if _, ok := existIndexMap[item.BaseFromTradeGuangzhouClassifyId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeGuangzhouClassify(item)
-			if err != nil {
-				fmt.Println("AddBaseFromTradeGuangzhouClassify error:", err)
-			}
-			fmt.Println("AddBaseFromTradeGuangzhouClassify new indexID:", newID)
-		}
-	}
-	return err
-}
-
-// 广州商品交易所-指标信息
-func SyncFromGuangzhouIndex() (err error) {
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_GFEX
-	result, err := HttpPost("SyncFromGuangzhou", method, data)
-	if err != nil {
-		fmt.Println("SyncFromGuangzhou HttpPost Err:", err.Error())
-	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncFromGuangzhouIndex result:", result)
-
-	respObj := new(data_manage.GuangzhouIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeGuangzhouIndexAll()
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeGuangzhouIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeGuangzhouIndexId] = v
-	}
-
-	for _, item := range respObj.Data {
-		//if _, ok := existIndexMap[item.BaseFromTradeGuangzhouIndexId]; !ok {
-
-		newID, err := data_manage.AddBaseFromTradeGuangzhouIndex(item)
-		if err != nil {
-			fmt.Println("insert error:", err)
-		}
-		fmt.Println("insert new indexID:", newID)
-		//}
-	}
-	return err
-}
-
-// 广州商品交易所-合约
-func SyncFromGuangzhouContract() (err error) {
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_GFEX
-	method := `contract/list`
-	result, err := HttpPost("SyncFromGuangzhouContract", method, data)
-	if err != nil {
-		fmt.Println("SyncFromGuangzhouContract HttpPost Err:", err.Error())
-	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncFromGuangzhouContract result:", result)
-
-	respObj := new(data_manage.GuangzhouContractResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allClassify, err := data_manage.GetBaseFromTradeGuangzhouContractAll()
-	if err != nil {
-		return
-	}
-
-	existContractMap := make(map[int]*data_manage.BaseFromTradeGuangzhouContract)
-	for _, v := range allClassify {
-		existContractMap[v.BaseFromTradeGuangzhouContractId] = v
-	}
-
-	obj := new(data_manage.BaseFromTradeGuangzhouIndex)
-
-	for _, item := range respObj.Data {
-		if _, ok := existContractMap[item.BaseFromTradeGuangzhouContractId]; !ok {
-			err = obj.AddBaseFromTradeGuangzhouContract(item)
-			if err != nil {
-				fmt.Println("AddBaseFromTradeGuangzhouContract error:", err)
-			}
-			fmt.Println("AddBaseFromTradeGuangzhouContract new indexID:")
-		}
-	}
-	return err
-}
-
-// SyncComTradeData 同步UN指标数据
-func SyncFromGuangzhouTradeData() (err error) {
-	startDate := time.Now().Format(utils.FormatDate) + " 00:00:00"
-	//var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeGuangzhouMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/data/list_page`
-
-	existDataMap := make(map[string]*data_manage.BaseFromTradeGuangzhouData)
-	allData, err1 := data_manage.GetAllBaseFromTradeGuangzhouDataList(startDate)
-	if err1 != nil {
-		fmt.Println("get GetAllBaseFromTradeGuangzhouDataList err:" + err1.Error())
-		return
-	}
-	for _, dv := range allData {
-		tmpKey := dv.IndexCode + "_" + dv.DataTime
-		existDataMap[tmpKey] = dv
-	}
-
-	//获取所有指标信息  某一天的
-	maxPage := 1
-
-	for currPage := 0; currPage < maxPage; currPage++ {
-		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_GFEX
-		data["StartDate"] = startDate
-		data["CurrPage"] = currPage
-		data["PageSize"] = 500 //
-
-		var result string
-		result, err = HttpPost("SyncFromGuangzhouTradeData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
-
-		respObj := new(data_manage.BaseFromTradeGuangzhouDataResp)
-		err = json.Unmarshal([]byte(result), &respObj)
-		if err != nil {
-			fmt.Println("json.Unmarshal err:" + err.Error())
-			return err
-		}
-		if respObj.Ret != 200 {
-			err = errors.New(respObj.ErrMsg)
-			return
-		}
-		// 总页码数
-		maxPage = respObj.Data.Paging.Pages
-
-		addDataList := make([]*data_manage.BaseFromTradeGuangzhouData, 0)
-		if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
-			for _, dv := range respObj.Data.List {
-				tmpKey := dv.IndexCode + "_" + dv.DataTime
-				if _, ok := existDataMap[tmpKey]; !ok {
-					addDataList = append(addDataList, dv)
-					existDataMap[tmpKey] = dv
-				}
-			}
-		}
-
-		// 最后如果还有数据未插入，那么继续插入吧
-		if len(addDataList) > 0 {
-			_, err = data_manage.MultiAddBaseFromTradeGuangzhouData(addDataList)
-			if err != nil {
-				fmt.Println("MultiAddBaseFromTradeGuangzhouData error:", err)
-			}
-		}
-	}
-
-	return err
-}

services/trade_ine.go

@@ -1,56 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 上期能源所持单排名
-func SyncRankingFromIne() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeIneIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_SHFE
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromIne", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.IneIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeIneIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeIneIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeIneIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromTradeIneIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeIneIndex(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

services/trade_shanghai.go

@@ -1,56 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 上海商品交易所持单排名
-func SyncRankingFromShanghai() (err error) {
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeShangHaiIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_SH
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromShanghai", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
-
-	respObj := new(data_manage.ShanghaiIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeShangHaiIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeShanghaiIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeShangHaiIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromTradeShangHaiIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeShangHaiIndex(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

services/trade_zhengzhou.go

@@ -1,61 +0,0 @@
-package services
-
-import (
-	"encoding/json"
-	"eta_gn/eta_task/models/data_manage"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"time"
-)
-
-// 郑州商品交易所持单排名
-func SyncRankingFromZhengzhou() (err error) {
-
-	var startDate string
-	maxDate, err := data_manage.GetBaseFromTradeZhengzhouIndexMaxDate()
-	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
-	}
-
-	method := `index/list`
-	data := make(map[string]interface{})
-	//data["Source"] = utils.DATA_SOURCE_DL
-	data["Source"] = utils.DATA_SOURCE_ZZ
-	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
-	result, err := HttpPost("SyncRankingFromZhengzhou", method, data)
-	if err != nil {
-		fmt.Println("SyncRankingFromZhengzhou HttpPost Err:", err.Error())
-	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncRankingFromZhengzhou result:", result)
-
-	respObj := new(data_manage.ZhengzhouIndexResp)
-	err = json.Unmarshal([]byte(result), &respObj)
-	if err != nil {
-		return err
-	}
-	//获取所有指标信息  某一天的
-	allIndex, err := data_manage.GetBaseFromTradeZhengzhouIndexAll(startDate)
-	if err != nil {
-		return
-	}
-
-	existIndexMap := make(map[int]*data_manage.BaseFromTradeZhengzhouIndex)
-	for _, v := range allIndex {
-		existIndexMap[v.BaseFromTradeZhengzhouIndexId] = v
-	}
-
-	for _, zv := range respObj.Data {
-		if _, ok := existIndexMap[zv.BaseFromTradeZhengzhouIndexId]; !ok {
-			newID, err := data_manage.AddBaseFromTradeZhengzhouIndex(zv)
-			if err != nil {
-				fmt.Println("insert error:", err)
-			}
-			fmt.Println("insert new indexID:", newID)
-		}
-	}
-	return err
-}

utils/config.go

@@ -73,15 +73,6 @@ var (
 	SendWxTemplateMsgUrl string
 )
 
-// BusinessCode 商家编码
-
-var (
-	BusinessCode  string //商户号
-	WindServerUrl string //wind api 接口服务器地址
-	LtServerUrl   string //路透 api 接口服务器地址
-	PbServerUrl   string //彭博 api 接口服务器地址
-)
-
 // ES配置
 var (
 	ES_URL      string // ES服务器地址
@@ -116,12 +107,6 @@ var (
 	AccessKeySecret  string
 )
 
-var (
-	// 是否xy
-	IsXy   string
-	IsPCSG string
-)
-
 var (
 	EtaBridgeUrl          string // 桥接服务地址
 	EtaBridgeAppNameEn    string // 桥接服务英文名称-鉴权用
@@ -144,10 +129,6 @@ var (
 	EtaHubUrl string // 公共服务地址
 )
 
-var (
-	PbRefreshFrequency string // 彭博更新频度
-	PbRefreshOpen      string // 彭博刷新开关 0关闭，默认都是开启的
-)
 var HzDataApi string
 
 func init() {
@@ -236,13 +217,6 @@ func init() {
 	APPID = config["appid"]
 	SECRET = config["secret"]
 
-	// 商家编码
-	BusinessCode = config["business_code"]
-	//服务检测
-	WindServerUrl = config["wind_server_url"]
-	LtServerUrl = config["lt_server_url"]
-	PbServerUrl = config["pb_server_url"]
-
 	// ES配置
 	{
 		ES_URL = config["es_url"]
@@ -278,12 +252,6 @@ func init() {
 		SendWxTemplateEnable = config["send_wx_template_enable"]
 	}
 
-	// 客户信息
-	{
-		IsXy = config["is_xy"]
-		IsPCSG = config["is_pcsg"]
-	}
-
 	// 是否执行生产环境的定时任务
 	if config["is_start_release_task"] == `true` {
 		IsStartReleaseTask = true
@@ -324,9 +292,4 @@ func init() {
 	if HzDataApi == "" {
 		HzDataApi = "https://hzdataapi.hzinsights.com/hzdataapi/"
 	}
-
-	// 彭博刷新频度
-	PbRefreshFrequency = config["pb_refresh_frequency"]
-	// 彭博刷新开关
-	PbRefreshOpen = config["pb_refresh_open"]
 }