tuoling805 2 years ago
parent
commit
e17d0fc20e
34 changed files with 197 additions and 196 deletions
  1. 15 16
      models/data_manage/base_from_smm.go
  2. 3 3
      models/data_manage/chart_info.go
  3. 1 1
      models/data_manage/edb_data_base.go
  4. 6 6
      models/data_manage/edb_data_calculate.go
  5. 1 1
      models/data_manage/edb_data_calculate_ljztbpj.go
  6. 3 3
      models/data_manage/edb_data_calculate_time_shift.go
  7. 1 1
      models/data_manage/edb_data_calculate_zjpj.go
  8. 9 9
      models/data_manage/edb_data_cffex.go
  9. 9 9
      models/data_manage/edb_data_dl.go
  10. 5 5
      models/data_manage/edb_data_gl.go
  11. 7 7
      models/data_manage/edb_data_lt.go
  12. 6 6
      models/data_manage/edb_data_lz.go
  13. 7 7
      models/data_manage/edb_data_manual.go
  14. 5 5
      models/data_manage/edb_data_pb.go
  15. 1 1
      models/data_manage/edb_data_quarter.go
  16. 9 9
      models/data_manage/edb_data_sh.go
  17. 9 9
      models/data_manage/edb_data_shfe.go
  18. 12 12
      models/data_manage/edb_data_ths.go
  19. 13 13
      models/data_manage/edb_data_wind.go
  20. 7 7
      models/data_manage/edb_data_ys.go
  21. 9 9
      models/data_manage/edb_data_zz.go
  22. 11 11
      models/data_manage/edb_info.go
  23. 3 3
      models/data_manage/edb_info_calculate_bp.go
  24. 4 4
      models/data_manage/edb_info_calculate_hbz.go
  25. 4 4
      models/data_manage/edb_info_calculate_hcz.go
  26. 1 1
      models/data_manage/edb_info_calculate_ljztbpj.go
  27. 5 5
      models/data_manage/edb_info_calculate_ljzzy.go
  28. 5 5
      models/data_manage/edb_info_calculate_mapping.go
  29. 5 5
      models/data_manage/edb_info_calculate_nszydpjjs.go
  30. 5 5
      models/data_manage/edb_info_calculate_tbz.go
  31. 5 5
      models/data_manage/edb_info_calculate_tcz.go
  32. 1 1
      models/data_manage/edb_info_calculate_zjpj.go
  33. 8 8
      models/data_manage/future_good/future_good_edb_info.go
  34. 2 0
      services/task.go

+ 15 - 16
models/data_manage/base_from_smm.go

@@ -34,13 +34,13 @@ type BaseFromSmm struct {
 }
 
 func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -67,13 +67,13 @@ type BaseFromSmmIndex struct {
 }
 
 func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_index `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -91,49 +91,48 @@ type BaseFromSmmData struct {
 }
 
 func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmDataAll(indexCode string) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE index_code=?`
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
 	return
 }
 
 func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func GetBaseFromSmmIndexByCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
 	_, err = o.Raw(sql, smmCode).QueryRows(&list)
 	return
 }
 
 func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
-
 func ModifyBaseFromSmmSmmType(baseFromSmmId int, smmType string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm SET smm_type=? WHERE base_from_smm_id=? `
 	_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
 	return
 }
 
 func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	sql = ` UPDATE base_from_smm SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_id=? `
@@ -150,11 +149,11 @@ type BaseFromSmmDataSimple struct {
 }
 
 func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmDataSimple, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
-	if condition!="" {
-		sql+=condition
+	if condition != "" {
+		sql += condition
 	}
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
-}
+}

+ 3 - 3
models/data_manage/chart_info.go

@@ -29,14 +29,14 @@ type ChartInfo struct {
 }
 
 func GetAllChartInfo() (list []*ChartInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT * FROM chart_info  `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 func GetChartInfoEdbEndDate() (list []*ChartInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
@@ -46,7 +46,7 @@ func GetChartInfoEdbEndDate() (list []*ChartInfo, err error) {
 }
 
 func ModifyChartInfoEdbEndDate(chartInfoId int, edbEndDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE chart_info SET edb_end_date=? WHERE chart_info_id=? `
 	_, err = o.Raw(sql, edbEndDate, chartInfoId).Exec()
 	return

+ 1 - 1
models/data_manage/edb_data_base.go

@@ -140,7 +140,7 @@ func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr, value string) (addSql
 }
 
 func GetEdbDataBaseByCodeAndDate(source int, edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tableName := GetEdbDataTableName(source)
 	sql := ` SELECT COUNT(1) AS count FROM %s WHERE edb_code=? AND data_time=? `
 	sql = fmt.Sprintf(sql, tableName)

+ 6 - 6
models/data_manage/edb_data_calculate.go

@@ -7,28 +7,28 @@ import (
 )
 
 func GetEdbDataCalculateByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCalculate(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }
 
 func AddEdbDataCalculateBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 // DeleteEdbDataCalculateBySql 根据删除sql删除指标数据
 func DeleteEdbDataCalculateBySql(deleteStr string, edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(deleteStr, edbInfoId).Exec()
 	return
 }
@@ -51,7 +51,7 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
@@ -60,7 +60,7 @@ func GetEdbInfoCalculateDetail(edbInfoId int) (list []*EdbInfoCalculateDetail, e
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 
 	calculateTableName := GetEdbInfoCalculateTableName(source)
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a

+ 1 - 1
models/data_manage/edb_data_calculate_ljztbpj.go

@@ -20,7 +20,7 @@ type EdbDataCalculateLjztbpj struct {
 
 // GetAllEdbDataCalculateLjztbpjByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataCalculateLjztbpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateLjztbpj, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return

+ 3 - 3
models/data_manage/edb_data_calculate_time_shift.go

@@ -29,7 +29,7 @@ type EdbInfoCalculateMove struct {
 
 //变频
 func RefreshCalculateTimeShift(edbInfoId, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate, moveFrequency string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return
@@ -131,7 +131,7 @@ type EdbInfoCalculateTimeShiftDetail struct {
 }
 
 func GetEdbInfoCalculateTimeShiftDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
@@ -141,7 +141,7 @@ func GetEdbInfoCalculateTimeShiftDetail(edbInfoId int) (item *EdbInfoCalculateTb
 
 //刷新所有变频数据
 func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, moveFrequency string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err

+ 1 - 1
models/data_manage/edb_data_calculate_zjpj.go

@@ -20,7 +20,7 @@ type EdbDataCalculateZjpj struct {
 
 // GetAllEdbDataCalculateZjpjByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataCalculateZjpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateZjpj, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return

+ 9 - 9
models/data_manage/edb_data_cffex.go

@@ -58,7 +58,7 @@ type BaseFromTradeCFFEXIndex struct {
 }
 
 func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
@@ -66,7 +66,7 @@ func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err e
 
 // RefreshEdbDataByCffex 刷新中金所指标数据
 func RefreshEdbDataByCffex(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -170,7 +170,7 @@ func RefreshEdbDataByCffex(edbInfoId int, edbCode, startDate, endDate string) (e
 
 // RefreshAllEdbDataByCffex 全部刷新中金所
 func RefreshAllEdbDataByCffex(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -290,7 +290,7 @@ func RefreshAllEdbDataByCffex(edbInfoId, source int, edbCode, startDate, endDate
 
 // GetBaseInfoFromCffexByIndexCode 获取指标信息
 func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCffex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -299,7 +299,7 @@ func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfo
 
 func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromCffexDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_cffex_index WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -309,13 +309,13 @@ func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*Base
 }
 
 func AddEdbDataCffexBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeCFFEXIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -323,14 +323,14 @@ func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseF
 }
 
 func GetEdbDataCffexByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataCffex(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return

+ 9 - 9
models/data_manage/edb_data_dl.go

@@ -32,7 +32,7 @@ type BaseInfoFromDl struct {
 }
 
 func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
@@ -40,7 +40,7 @@ func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err erro
 
 // RefreshEdbDataByDl 刷新大商所指标数据
 func RefreshEdbDataByDl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -144,7 +144,7 @@ func RefreshEdbDataByDl(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataByDl 全部刷新大商所
 func RefreshAllEdbDataByDl(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -264,7 +264,7 @@ func RefreshAllEdbDataByDl(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromDalianByIndexCode 获取指标信息
 func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInfoFromDl, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -273,7 +273,7 @@ func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInf
 
 func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromDlDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_dalian_index WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -283,13 +283,13 @@ func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataDlBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -297,14 +297,14 @@ func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*Base
 }
 
 func GetEdbDataDlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataDl(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return

+ 5 - 5
models/data_manage/edb_data_gl.go

@@ -10,7 +10,7 @@ import (
 )
 
 func AddEdbDataGlBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
@@ -22,7 +22,7 @@ type GlData struct {
 
 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.NewOrmUsingDB("data")
+	//o := orm.NewOrm()
 	//if condition != "" {
 	//	sql += condition
 	//}
@@ -40,14 +40,14 @@ func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData,
 }
 
 func GetEdbDataGlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
@@ -55,7 +55,7 @@ func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
 
 //刷新钢联指标数据
 func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err

+ 7 - 7
models/data_manage/edb_data_lt.go

@@ -26,41 +26,41 @@ type EdbDataLt struct {
 
 // AddEdbDataLtBySql 执行添加数据的sql
 func AddEdbDataLtBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 // ModifyEdbDataLt 修改路透社数据
 func ModifyEdbDataLt(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func GetEdbDataLtMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func GetEdbDataLtByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func GetEdbDataLtByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
-//刷新所有数据
+// 刷新所有数据
 func RefreshAllEdbDataByLt(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
 	// 获取路透社数据
 	ltDataList, err := QueryEdbDataByLt(edbCode, startDate, endDate)
@@ -68,7 +68,7 @@ func RefreshAllEdbDataByLt(edbInfoId, source int, edbCode, startDate, endDate st
 		return
 	}
 
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	defer func() {
 		if err != nil {

+ 6 - 6
models/data_manage/edb_data_lz.go

@@ -52,7 +52,7 @@ func GetLzSurveyDataByTradeCode(condition string, pars []interface{}) (item []*l
 	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.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -63,28 +63,28 @@ func GetLzSurveyDataByTradeCode(condition string, pars []interface{}) (item []*l
 
 func GetLzSurveyDataExistByTradeCode(surveyProductId int) (items []*LongzhongSurveyData, err error) {
 	sql := ` SELECT  * FROM longzhong_survey_data WHERE 1=1 AND survey_product_id=? `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sql, surveyProductId).QueryRows(&items)
 	return
 }
 
 func GetEdbDataLzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataLz(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
-//刷新隆众指标数据
+// 刷新隆众指标数据
 func RefreshEdbDataByLz(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	defer func() {
 		if err != nil {

+ 7 - 7
models/data_manage/edb_data_manual.go

@@ -10,13 +10,13 @@ import (
 )
 
 func AddEdbDataManualBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataManualMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_manual WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
@@ -31,7 +31,7 @@ type ManualEdbdata struct {
 
 func GetEdbdataManualByTradeCode(condition string, pars []interface{}) (item []*ManualEdbdata, err error) {
 	sql := ` SELECT  * FROM edbdata WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -41,23 +41,23 @@ func GetEdbdataManualByTradeCode(condition string, pars []interface{}) (item []*
 }
 
 func GetEdbDataManualByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_manual WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataManual(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_manual SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }
 
-//刷新手工指标数据
+// 刷新手工指标数据
 func RefreshManual(item *EdbInfoList) (err error) {
 	//edbInfoId int, edbCode, startDate, endDate string
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err

+ 5 - 5
models/data_manage/edb_data_pb.go

@@ -20,34 +20,34 @@ type EdbDataPb struct {
 }
 
 func AddEdbDataPb(items []*EdbDataPb) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func ModifyEdbDataPb(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func ModifyEdbDataPbStatus(edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func GetEdbDataPbCount(edbCode, dataTime string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func GetEdbDataPbMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return

+ 1 - 1
models/data_manage/edb_data_quarter.go

@@ -5,7 +5,7 @@ import (
 )
 
 func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	hsql := `SELECT COUNT(1) AS count FROM edb_data_quarter WHERE edb_info_id=? `
 	err = o.Raw(hsql, edbInfoId).QueryRow(&count)
 	return

+ 9 - 9
models/data_manage/edb_data_sh.go

@@ -58,7 +58,7 @@ type BaseFromTradeShIndex struct {
 }
 
 func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
@@ -66,7 +66,7 @@ func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err erro
 
 // RefreshEdbDataBySh 刷新上期所指标数据
 func RefreshEdbDataBySh(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -170,7 +170,7 @@ func RefreshEdbDataBySh(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataBySh 全部刷新上期所
 func RefreshAllEdbDataBySh(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -290,7 +290,7 @@ func RefreshAllEdbDataBySh(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFromSh, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -299,7 +299,7 @@ func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFro
 
 func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_shanghai_index WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -309,13 +309,13 @@ func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataShBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -323,14 +323,14 @@ func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFrom
 }
 
 func GetEdbDataShByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataSh(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return

+ 9 - 9
models/data_manage/edb_data_shfe.go

@@ -58,7 +58,7 @@ type BaseFromTradeShfeIndex struct {
 }
 
 func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
@@ -66,7 +66,7 @@ func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err er
 
 // RefreshEdbDataByShfe 刷新上期能源指标数据
 func RefreshEdbDataByShfe(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -170,7 +170,7 @@ func RefreshEdbDataByShfe(edbInfoId int, edbCode, startDate, endDate string) (er
 
 // RefreshAllEdbDataByShfe 全部刷新上期能源
 func RefreshAllEdbDataByShfe(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -290,7 +290,7 @@ func RefreshAllEdbDataByShfe(edbInfoId, source int, edbCode, startDate, endDate
 
 // GetBaseInfoFromShfeByIndexCode 获取指标信息
 func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoFromShfe, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -299,7 +299,7 @@ func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoF
 
 func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShfeDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_ine_index WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -309,13 +309,13 @@ func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseF
 }
 
 func AddEdbDataShfeBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShfeIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -323,14 +323,14 @@ func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFr
 }
 
 func GetEdbDataShfeByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataShfe(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return

+ 12 - 12
models/data_manage/edb_data_ths.go

@@ -6,39 +6,39 @@ import (
 )
 
 type EdbDataThs struct {
-	EdbDataId  int `orm:"column(edb_data_id);pk"`
-	EdbInfoId  int
-	EdbCode    string
-	DataTime   string
-	Value      float64
-	Status     int
-	CreateTime time.Time
-	ModifyTime time.Time
+	EdbDataId     int `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.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func ModifyEdbDataThs(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func GetEdbDataThsCount(ebdCode, dataTime string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func GetEdbDataThsMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return

+ 13 - 13
models/data_manage/edb_data_wind.go

@@ -6,46 +6,46 @@ import (
 )
 
 type EdbDataWind struct {
-	EdbDataId  int `orm:"column(edb_data_id);pk"`
-	EdbInfoId  int
-	EdbCode    string
-	DataTime   string
-	Value      float64
-	Status     int
-	CreateTime time.Time
-	ModifyTime time.Time
+	EdbDataId     int `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.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func ModifyEdbDataWind(edbInfoId int64, edbCode, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func ModifyEdbDataWindStatus(edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
 func GetEdbDataWindCount(edbCode, dataTime string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func GetEdbDataWindMaxOrMinDate(edbInfoId int) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return

+ 7 - 7
models/data_manage/edb_data_ys.go

@@ -33,19 +33,19 @@ type EdbDataYs struct {
 }
 
 func AddEdbDataSmm(items []*EdbDataYs) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func ModifyEdbDataSmm(edbCode, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return
 }
 
-//刷新有色指标数据
+// 刷新有色指标数据
 func RefreshEdbDataByYs(edbInfoId int, edbCode, startDate, endDate string) (err error) {
 	var condition string
 	var pars []interface{}
@@ -379,7 +379,7 @@ type TokenData struct {
 	Token string `json:"Token"`
 }
 
-//获取token
+// 获取token
 func getToken(userName string, password string) (string, error) {
 	encryptAuth := md5.New()
 	encryptAuth.Write([]byte(password)) //encrypt password with md5
@@ -414,21 +414,21 @@ func getToken(userName string, password string) (string, error) {
 	return token, nil
 }
 
-//request response
+// request response
 type DataResp struct {
 	Code int      `json:"Code"`
 	Msg  string   `json:"Msg"`
 	Data *ApiData `json:"Data"`
 }
 
-//api data response
+// 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
+// api title
 type ApiField struct {
 	Unit       string `json:"Unit"`
 	Info       string `json:"Info"`

+ 9 - 9
models/data_manage/edb_data_zz.go

@@ -32,7 +32,7 @@ type BaseInfoFromZz struct {
 }
 
 func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
@@ -40,7 +40,7 @@ func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err erro
 
 // RefreshEdbDataByZz 刷新郑商所指标数据
 func RefreshEdbDataByZz(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -144,7 +144,7 @@ func RefreshEdbDataByZz(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataByZz 全部刷新郑商所
 func RefreshAllEdbDataByZz(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -264,7 +264,7 @@ func RefreshAllEdbDataByZz(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromZhengzhouByIndexCode 获取指标信息
 func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*BaseInfoFromZz, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -273,7 +273,7 @@ func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*Base
 
 func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromZzDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_zhengzhou_index WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -283,13 +283,13 @@ func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataZzBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
@@ -297,14 +297,14 @@ func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*B
 }
 
 func GetEdbDataZzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	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)
 	return
 }
 
 func ModifyEdbDataZz(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	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()
 	return

+ 11 - 11
models/data_manage/edb_info.go

@@ -60,7 +60,7 @@ type EdbInfoSearchDataV1 struct {
 }
 
 func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfoList, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -75,7 +75,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 }
 
 func ModifyEdbDataInfoDate(edbInfoId int, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET end_date=?,modify_time=NOW() WHERE edb_info_id=? `
 	_, err = o.Raw(sql, maxDate, edbInfoId).Exec()
 	return
@@ -90,7 +90,7 @@ type EdbInfoMaxAndMinInfo struct {
 }
 
 func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	if tableName == "" {
@@ -110,7 +110,7 @@ func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMin
 }
 
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,modify_time=NOW() WHERE edb_info_id=? `
 	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, edbInfoId).Exec()
 	return
@@ -118,7 +118,7 @@ func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err
 
 //order:1升序,其余值为降序
 func GetEdbDataListAll(condition string, pars []interface{}, source, order int) (item []*EdbInfoSearchData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -137,7 +137,7 @@ func GetEdbDataListAll(condition string, pars []interface{}, source, order int)
 }
 
 func GetEdbDataListAllV1(condition string, pars []interface{}, source, order int) (item []*EdbInfoSearchDataV1, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -156,14 +156,14 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, order int
 }
 
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return
 }
 
 func GetQuarterEdbInfo() (item []*EdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT c.* FROM chart_info AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
@@ -175,7 +175,7 @@ func GetQuarterEdbInfo() (item []*EdbInfo, err error) {
 }
 
 func ResetEdbInfoIsUpdate() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET is_update=1  `
 	_, err = o.Raw(sql).Exec()
 	return
@@ -183,7 +183,7 @@ func ResetEdbInfoIsUpdate() (err error) {
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//if calculateTableName == "" {
 	//	err = errors.New("无效的表名")
@@ -204,7 +204,7 @@ func DeleteEdbDataByIdAndSource(edbDataId, source int) (err error) {
 	tableName := GetEdbDataTableName(source)
 	sql = fmt.Sprintf(sql, tableName)
 
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Raw(sql, edbDataId).Exec()
 	return
 }

+ 3 - 3
models/data_manage/edb_info_calculate_bp.go

@@ -25,9 +25,9 @@ type EdbInfoCalculateBp struct {
 	ModifyTime           time.Time `description:"修改时间"`
 }
 
-//变频
+// 变频
 func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -157,7 +157,7 @@ type EdbInfoCalculateBpDetail struct {
 }
 
 func GetEdbInfoCalculateBpDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `

+ 4 - 4
models/data_manage/edb_info_calculate_hbz.go

@@ -25,7 +25,7 @@ type EdbInfoCalculateHbz struct {
 	ModifyTime            time.Time `description:"修改时间"`
 }
 
-//环比值,current:当期,pre:上期 公式: (当期-上期)/上期
+// 环比值,current:当期,pre:上期 公式: (当期-上期)/上期
 func HbzDiv(current, pre float64) string {
 	if pre == 0 {
 		return ""
@@ -37,9 +37,9 @@ func HbzDiv(current, pre float64) string {
 	return valStr
 }
 
-//刷新环比值数据
+// 刷新环比值数据
 func RefreshCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string, formulaInt int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -156,7 +156,7 @@ type EdbInfoCalculateHbzDetail struct {
 }
 
 func GetEdbInfoCalculateHbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `

+ 4 - 4
models/data_manage/edb_info_calculate_hcz.go

@@ -25,7 +25,7 @@ type EdbInfoCalculateHcz struct {
 	ModifyTime            time.Time `description:"修改时间"`
 }
 
-//环差值,current:当期,pre:上期 公式:当期-上期
+// 环差值,current:当期,pre:上期 公式:当期-上期
 func HczDiv(current, pre float64) string {
 	if pre == 0 {
 		return ""
@@ -37,9 +37,9 @@ func HczDiv(current, pre float64) string {
 	return valStr
 }
 
-//刷新环比值数据
+// 刷新环比值数据
 func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -155,7 +155,7 @@ type EdbInfoCalculateHczDetail struct {
 }
 
 func GetEdbInfoCalculateHczDetail(edbInfoId int) (item *EdbInfoCalculateHczDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `

+ 1 - 1
models/data_manage/edb_info_calculate_ljztbpj.go

@@ -30,7 +30,7 @@ type EdbInfoCalculateLjztbpjDetail struct {
 
 // RefreshAllCalculateLjztbpj 刷新所有 累计值同比拼接 数据
 func RefreshAllCalculateLjztbpj(edbInfo *EdbInfo) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err

+ 5 - 5
models/data_manage/edb_info_calculate_ljzzy.go

@@ -25,9 +25,9 @@ type EdbInfoCalculateLjzzy struct {
 	ModifyTime              time.Time `description:"修改时间"`
 }
 
-//刷新累计值转月值数据
+// 刷新累计值转月值数据
 func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -194,7 +194,7 @@ type EdbInfoCalculateLjzzyDetail struct {
 }
 
 func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
@@ -203,14 +203,14 @@ func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyD
 }
 
 func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate_ljzzy WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate_ljzzy SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return

+ 5 - 5
models/data_manage/edb_info_calculate_mapping.go

@@ -24,15 +24,15 @@ type EdbInfoCalculateMapping struct {
 }
 
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func FixEdbInfoCalculateMapping() {
-	o := orm.NewOrmUsingDB("data")
-	tx,err:=o.Begin()
-	if err!=nil {
+	o := orm.NewOrm()
+	tx, err := o.Begin()
+	if err != nil {
 		return
 	}
 	defer func() {
@@ -104,7 +104,7 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `

+ 5 - 5
models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -25,9 +25,9 @@ type EdbInfoCalculateNszydpjjs struct {
 	ModifyTime                  time.Time `description:"修改时间"`
 }
 
-//刷新 N数值移动平均计算
+// 刷新 N数值移动平均计算
 func RefreshCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -169,7 +169,7 @@ type EdbInfoCalculateNszydpjjsDetail struct {
 }
 
 func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNszydpjjsDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
@@ -178,14 +178,14 @@ func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNs
 }
 
 func GetEdbDataCalculateNszydpjjsByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate_nszydpjjs WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCalculateNszydpjjs(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate_nszydpjjs SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return

+ 5 - 5
models/data_manage/edb_info_calculate_tbz.go

@@ -34,9 +34,9 @@ func TbzDiv(a, b float64) string {
 	return valStr
 }
 
-//刷新同比值数据
+// 刷新同比值数据
 func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -279,7 +279,7 @@ type EdbInfoCalculateTbzDetail struct {
 }
 
 func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
@@ -288,14 +288,14 @@ func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetai
 }
 
 func GetEdbDataCalculateTbzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate_tbz WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCalculateTbz(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate_tbz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return

+ 5 - 5
models/data_manage/edb_info_calculate_tcz.go

@@ -34,9 +34,9 @@ func TczSub(a, b float64) string {
 	return valStr
 }
 
-//刷新同差值数据
+// 刷新同差值数据
 func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err
@@ -280,7 +280,7 @@ type EdbInfoCalculateTczDetail struct {
 }
 
 func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
@@ -289,14 +289,14 @@ func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetai
 }
 
 func GetEdbDataCalculateTczByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate_tcz WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCalculateTcz(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate_tcz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return

+ 1 - 1
models/data_manage/edb_info_calculate_zjpj.go

@@ -28,7 +28,7 @@ type EdbInfoCalculateZjpjDetail struct {
 
 // RefreshAllCalculateZjpj 刷新所有 直接拼接 数据
 func RefreshAllCalculateZjpj(edbInfo *EdbInfo) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
 		return err

+ 8 - 8
models/data_manage/future_good/future_good_edb_info.go

@@ -15,7 +15,7 @@ type FutureGoodEdbInfo struct {
 	Exchange            string    `description:"所属交易所"`
 	Month               int       `description:"所属月份"`
 	StartDate           string    `description:"起始日期"`
-	EndDate             time.Time    `description:"终止日期"`
+	EndDate             time.Time `description:"终止日期"`
 	MinValue            float64   `description:"最小值"`
 	MaxValue            float64   `description:"最大值"`
 	LatestValue         float64   `description:"数据最新的值"`
@@ -27,7 +27,7 @@ type FutureGoodEdbInfo struct {
 
 // GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_info_id = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
@@ -36,7 +36,7 @@ func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
 
 // GetFutureGoodEdbInfoList 获取指标数据列表
 func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -48,7 +48,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 
 // GetAllFutureGoodEdbInfoList 获取指标数据列表
 func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info  ORDER BY future_good_edb_info_id DESC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -56,7 +56,7 @@ func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
 
 // GetFutureGoodEdbInfoListByParentId 根据父级ID获取指标数据列表
 func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ?  ORDER BY future_good_edb_info_id ASC `
 	_, err = o.Raw(sql, parentId).QueryRows(&list)
 	return
@@ -64,7 +64,7 @@ func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo
 
 // AddFutureGoodEdbInfo 添加期货数据库指标
 func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	lastId, err := o.Insert(item)
 	if err != nil {
 		return
@@ -75,7 +75,7 @@ func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
 
 // Update 更新指标基础信息
 func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	_, err = o.Update(FutureGoodEdbInfo, cols...)
 	return
 }
@@ -89,7 +89,7 @@ type FutureGoodEdbInfoGroupListResp struct {
 
 // GetFutureGoodEdbInfoGroupList 获取分組指标数据列表
 func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition

+ 2 - 0
services/task.go

@@ -20,6 +20,8 @@ func Task() {
 
 	task.StartTask()
 
+	ctx := new(context.Context)
+	RefreshData(*ctx)
 	fmt.Println("task end")
 }