fix

models/chart.go

@@ -33,8 +33,7 @@ type ChartInfo struct {
 }
 
 func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
 	err = o.Raw(sql, uniqueCode).QueryRow(&item)
 	return
@@ -68,8 +67,7 @@ type ChartEdbInfoMapping struct {
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.edb_code,b.edb_name,b.frequency,b.unit,b.start_date,b.end_date,b.modify_time,b.edb_type
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
@@ -110,8 +108,7 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 	}
 	sql += ` ORDER BY data_time ASC  `
 	sql = fmt.Sprintf(sql, tableName)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
 	return
 }

models/data_manage/base_from_smm.go

@@ -32,23 +32,20 @@ type BaseFromSmm struct {
 }
 
 func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_smm `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 func GetBaseFromSmmBySmmCode(smmCode string) (item *BaseFromSmm, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_smm WHERE interface=?`
 	err = o.Raw(sql, smmCode).QueryRow(&item)
 	return
@@ -74,15 +71,13 @@ type BaseFromSmmIndex struct {
 }
 
 func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_smm_index `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -100,63 +95,55 @@ type BaseFromSmmData struct {
 }
 
 func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetBaseFromSmmDataAll() (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_smm_data `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
 	_, err = o.Raw(sql, value, smmDataId).Exec()
 	return
 }
 
 func GetBaseFromSmmIndexBySmmCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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 ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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()
 	return
 }
 
 func GetBaseFromSmmDataAllByIndexCode(indexCode string) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_smm_data WHERE index_code=? `
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
 	return
 }
 
 func GetBaseFromSmmIndexByIndexCode(indexCode string) (list *BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&list)
 	return

models/data_manage/base_from_trade_index.go

@@ -83,8 +83,7 @@ type BaseFromTradeIneIndex struct {
 }
 
 func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if classifyName == "" {
 		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=?"
 		_, err = o.Raw(sql, date).QueryRows(&list)
@@ -101,24 +100,21 @@ func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType str
 }
 
 func GetExchangeClassify(exchange string) (classifyName []*string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT DISTINCT classify_name FROM base_from_trade_" + exchange + "_index ORDER BY CONVERT(classify_name using gbk) DESC"
 	_, err = o.Raw(sql).QueryRows(&classifyName)
 	return
 }
 
 func GetLatestDate(exchange string) (date []*BaseFromTradeIneIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_trade_" + exchange + "_index ORDER BY data_time desc limit 1"
 	_, err = o.Raw(sql).QueryRows(&date)
 	return
 }
 
 func GetExchangeClassifyContract(exchange, Classify, dataTime string) (classifyName []*string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT DISTINCT classify_type FROM base_from_trade_" + exchange + "_index where classify_name=? and data_time=?"
 	_, err = o.Raw(sql, Classify, dataTime).QueryRows(&classifyName)
 	return

models/data_manage/chart_classify.go

@@ -21,8 +21,7 @@ type ChartClassify struct {
 }
 
 func AddChartClassify(item *ChartClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -34,8 +33,7 @@ type AddChartClassifyReq struct {
 }
 
 func GetChartClassifyCount(chartClassifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM chart_classify WHERE parent_id=? AND chart_classify_name=? `
 	err = o.Raw(sql, parentId, chartClassifyName).QueryRow(&count)
 	return
@@ -47,24 +45,21 @@ type EditChartClassifyReq struct {
 }
 
 func GetChartClassifyById(classifyId int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
 }
 
 func GetChartClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) AS count FROM chart_classify WHERE chart_classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
 }
 
 func EditChartClassify(classifyId int, chartClassifyName string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE chart_classify SET chart_classify_name=?,modify_time=NOW() WHERE chart_classify_id=? `
 	_, err = o.Raw(sql, chartClassifyName, classifyId).Exec()
 	return
@@ -76,8 +71,7 @@ type DeleteChartClassifyReq struct {
 }
 
 func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
 				WHERE a.chart_classify_id IN(
 				SELECT t.chart_classify_id FROM 
@@ -95,8 +89,7 @@ func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
 }
 
 func DeleteChartClassify(classifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM chart_classify
 				WHERE chart_classify_id IN(
 				SELECT t.chart_classify_id FROM
@@ -114,16 +107,14 @@ func DeleteChartClassify(classifyId int) (err error) {
 }
 
 func GetChartClassifyByParentId(parentId int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
 
 func GetChartClassifyAll() (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id<>0  order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -166,8 +157,7 @@ type ChartClassifyDeleteCheckReq struct {
 }
 
 func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM (
 			SELECT rd.*
 			FROM (SELECT * FROM chart_classify WHERE parent_id IS NOT NULL) rd,
@@ -182,8 +172,7 @@ func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err erro
 }
 
 func GetChartClassifyByCondition(condition string, pars []interface{}) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -202,8 +191,7 @@ type MoveChartClassifyReq struct {
 
 // GetFirstChartClassifyByParentId 获取当前父级图表分类下的排序第一条的数据
 func GetFirstChartClassifyByParentId(parentId int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? order by sort asc,chart_classify_id asc limit 1`
 	err = o.Raw(sql, parentId).QueryRow(&item)
 	return
@@ -211,8 +199,7 @@ func GetFirstChartClassifyByParentId(parentId int) (item *ChartClassify, err err
 
 // UpdateChartClassifySortByParentId 根据图表父类id更新排序
 func UpdateChartClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` update chart_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
@@ -223,16 +210,14 @@ func UpdateChartClassifySortByParentId(parentId, classifyId, nowSort int, update
 
 // Update 更新图表分类基础信息
 func (chartClassify *ChartClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(chartClassify, cols...)
 	return
 }
 
 // GetChartClassifyMaxSort 获取图表分类下最大的排序数
 func GetChartClassifyMaxSort(parentId int) (sort int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM chart_classify WHERE parent_id=? `
 	err = o.Raw(sql, parentId).QueryRow(&sort)
 	return
@@ -245,8 +230,7 @@ type ChartClassifyView struct {
 }
 
 func GetChartClassifyViewById(classifyId int) (item *ChartClassifyView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return

models/data_manage/chart_edb_mapping.go

@@ -25,15 +25,13 @@ type ChartEdbMapping struct {
 }
 
 func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.edb_code,b.edb_name,b.frequency,b.unit,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
@@ -44,8 +42,7 @@ func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err e
 }
 
 func GetChartEdbMappingListByEdbInfoId(edbInfoStr string) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *
              FROM edb_info
 			 WHERE edb_info_id IN(` + edbInfoStr + `)

models/data_manage/chart_info.go

@@ -38,8 +38,7 @@ type ChartInfo struct {
 }
 
 func AddChartInfo(item *ChartInfo) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -52,8 +51,7 @@ type ChartInfoItem struct {
 
 //用于分类展示
 func GetChartInfoAll() (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,
              unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date
             FROM chart_info ORDER BY sort asc,create_time ASC `
@@ -63,8 +61,7 @@ func GetChartInfoAll() (items []*ChartClassifyItems, err error) {
 
 //用于分类展示
 func GetChartInfoAllList() (items []*ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *
             FROM chart_info ORDER BY create_time ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
@@ -90,16 +87,14 @@ type ChartInfoSearchResp struct {
 }
 
 func GetChartInfoById(chartInfoId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id=? `
 	err = o.Raw(sql, chartInfoId).QueryRow(&item)
 	return
 }
 
 func GetChartInfoViewById(chartInfoId int) (item *ChartInfoView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id=? `
 	err = o.Raw(sql, chartInfoId).QueryRow(&item)
 	return
@@ -135,8 +130,7 @@ type ChartSaveItem struct {
 }
 
 func DeleteChartInfoAndData(chartInfoId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	defer func() {
 		if err != nil {
 			o.Rollback()
@@ -156,8 +150,7 @@ func DeleteChartInfoAndData(chartInfoId int) (err error) {
 }
 
 func GetChartInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -185,8 +178,7 @@ type EditChartInfoReq struct {
 }
 
 func ModifyChartInfo(item *EditChartInfoReq) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info
 			SET
 			  chart_name =?,
@@ -216,8 +208,7 @@ type ChartInfoListResp struct {
 }
 
 func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -227,16 +218,14 @@ func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartI
 }
 
 func GetChartInfoByNewest() (item *EdbInfoList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 ORDER BY modify_time DESC LIMIT 1 `
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }
 
 func ModifyChartInfoModifyTime(chartInfoId int64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info SET modify_time = NOW() WHERE chart_info_id = ? `
 	_, err = o.Raw(sql, chartInfoId).Exec()
 	return
@@ -250,8 +239,7 @@ type MoveChartInfoReq struct {
 }
 
 func MoveChartInfo(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info
 			SET
 			  chart_classify_id = ?
@@ -292,8 +280,7 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
 	return
 }
@@ -302,8 +289,7 @@ func GetEdbDataLunarList(endInfoId int, startDate, endDate string) (list []*EdbD
 	tableName := "edb_data_quarter"
 	sql := `SELECT edb_data_id,edb_info_id,data_time,TRUNCATE(value,2) AS value,data_timestamp FROM %s WHERE edb_info_id=? AND data_time>=? AND data_time<=? ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId, startDate, endDate).QueryRows(&list)
 	return
 }
@@ -325,8 +311,7 @@ func GetEdbDataListMinAndMax(source, endInfoId int, startDate, endDate string) (
 	}
 
 	sql = fmt.Sprintf(sql, tableName)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	if condition != "" {
 		sql += condition
@@ -383,8 +368,7 @@ type ChartInfoDetailResp struct {
 }
 
 func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chartType int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -506,8 +490,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 }
 
 func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -646,8 +629,7 @@ func ModifyEdbDatadTimestamp(source, edbDataId int, dataTimestamp int64) (err er
 	tableName := GetEdbDataTableName(source)
 	sql := `UPDATE %s SET data_timestamp=? WHERE edb_data_id=? `
 	sql = fmt.Sprintf(sql, tableName)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, dataTimestamp, edbDataId).Exec()
 	return
 }
@@ -688,15 +670,13 @@ func ChartInfoExist(condition, edbInfoIdStr string) (count int, err error) {
 		)AS t
 		WHERE t.edb_info_id_str=? 
         GROUP BY t.edb_info_id_str `
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	err = o.Raw(sql, edbInfoIdStr).QueryRow(&count)
 	return
 }
 
 func ChartInfoSearchByKeyWord(KeyWord string) (searchList []*ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info `
 	if KeyWord != "" {
 		sql += `WHERE chart_name LIKE '%` + KeyWord + `%'  `
@@ -710,8 +690,7 @@ func ChartInfoSearchByKeyWord(KeyWord string) (searchList []*ChartInfo, err erro
 }
 
 func GetNextChartInfo(classifyId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.* FROM chart_classify AS a
 			INNER JOIN chart_info AS b ON a.chart_classify_id=b.chart_classify_id
 			WHERE a.chart_classify_id>?
@@ -722,8 +701,7 @@ func GetNextChartInfo(classifyId int) (item *ChartInfo, err error) {
 }
 
 func GetChartInfoRefreshData(chartInfoId int) (baseEdbInfoArr, calculateInfoArr []*EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	sql := ` SELECT b.* FROM  chart_edb_mapping AS a
 		   INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id 
@@ -780,8 +758,7 @@ type SetChartInfoImageReq struct {
 }
 
 func EditChartInfoImage(req *SetChartInfoImageReq) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	sql := ` UPDATE  chart_info SET chart_image=?, modify_time = NOW() WHERE chart_info_id = ? `
 	_, err = o.Raw(sql, req.ImageUrl, req.ChartInfoId).Exec()
@@ -800,8 +777,7 @@ type ChartInfoDetailFromUniqueCodeResp struct {
 }
 
 func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfoView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
 	err = o.Raw(sql, uniqueCode).QueryRow(&item)
 	return
@@ -809,8 +785,7 @@ func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfoView, err error
 
 // GetFirstChartInfoByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstChartInfoByClassifyId(classifyId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_classify_id=? order by sort asc,chart_info_id asc limit 1`
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
@@ -818,8 +793,7 @@ func GetFirstChartInfoByClassifyId(classifyId int) (item *ChartInfo, err error)
 
 // UpdateChartInfoSortByClassifyId 根据图表id更新排序
 func UpdateChartInfoSortByClassifyId(classifyId, nowSort, prevChartInfoId int, updateSort string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` update chart_info set sort = ` + updateSort + ` WHERE chart_classify_id=? and sort > ? `
 	if prevChartInfoId > 0 {
 		sql += ` or (chart_info_id > ` + fmt.Sprint(prevChartInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
@@ -830,8 +804,7 @@ func UpdateChartInfoSortByClassifyId(classifyId, nowSort, prevChartInfoId int, u
 
 // Update 更新图表基础信息
 func (chartInfo *ChartInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(chartInfo, cols...)
 	return
 }
@@ -882,8 +855,7 @@ type ImageSvgToPngResp struct {
 
 // GetChartInfoByClassifyIdAndName 根据分类id和图表名获取图表信息
 func GetChartInfoByClassifyIdAndName(classifyId int, chartName string) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_classify_id = ? and chart_name=? `
 	err = o.Raw(sql, classifyId, chartName).QueryRow(&item)
 	return

models/data_manage/chart_info_log.go

@@ -20,8 +20,7 @@ type ChartInfoLog struct {
 }
 
 func AddChartInfoLog(item *ChartInfoLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }

models/data_manage/edb_classify.go

@@ -21,8 +21,7 @@ type EdbClassify struct {
 }
 
 func AddEdbClassify(item *EdbClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -34,8 +33,7 @@ type AddEdbClassifyReq struct {
 }
 
 func GetEdbClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM edb_classify WHERE parent_id=? AND classify_name=? `
 	err = o.Raw(sql, parentId, classifyName).QueryRow(&count)
 	return
@@ -47,24 +45,21 @@ type EditEdbClassifyReq struct {
 }
 
 func GetEdbClassifyById(classifyId int) (item *EdbClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
 }
 
 func GetEdbClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) AS count FROM edb_classify WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
 }
 
 func EditEdbClassify(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
 	_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	return
@@ -76,8 +71,7 @@ type DeleteEdbClassifyReq struct {
 }
 
 func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info AS a
 				WHERE a.classify_id IN(
 				SELECT t.classify_id FROM 
@@ -95,8 +89,7 @@ func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
 }
 
 func DeleteEdbClassify(classifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM edb_classify
 				WHERE classify_id IN(
 				SELECT t.classify_id FROM
@@ -114,16 +107,14 @@ func DeleteEdbClassify(classifyId int) (err error) {
 }
 
 func GetEdbClassifyByParentId(parentId int) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE parent_id=?  order by sort asc,classify_id asc`
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
 
 func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE parent_id<>0  order by sort asc,classify_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -162,8 +153,7 @@ type ClassifyDeleteCheckReq struct {
 }
 
 func GetClassifyCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM (
 			SELECT rd.*
 			FROM (SELECT * FROM edb_classify WHERE parent_id IS NOT NULL) rd,
@@ -186,8 +176,7 @@ type EdbClassifySimplify struct {
 //递归获取所有目录
 func GetClassifyAllByClassifyId(classifyId int) (resultList []*EdbClassifySimplify, err error) {
 	fmt.Println("185")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	for {
 		sql := ` SELECT * FROM edb_classify AS a
 			WHERE a.classify_id=? order by sort asc,classify_id asc`
@@ -216,8 +205,7 @@ type MoveEdbClassifyReq struct {
 
 // GetFirstEdbClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func GetFirstEdbClassifyByParentId(parentId int) (item *EdbClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE parent_id=? order by sort asc,classify_id asc limit 1`
 	err = o.Raw(sql, parentId).QueryRow(&item)
 	return
@@ -225,8 +213,7 @@ func GetFirstEdbClassifyByParentId(parentId int) (item *EdbClassify, err error)
 
 // UpdateEdbClassifySortByParentId 根据父类id更新排序
 func UpdateEdbClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` update edb_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
@@ -237,16 +224,14 @@ func UpdateEdbClassifySortByParentId(parentId, classifyId, nowSort int, updateSo
 
 // Update 更新分类基础信息
 func (edbClassify *EdbClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(edbClassify, cols...)
 	return
 }
 
 // GetEdbClassifyMaxSort 获取分类下最大的排序数
 func GetEdbClassifyMaxSort(parentId int) (sort int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_classify WHERE parent_id=? `
 	err = o.Raw(sql, parentId).QueryRow(&sort)
 	return

models/data_manage/edb_data_base.go

@@ -108,8 +108,7 @@ type EdbDataBase struct {
 func GetEdbDataAllByEdbCode(edbCode string, source, limit int) (items []*EdbInfoSearchData, err error) {
 	var pars []interface{}
 	pars = append(pars, edbCode)
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	tableName := GetEdbDataTableName(source)
 	sql := ` SELECT * FROM %s WHERE edb_code=? ORDER BY data_time DESC`
@@ -123,8 +122,7 @@ func GetEdbDataAllByEdbCode(edbCode string, source, limit int) (items []*EdbInfo
 }
 
 func GetEdbDataBaseByCodeAndDate(source int, edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source)
 	sql := ` SELECT COUNT(1) AS count FROM %s WHERE edb_code=? AND data_time=? `
 	sql = fmt.Sprintf(sql, tableName)

models/data_manage/edb_data_calculate.go

@@ -24,30 +24,26 @@ type EdbDataCalculate struct {
 }
 
 func AddEdbDataCalculate(items []*EdbDataCalculate) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func AddEdbDataCalculateBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func ModifyEdbDataCalculate(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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 GetEdbDataCalculateByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -55,8 +51,7 @@ func GetEdbDataCalculateByCodeAndDate(edbCode string, startDate string) (count i
 
 //刷新全部数据
 func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_calculate_ljztbpj.go

@@ -20,8 +20,7 @@ type EdbDataCalculateLjztbpj struct {
 
 // GetAllEdbDataCalculateLjztbpjByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataCalculateLjztbpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateLjztbpj, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_calculate_ljztbpj WHERE edb_info_id=? ORDER BY data_time DESC `
 	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 	return

models/data_manage/edb_data_calculate_time_shift.go

@@ -31,8 +31,7 @@ type EdbInfoCalculateMove struct {
 //时间移位
 func AddCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateTimeShift")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -164,8 +163,7 @@ func AddCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbIn
 //环比值
 func EditCalculateTimeShift(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string, oldEdbInfo *EdbInfo) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -306,8 +304,7 @@ func EditCalculateTimeShift(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbI
 
 //变频
 func RefreshCalculateTimeShift(edbInfoId, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate, moveFrequency string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -406,8 +403,7 @@ type EdbInfoCalculateTimeShiftDetail struct {
 }
 
 func GetEdbInfoCalculateTimeShiftDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -417,8 +413,7 @@ func GetEdbInfoCalculateTimeShiftDetail(edbInfoId int) (item *EdbInfoCalculateTb
 
 //刷新所有变频数据
 func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate, moveFrequency string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_calculate_zjpj.go

@@ -20,8 +20,7 @@ type EdbDataCalculateZjpj struct {
 
 // GetAllEdbDataCalculateZjpjByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataCalculateZjpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateZjpj, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_calculate_zjpj WHERE edb_info_id=? ORDER BY data_time DESC `
 	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 	return

models/data_manage/edb_data_cffex.go

@@ -58,16 +58,14 @@ type BaseFromTradeCFFEXIndex struct {
 }
 
 func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbDataByCffex(edbCode, suffix, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -142,8 +140,7 @@ func GetEdbDataByCffex(edbCode, suffix, startDate, endDate string) (searchItem *
 
 // RefreshEdbDataByCffex 刷新中金所指标数据
 func RefreshEdbDataByCffex(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -244,8 +241,7 @@ func RefreshEdbDataByCffex(edbInfoId int, edbCode, startDate, endDate string) (e
 
 // RefreshAllEdbDataByCffex 全部刷新中金所
 func RefreshAllEdbDataByCffex(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -362,8 +358,7 @@ func RefreshAllEdbDataByCffex(edbInfoId, source int, edbCode, startDate, endDate
 
 // GetBaseInfoFromCffexByIndexCode 获取指标信息
 func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCffex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -372,8 +367,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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if condition != "" {
 		sql += condition
 	}
@@ -383,23 +377,20 @@ func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*Base
 }
 
 func AddEdbDataCffexBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataCffexByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_cffex WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeCFFEXIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -407,16 +398,14 @@ func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseF
 }
 
 func GetEdbDataCffexByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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

models/data_manage/edb_data_coal.go

@@ -10,23 +10,20 @@ import (
 )
 
 func AddEdbDataCoalBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataCoalByEdbCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_coal WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetEdbDataCoalMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_coal WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
@@ -68,8 +65,7 @@ type BaseFromCoalmineIndex struct {
 }
 
 func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&items)
@@ -77,16 +73,14 @@ func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoal
 }
 
 func GetEdbDataCoalByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_coal WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetEdbDataByCoal(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -161,24 +155,21 @@ func GetEdbDataByCoal(edbCode, startDate, endDate string) (searchItem *EdbInfoSe
 }
 
 func ModifyEdbDataCoalStatus(edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_coal SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
 	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
 	return
 }
 
 func GetEdbDataCoalByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_coal WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func ModifyEdbDataCoal(edbInfoId int64, dataTime, value string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_coal SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
@@ -186,8 +177,7 @@ func ModifyEdbDataCoal(edbInfoId int64, dataTime, value string) (err error) {
 
 //刷新煤炭指标数据
 func RefreshEdbDataByCoal(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -264,8 +254,7 @@ func RefreshEdbDataByCoal(edbInfoId int, edbCode, startDate, endDate string) (er
 
 //全部刷新隆众数据
 func RefreshAllEdbDataByCoal(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_dl.go

@@ -58,16 +58,14 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbDataByDl(edbCode, suffix, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -142,8 +140,7 @@ func GetEdbDataByDl(edbCode, suffix, startDate, endDate string) (searchItem *Edb
 
 // RefreshEdbDataByDl 刷新大商所指标数据
 func RefreshEdbDataByDl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -244,8 +241,7 @@ func RefreshEdbDataByDl(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataByDl 全部刷新大商所
 func RefreshAllEdbDataByDl(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -362,8 +358,7 @@ func RefreshAllEdbDataByDl(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromDalianByIndexCode 获取指标信息
 func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInfoFromDl, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_dalian_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -372,8 +367,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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if condition != "" {
 		sql += condition
 	}
@@ -383,23 +377,20 @@ func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataDlBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataDlByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_dl WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_dalian_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -407,16 +398,14 @@ func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*Base
 }
 
 func GetEdbDataDlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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

models/data_manage/edb_data_gl.go

@@ -10,23 +10,20 @@ import (
 )
 
 func AddEdbDataGlBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataGlByEdbCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_gl WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetEdbDataGlMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_gl WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
@@ -50,8 +47,7 @@ func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData,
 }
 
 func GetEdbDataGlByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_gl WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
@@ -136,24 +132,21 @@ func GetEdbDataByGl(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 }
 
 func ModifyEdbDataGlStatus(edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_gl SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
 	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
 	return
 }
 
 func GetEdbDataGlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -161,8 +154,7 @@ func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
 
 //刷新钢联指标数据
 func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -241,8 +233,7 @@ func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err
 
 //全部刷新隆众数据
 func RefreshAllEdbDataByGl(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_lt.go

@@ -26,40 +26,35 @@ type EdbDataLt struct {
 
 // AddEdbDataLtBySql 执行添加数据的sql
 func AddEdbDataLtBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 // ModifyEdbDataLt 修改路透社数据
 func ModifyEdbDataLt(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_lt WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
 	return
@@ -73,8 +68,7 @@ func RefreshAllEdbDataByLt(edbInfoId, source int, edbCode, startDate, endDate st
 		return
 	}
 
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_lz.go

@@ -10,23 +10,20 @@ import (
 )
 
 func AddEdbDataLzBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataLzByEdbCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_lz WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetEdbDataLzMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_lz WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
@@ -52,16 +49,14 @@ func GetLzSurveyDataByTradeCode(condition string, pars []interface{}) (item []*l
 }
 
 func GetEdbDataLzByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_lz WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetEdbDataByLz(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -136,24 +131,21 @@ func GetEdbDataByLz(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 }
 
 func ModifyEdbDataLzStatus(edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_lz SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
 	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
 	return
 }
 
 func GetEdbDataLzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -161,8 +153,7 @@ func ModifyEdbDataLz(edbInfoId int64, dataTime, value string) (err error) {
 
 //刷新隆众指标数据
 func RefreshEdbDataByLz(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -239,8 +230,7 @@ func RefreshEdbDataByLz(edbInfoId int, edbCode, startDate, endDate string) (err
 
 //全部刷新隆众数据
 func RefreshAllEdbDataByLz(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_manual.go

@@ -10,15 +10,13 @@ import (
 )
 
 func AddEdbDataManualBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataManualMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -44,16 +42,14 @@ func GetEdbdataManualByTradeCode(condition string, pars []interface{}) (item []*
 }
 
 func GetEdbDataManualByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_manual WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
 	return
 }
 
 func GetEdbDataByManual(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -129,16 +125,14 @@ func GetEdbDataByManual(edbCode, startDate, endDate string) (searchItem *EdbInfo
 }
 
 func GetEdbDataManualByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -146,8 +140,7 @@ func ModifyEdbDataManual(edbInfoId int64, dataTime, value string) (err error) {
 
 //刷新手工指标数据
 func RefreshEdbDataByManual(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -224,8 +217,7 @@ func RefreshEdbDataByManual(edbInfoId int, edbCode, startDate, endDate string) (
 
 //刷新手工指标数据
 func RefreshAllEdbDataByManual(edbInfoId, source int, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -314,8 +306,7 @@ func DeleteEdbDataByIdAndSource(edbDataId, source int) (err error) {
 	tableName := GetEdbDataTableName(source)
 	sql = fmt.Sprintf(sql, tableName)
 
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, edbDataId).Exec()
 	return
 }

models/data_manage/edb_data_pb.go

@@ -27,46 +27,40 @@ type EdbDataPb struct {
 }
 
 func AddEdbDataPb(items []*EdbDataPb) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func AddEdbDataPbBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func ModifyEdbDataPb(edbInfoId int, dataTime string, value float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_pb SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }
 
 func GetEdbDataPbMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_pb WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
 }
 
 func GetEdbDataPbByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_pb WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
 	return
 }
 
 func GetEdbDataPbByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_pb WHERE edb_code=? AND data_time>=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
@@ -81,8 +75,7 @@ type EdbDataFromPb struct {
 
 //全部刷新
 func RefreshAllEdbDataByPb(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_quarter.go

@@ -14,8 +14,7 @@ import (
 )
 
 func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	hsql := `SELECT COUNT(1) AS count FROM edb_data_quarter WHERE edb_info_id=? `
 	err = o.Raw(hsql, edbInfoId).QueryRow(&count)
 	return
@@ -23,8 +22,7 @@ func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
 
 //指标季度数据计算
 func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -204,8 +202,7 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 
 //指标季度数据计算(公历转农历)
 func AddCalculateQuarterV2(edbInfoId, source int, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_sh.go

@@ -58,16 +58,14 @@ type BaseFromTradeShIndex struct {
 }
 
 func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbDataBySh(edbCode, suffix, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -142,8 +140,7 @@ func GetEdbDataBySh(edbCode, suffix, startDate, endDate string) (searchItem *Edb
 
 // RefreshEdbDataBySh 刷新上期所指标数据
 func RefreshEdbDataBySh(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -244,8 +241,7 @@ func RefreshEdbDataBySh(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataBySh 全部刷新上期所
 func RefreshAllEdbDataBySh(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -362,8 +358,7 @@ func RefreshAllEdbDataBySh(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFromSh, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -372,8 +367,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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if condition != "" {
 		sql += condition
 	}
@@ -383,23 +377,20 @@ func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataShBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataShByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_sh WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -407,16 +398,14 @@ func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFrom
 }
 
 func GetEdbDataShByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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

models/data_manage/edb_data_shfe.go

@@ -58,16 +58,14 @@ type BaseFromTradeShfeIndex struct {
 }
 
 func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbDataByShfe(edbCode, suffix, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -142,8 +140,7 @@ func GetEdbDataByShfe(edbCode, suffix, startDate, endDate string) (searchItem *E
 
 // RefreshEdbDataByShfe 刷新上期能源指标数据
 func RefreshEdbDataByShfe(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -244,8 +241,7 @@ func RefreshEdbDataByShfe(edbInfoId int, edbCode, startDate, endDate string) (er
 
 // RefreshAllEdbDataByShfe 全部刷新上期能源
 func RefreshAllEdbDataByShfe(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -362,8 +358,7 @@ func RefreshAllEdbDataByShfe(edbInfoId, source int, edbCode, startDate, endDate
 
 // GetBaseInfoFromShfeByIndexCode 获取指标信息
 func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoFromShfe, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -372,8 +367,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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if condition != "" {
 		sql += condition
 	}
@@ -383,23 +377,20 @@ func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseF
 }
 
 func AddEdbDataShfeBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataShfeByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_ine WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShfeIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -407,16 +398,14 @@ func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFr
 }
 
 func GetEdbDataShfeByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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

models/data_manage/edb_data_ths.go

@@ -25,39 +25,34 @@ type EdbDataThs struct {
 }
 
 func AddEdbDataThsBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func ModifyEdbDataThs(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_ths SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }
 
 func GetEdbDataThsMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ths WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
 }
 
 func GetEdbDataThsByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_ths WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
 func GetEdbDataThsByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_ths WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
 	return
@@ -77,8 +72,7 @@ type EdbDataFromThs struct {
 
 //刷新所有数据
 func RefreshAllEdbDataByThs(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_wind.go

@@ -24,54 +24,47 @@ type EdbDataWind struct {
 }
 
 func AddEdbDataWind(items []*EdbDataWind) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func AddEdbDataWindBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func DeleteEdbDataWind(edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM edb_data_wind WHERE edb_code=? `
 	_, err = o.Raw(sql, edbCode).Exec()
 	return
 }
 
 func ModifyEdbDataWind(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_data_wind SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }
 
 func GetEdbDataWindByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_wind WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
 	return
 }
 
 func GetEdbDataWindMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_wind WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
 }
 
 func GetEdbDataWindByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_wind WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
@@ -84,8 +77,7 @@ type EdbDataFromWind struct {
 }
 
 func RefreshAllEdbDataByWind(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_ys.go

@@ -30,8 +30,7 @@ type BaseFromSmmDataSimple struct {
 }
 
 func GetEdbDataYsMaxAndMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ys WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	return
@@ -39,8 +38,7 @@ func GetEdbDataYsMaxAndMinDate(edbCode string) (min_date, max_date string, err e
 
 //有色
 func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -103,8 +101,7 @@ func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 
 //全部刷新有色数据
 func RefreshAllEdbDataByYs(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_data_zz.go

@@ -58,16 +58,14 @@ type BaseFromTradeZhengzhouIndex struct {
 }
 
 func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbDataByZz(edbCode, suffix, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -142,8 +140,7 @@ func GetEdbDataByZz(edbCode, suffix, startDate, endDate string) (searchItem *Edb
 
 // RefreshEdbDataByZz 刷新郑商所指标数据
 func RefreshEdbDataByZz(edbInfoId int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -244,8 +241,7 @@ func RefreshEdbDataByZz(edbInfoId int, edbCode, startDate, endDate string) (err
 
 // RefreshAllEdbDataByZz 全部刷新郑商所
 func RefreshAllEdbDataByZz(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -362,8 +358,7 @@ func RefreshAllEdbDataByZz(edbInfoId, source int, edbCode, startDate, endDate st
 
 // GetBaseInfoFromZhengzhouByIndexCode 获取指标信息
 func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*BaseInfoFromZz, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -372,8 +367,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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if condition != "" {
 		sql += condition
 	}
@@ -383,23 +377,20 @@ func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 }
 
 func AddEdbDataZzBySql(sqlStr string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sqlStr).Exec()
 	return
 }
 
 func GetEdbDataZzByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_zz WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
 	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
 	return
 }
 
 func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -407,16 +398,14 @@ func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*B
 }
 
 func GetEdbDataZzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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

models/data_manage/edb_info.go

@@ -37,8 +37,7 @@ type EdbInfo struct {
 }
 
 func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -51,8 +50,7 @@ type EdbInfoItem struct {
 
 //用于分类展示
 func GetEdbInfoAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT edb_info_id,classify_id,edb_name_source AS classify_name,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type FROM edb_info order by sort asc,edb_info_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -60,8 +58,7 @@ func GetEdbInfoAll() (items []*EdbClassifyItems, err error) {
 
 //用于分类展示
 func GetEdbInfoAllList() (items []*EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -90,16 +87,14 @@ type EdbInfoSearchResp struct {
 }
 
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code=? `
 	err = o.Raw(sql, source, edbCode).QueryRow(&item)
 	return
 }
 
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return
@@ -117,8 +112,7 @@ type AddEdbInfoReq struct {
 }
 
 func DeleteEdbInfoAndData(edbInfoId, source int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -156,8 +150,7 @@ func DeleteEdbInfoAndData(edbInfoId, source int) (err error) {
 }
 
 func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -176,8 +169,7 @@ type EditEdbInfoReq struct {
 }
 
 func ModifyEdbInfo(item *EditEdbInfoReq) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name =?,
@@ -225,8 +217,7 @@ type EdbInfoListResp struct {
 }
 
 func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -236,8 +227,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoL
 }
 
 func GetEdbDataCountByCondition(condition string, pars []interface{}, source int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source)
 	sql := ` SELECT COUNT(1) AS count FROM %s WHERE 1=1 AND status=1 `
 	sql = fmt.Sprintf(sql, tableName)
@@ -249,8 +239,7 @@ func GetEdbDataCountByCondition(condition string, pars []interface{}, source int
 }
 
 func GetEdbDataListByCondition(condition string, pars []interface{}, source, pageSize, startSize int) (item []*EdbData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source)
 	sql := ` SELECT * FROM %s WHERE 1=1 AND status=1 `
 	sql = fmt.Sprintf(sql, tableName)
@@ -265,16 +254,14 @@ func GetEdbDataListByCondition(condition string, pars []interface{}, source, pag
 }
 
 func GetEdbInfoByNewest() (item *EdbInfoList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE 1=1 ORDER BY modify_time DESC LIMIT 1 `
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }
 
 func ModifyEdbInfoModifyTime(edbInfoId int64) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info SET modify_time = NOW() WHERE edb_info_id = ? `
 	_, err = o.Raw(sql, edbInfoId).Exec()
 	return
@@ -288,8 +275,7 @@ type MoveEdbInfoReq struct {
 }
 
 func MoveEdbInfo(edbInfoId, classifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info
 			SET
 			  classify_id = ?
@@ -299,24 +285,21 @@ func MoveEdbInfo(edbInfoId, classifyId int) (err error) {
 }
 
 func GetEdbInfoByName(edbName string) (items []*EdbInfoList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_name=? `
 	_, err = o.Raw(sql, edbName).QueryRows(&items)
 	return
 }
 
 func ModifyEdbInfoNameSource(edbNameSource string, edbInfoId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info SET edb_name_source=? WHERE edb_info_id = ? `
 	_, err = o.Raw(sql, edbNameSource, edbInfoId).Exec()
 	return
 }
 
 func GetChartEdbMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_edb_mapping WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
@@ -330,8 +313,7 @@ type ChartEdbInfo struct {
 }
 
 func EdbInfoSearchByKeyWord(KeyWord string) (searchList []*ChartEdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT edb_info_id,edb_name,source_name FROM edb_info `
 	if KeyWord != "" {
 		sql += `WHERE (edb_name LIKE '%` + KeyWord + `%' OR edb_code LIKE '%` + KeyWord + `%' ) `
@@ -351,8 +333,7 @@ type EdbInfoMaxAndMinInfo struct {
 }
 
 func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM %s WHERE edb_code=? `
@@ -368,16 +349,14 @@ func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMin
 }
 
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
 }
 
 func GetEdbInfoFilter(condition string, pars []interface{}) (list []*EdbInfoList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -389,8 +368,7 @@ func GetEdbInfoFilter(condition string, pars []interface{}) (list []*EdbInfoList
 
 //order:1升序，其余值为降序
 func GetEdbDataListAll(condition string, pars []interface{}, source, order int) (item []*EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -410,8 +388,7 @@ func GetEdbDataListAll(condition string, pars []interface{}, source, order int)
 
 // GetLastEdbData 获取最近的一条指标数据
 func GetLastEdbData(condition string, pars []interface{}, source int) (item *EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -427,8 +404,7 @@ func GetLastEdbData(condition string, pars []interface{}, source int) (item *Edb
 
 //order:1升序，其余值为降序
 func GetEdbDataCount(condition string, pars []interface{}, source int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT COUNT(1) AS count FROM %s WHERE 1=1 `
@@ -442,8 +418,7 @@ func GetEdbDataCount(condition string, pars []interface{}, source int) (count in
 }
 
 func ModifyCalculateEdbInfo(item *EditEdbInfoReq) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name =?,
@@ -465,8 +440,7 @@ type AddEdbInfoResp struct {
 
 //根据基础指标获取所有关联指标
 func GetNeedRefreshCalculateEdbInfoFromBase(fromEdbInfo int) (list []*EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.*
 			FROM edb_info_calculate AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
@@ -476,48 +450,42 @@ func GetNeedRefreshCalculateEdbInfoFromBase(fromEdbInfo int) (list []*EdbInfo, e
 }
 
 func GetEdbInfoCalculateCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
 }
 
 func GetEdbInfoCalculateLjzzyCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_ljzzy WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
 }
 
 func GetEdbInfoCalculateTbzCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_tbz WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
 }
 
 func GetEdbInfoCalculateTczCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_tcz WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
 }
 
 func GetEdbInfoCalculateNszydpjjsCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_nszydpjjs WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
 }
 
 func GetEdbInfoCalculateCountByCondition(source int, condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//if calculateTableName == "" {
 	//	err = errors.New("无效的表名")
@@ -535,8 +503,7 @@ func GetEdbInfoCalculateCountByCondition(source int, condition string, pars []in
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//if calculateTableName == "" {
 	//	err = errors.New("无效的表名")
@@ -572,8 +539,7 @@ func GetRefreshEdbInfoFromCalculate(edbInfoId, source int) (baseEdbInfoArr, calc
 
 //获取基础指标对应的所有计算指标
 func GetEdbInfoAllCalculate(edbInfoId int) (list []*EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.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.from_edb_info_id=?
@@ -602,8 +568,7 @@ func GetRefreshEdbInfoFromBase(edbInfoId, source int) (baseEdbInfoArr, calculate
 }
 
 func ModifyEdbInfoDataStatus(edbInfoId int64, source int, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ``
 	tableName := GetEdbDataTableName(source)
 	sql = ` UPDATE %s SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
@@ -614,8 +579,7 @@ func ModifyEdbInfoDataStatus(edbInfoId int64, source int, edbCode string) (err e
 
 // GetFirstEdbInfoByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstEdbInfoByClassifyId(classifyId int) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE classify_id=? order by sort asc,edb_info_id asc limit 1`
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
@@ -623,8 +587,7 @@ func GetFirstEdbInfoByClassifyId(classifyId int) (item *EdbInfo, err error) {
 
 // UpdateEdbInfoSortByClassifyId 根据分类id更新排序
 func UpdateEdbInfoSortByClassifyId(classifyId, nowSort int, prevEdbInfoId int, updateSort string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` update edb_info set sort = ` + updateSort + ` WHERE classify_id=? and sort > ?`
 	if prevEdbInfoId > 0 {
 		sql += ` or ( edb_info_id > ` + fmt.Sprint(prevEdbInfoId) + ` and sort=` + fmt.Sprint(nowSort) + ` ) `
@@ -635,8 +598,7 @@ func UpdateEdbInfoSortByClassifyId(classifyId, nowSort int, prevEdbInfoId int, u
 
 // Update 更新指标基础信息
 func (edbInfo *EdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(edbInfo, cols...)
 	return
 }
@@ -658,8 +620,7 @@ type EdbInfoReplaceReq struct {
 
 func EdbInfoReplace(oldEdbInfo, newEdbInfo *EdbInfo, sysAdminId int, sysAdminRealName string) (replaceChartTotal, replaceCalculateTotal int, err error) {
 	var errmsg string
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if errmsg != "" {
@@ -908,8 +869,7 @@ type EdbInfoView struct {
 
 //获取指标的所有计算指标，以及计算指标所依赖计算指标
 func GetAllCalculateByEdbInfoId(edbInfoId int) (mappingList []*EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	msql := ` SELECT * FROM edb_info_calculate_mapping WHERE from_edb_info_id=?  GROUP BY edb_info_id `
 	_, err = o.Raw(msql, edbInfoId).QueryRows(&mappingList)
 	if err != nil {

models/data_manage/edb_info_calculate.go

@@ -39,8 +39,7 @@ type EdbInfoCalculate struct {
 }
 
 func AddEdbInfoCalculateMulti(items []*EdbInfoCalculate) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
@@ -70,8 +69,7 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a
@@ -107,8 +105,7 @@ type EdbInfoCalculateEditReq struct {
 }
 
 func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT GROUP_CONCAT(from_edb_info_id ORDER BY sort ASC SEPARATOR ',') AS from_edb_info_id 
 			FROM edb_info_calculate_mapping
 			WHERE edb_info_id=?
@@ -119,8 +116,7 @@ func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
 }
 
 func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	defer func() {
 		if err != nil {
 			o.Rollback()
@@ -140,8 +136,7 @@ func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
 }
 
 func DeleteCalculateData(edbInfoId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
 	_, err = o.Raw(sql, edbInfoId).Exec()
 	return
@@ -183,8 +178,7 @@ type EdbInfoCalculateBatchEditReq struct {
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 
@@ -203,8 +197,7 @@ func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error)
 
 //指标运算
 func AddCalculate(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo []*EdbInfoCalculateDetail, edbCode, uniqueCode, formulaStr string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_bp.go

@@ -29,8 +29,7 @@ type EdbInfoCalculateBp struct {
 //变频
 func AddCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateBp")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -170,8 +169,7 @@ func AddCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edb
 //环比值
 func EditCalculateBp(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -335,8 +333,7 @@ func EditCalculateBp(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, ed
 
 //变频
 func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -443,8 +440,7 @@ type EdbInfoCalculateBpDetail struct {
 }
 
 func GetEdbInfoCalculateBpDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -454,8 +450,7 @@ func GetEdbInfoCalculateBpDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail
 
 //刷新所有变频数据
 func RefreshAllCalculateBp(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_hbz.go

@@ -30,8 +30,7 @@ type EdbInfoCalculateHbz struct {
 //环比值
 func AddCalculateHbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateHbz")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -157,8 +156,7 @@ func HbzDiv(current, pre float64) string {
 //环比值
 func EditCalculateHbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string, formulaInt int, calculateFormula string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -277,8 +275,7 @@ func EditCalculateHbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 //刷新环比值数据
 func RefreshCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -392,8 +389,7 @@ type EdbInfoCalculateHbzDetail struct {
 }
 
 func GetEdbInfoCalculateHbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -403,8 +399,7 @@ func GetEdbInfoCalculateHbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetai
 
 //刷新所有环比值数据
 func RefreshAllCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string, formulaInt int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_hcz.go

@@ -29,8 +29,7 @@ type EdbInfoCalculateHcz struct {
 //环差值
 func AddCalculateHcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateHcz")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -162,8 +161,7 @@ func HczDiv(current, pre float64) string {
 //环比值
 func EditCalculateHcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string, formulaInt int, calculateFormula string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -296,8 +294,7 @@ func EditCalculateHcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 //刷新环比值数据
 func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -410,8 +407,7 @@ type EdbInfoCalculateHczDetail struct {
 }
 
 func GetEdbInfoCalculateHczDetail(edbInfoId int) (item *EdbInfoCalculateHczDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -421,8 +417,7 @@ func GetEdbInfoCalculateHczDetail(edbInfoId int) (item *EdbInfoCalculateHczDetai
 
 //刷新所有环差值数据
 func RefreshAllCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string, formulaInt int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_ljztbpj.go

@@ -14,8 +14,7 @@ import (
 // AddCalculateLjztbpj 新增累计值同比拼接数据
 func AddCalculateLjztbpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateLjztbpj")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -269,8 +268,7 @@ func AddCalculateLjztbpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, second
 // EditCalculateLjztbpj 编辑累计值同比拼接数据
 func EditCalculateLjztbpj(req *EdbInfoCalculateBatchEditReq, nowEdbInfo, firstEdbInfo, secondEdbInfo *EdbInfo) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -635,8 +633,7 @@ func EditCalculateLjztbpj(req *EdbInfoCalculateBatchEditReq, nowEdbInfo, firstEd
 
 // RefreshAllCalculateLjztbpj 刷新所有 累计值同比拼接 数据
 func RefreshAllCalculateLjztbpj(edbInfo *EdbInfo) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_ljzzy.go

@@ -27,16 +27,14 @@ type EdbInfoCalculateLjzzy struct {
 }
 
 func AddEdbInfoCalculateLjzzyMulti(items []*EdbInfoCalculateLjzzy) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 //累计值转月
 func AddCalculateLjzzy(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -230,8 +228,7 @@ func AddCalculateLjzzy(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo,
 //修改累计值转月
 func EditCalculateLjzzy(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -436,8 +433,7 @@ func EditCalculateLjzzy(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo,
 
 //刷新累计值转月值数据
 func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -600,8 +596,7 @@ type EdbInfoCalculateLjzzyDetail struct {
 }
 
 func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -610,16 +605,14 @@ func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyD
 }
 
 func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -627,8 +620,7 @@ func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime, value string) (err e
 
 //刷新全部数据
 func RefreshAllCalculateLjzzy(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_mapping.go

@@ -24,15 +24,13 @@ type EdbInfoCalculateMapping struct {
 }
 
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func GetEdbInfoCalculateMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE from_edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&count)
 	return
@@ -61,8 +59,7 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -28,8 +28,7 @@ type EdbInfoCalculateNszydpjjs struct {
 
 //N数值移动平均计算
 func AddCalculateNszydpjjs(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -187,8 +186,7 @@ func AddCalculateNszydpjjs(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbIn
 func EditCalculateNszydpjjs(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string, formulaInt int, oldCalculateFormula string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
 
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -338,8 +336,7 @@ func EditCalculateNszydpjjs(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbI
 
 //刷新N数值移动平均计算
 func RefreshCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -473,8 +470,7 @@ type EdbInfoCalculateNszydpjjsDetail struct {
 }
 
 func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNszydpjjsDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -484,8 +480,7 @@ func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNs
 
 //刷新全部N数值移动平均计算
 func RefreshAllCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo *EdbInfo, edbCode, startDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_tbz.go

@@ -29,8 +29,7 @@ type EdbInfoCalculateTbz struct {
 //同比值
 func AddCalculateTbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateTbz")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -277,8 +276,7 @@ func TbzDiv(a, b float64) string {
 //同比值
 func EditCalculateTbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -514,8 +512,7 @@ func EditCalculateTbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 //刷新同比值数据
 func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -752,8 +749,7 @@ type EdbInfoCalculateTbzDetail struct {
 }
 
 func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -762,16 +758,14 @@ func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetai
 }
 
 func GetEdbDataCalculateTbzByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -779,8 +773,7 @@ func ModifyEdbDataCalculateTbz(edbInfoId int64, dataTime, value string) (err err
 
 //刷新所有同比值数据
 func RefreshAllCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_tcz.go

@@ -28,8 +28,7 @@ type EdbInfoCalculateTcz struct {
 
 //同差值
 func AddCalculateTcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -270,8 +269,7 @@ func TczSub(a, b float64) string {
 //同差值
 func EditCalculateTcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -513,8 +511,7 @@ func EditCalculateTcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 //刷新同差值数据
 func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -741,8 +738,7 @@ type EdbInfoCalculateTczDetail struct {
 }
 
 func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetail, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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=? `
@@ -751,16 +747,14 @@ func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetai
 }
 
 func GetEdbDataCalculateTczByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	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
@@ -768,8 +762,7 @@ func ModifyEdbDataCalculateTcz(edbInfoId int64, dataTime, value string) (err err
 
 //刷新全部同差值数据
 func RefreshAllCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_calculate_zjpj.go

@@ -12,8 +12,7 @@ import (
 // AddCalculateZjpj 新增直接拼接数据
 func AddCalculateZjpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	fmt.Println("AddCalculateZjpj")
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -222,8 +221,7 @@ func AddCalculateZjpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdb
 // EditCalculateZjpj 编辑直接拼接数据
 func EditCalculateZjpj(req *EdbInfoCalculateBatchEditReq, nowEdbInfo, firstEdbInfo, secondEdbInfo *EdbInfo) (edbInfoId int, err error) {
 	edbInfoId = req.EdbInfoId
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {
@@ -491,8 +489,7 @@ func EditCalculateZjpj(req *EdbInfoCalculateBatchEditReq, nowEdbInfo, firstEdbIn
 
 // RefreshAllCalculateZjpj 刷新所有 直接拼接 数据
 func RefreshAllCalculateZjpj(edbInfo *EdbInfo) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 	defer func() {
 		if err != nil {

models/data_manage/edb_info_log.go

@@ -22,8 +22,7 @@ type EdbInfoLog struct {
 }
 
 func AddEdbInfoLog(item *EdbInfoLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }

models/data_manage/edb_info_updates.go

@@ -11,8 +11,7 @@ type UpdatesStatisticalItem struct {
 }
 
 func GetUpdatesStatistical(condition string, pars []interface{}) (list []*UpdatesStatisticalItem, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS total,source FROM edb_info
 			WHERE 1=1 `
 	sql += condition
@@ -59,8 +58,7 @@ DATA_SOURCE_THS                 = iota + 1 //同花顺
 */
 
 func GetUpdatesList(condition string, pars []interface{}, startSize, pageSize int) (list []*EdbInfoView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info
 			WHERE 1=1 `
 	sql += condition
@@ -70,8 +68,7 @@ func GetUpdatesList(condition string, pars []interface{}, startSize, pageSize in
 }
 
 func GetUpdatesListTotal(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info
 			WHERE 1=1 `
 	sql += condition

models/data_manage/manual_user.go

@@ -17,15 +17,13 @@ type ManualUser struct {
 
 func DeleteManualUser(adminId int) (err error) {
 	sql := `DELETE FROM manual_user WHERE admin_id=? `
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, adminId).Exec()
 	return
 }
 
 func AddManualUser(item *ManualUser) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Insert(item)
 	return
 }
@@ -36,8 +34,7 @@ type ManualUserItem struct {
 }
 
 func GetManualUserList() (list []*ManualUserItem, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT admin_id,admin_real_name FROM manual_user
 			GROUP BY admin_id
 			ORDER BY create_time DESC `
@@ -52,8 +49,7 @@ type ManualUserList struct {
 }
 
 func GetManualSysuserAll() (list []*ManualUserList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM manual_user
 			ORDER BY create_time ASC `
 	o.Raw(sql).QueryRows()
@@ -73,39 +69,34 @@ type ManualUserClassify struct {
 }
 
 func AddManualUserClassifyMulti(items []*ManualUserClassify) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func DeleteManualUserClassifyCount(adminId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM manual_user_classify WHERE admin_id=? `
 	_, err = o.Raw(sql, adminId).Exec()
 	return
 }
 
 func GetManualUserClassifyCount(adminId, classifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM manual_user_classify WHERE admin_id=? AND classify_id=? `
 	err = o.Raw(sql, adminId, classifyId).QueryRow(&count)
 	return
 }
 
 func GetManualUserCount(adminId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM manual_user WHERE admin_id=? `
 	err = o.Raw(sql, adminId).QueryRow(&count)
 	return
 }
 
 func GetManualUserSetClassify(adminId int) (list []*EdbdataClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM manual_user_classify WHERE admin_id=? `
 	_, err = o.Raw(sql, adminId).QueryRows(&list)
 	return

models/data_manage/my_chart.go

@@ -13,8 +13,7 @@ type ChartListResp struct {
 }
 
 func GetChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartInfoView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -26,8 +25,7 @@ func GetChartListByCondition(condition string, pars []interface{}, startSize, pa
 }
 
 func GetChartListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -46,15 +44,13 @@ type MyChartClassify struct {
 }
 
 func AddMyChartClassify(item *MyChartClassify) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Insert(item)
 	return
 }
 
 func GetMyChartClassifyAll(adminId int) (item []*MyChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart_classify WHERE 1=1 AND admin_id=? `
 	sql += " ORDER BY sort asc, my_chart_classify_id desc "
 	_, err = o.Raw(sql, adminId).QueryRows(&item)
@@ -70,8 +66,7 @@ type MyChartClassifyAddReq struct {
 }
 
 func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM my_chart_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -81,8 +76,7 @@ func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (c
 }
 
 func GetMyChartClassifyById(adminId, myChartClassifyId int) (item *MyChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? AND my_chart_classify_id=? `
 	err = o.Raw(sql, adminId, myChartClassifyId).QueryRow(&item)
 	return
@@ -101,8 +95,7 @@ type MyChartClassifyMoveReq struct {
 }
 
 func ModifyMyChartClassify(myChartClassifyId int, myChartClassifyName string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE my_chart_classify SET my_chart_classify_name=?,modify_time=NOW() WHERE my_chart_classify_id=?`
 	_, err = o.Raw(sql, myChartClassifyName, myChartClassifyId).Exec()
 	return
@@ -113,8 +106,7 @@ type MyChartClassifyDeleteReq struct {
 }
 
 func DeleteMyChartClassify(myChartClassifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	//o.Begin()
 	//
 	//defer func() {
@@ -185,8 +177,7 @@ type MyChartView struct {
 }
 
 func AddMyChart(item *MyChart) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -202,15 +193,13 @@ type MyChartClassifyMapping struct {
 }
 
 func AddMyChartClassifyMapping(item *MyChartClassifyMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (item *MyChartClassifyMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	err = o.Raw(sql, adminId, myChartId, myChartClassifyId).QueryRow(&item)
 	return
@@ -222,8 +211,7 @@ type MyChartDeleteReq struct {
 }
 
 func DeleteMyChart(myChartId, myChartClassifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	if myChartClassifyId > 0 {
 		sql := `DELETE FROM my_chart_classify_mapping WHERE my_chart_id=? AND my_chart_classify_id=? `
 		_, err = o.Raw(sql, myChartId, myChartClassifyId).Exec()
@@ -286,8 +274,7 @@ type MyChartListResp struct {
 }
 
 func GetMyChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MyChartList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.my_chart_id,c.sort,b.* FROM my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
@@ -301,8 +288,7 @@ func GetMyChartListByCondition(condition string, pars []interface{}, startSize,
 }
 
 func GetMyChartListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
@@ -315,8 +301,7 @@ func GetMyChartListCountByCondition(condition string, pars []interface{}) (count
 }
 
 func GetMyChartMaxSort(adminId, myChartClassifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
 	err = o.Raw(sql, adminId, myChartClassifyId).QueryRow(&count)
 	return
@@ -330,16 +315,14 @@ type MoveMyChartReq struct {
 }
 
 func MyChartMove(sort float64, adminId int, myChartId, myChartClassifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE my_chart_classify_mapping SET sort = ?,modify_time=NOW() WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	_, err = o.Raw(sql, sort, adminId, myChartId, myChartClassifyId).Exec()
 	return
 }
 
 func GetMyChartMinSortByAdminId(adminId int) (item *MyChart, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart WHERE admin_id=? ORDER BY sort ASC LIMIT 1`
 	err = o.Raw(sql, adminId).QueryRow(&item)
 	return
@@ -350,8 +333,7 @@ type ChartRecommendListResp struct {
 }
 
 func GetChartClassify(chartClassifyId int) (chart_classify_id string, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT GROUP_CONCAT(t.chart_classify_id) AS chart_classify_id FROM (
 			SELECT a.chart_classify_id FROM chart_classify AS a 
 			WHERE a.chart_classify_id=?
@@ -364,8 +346,7 @@ func GetChartClassify(chartClassifyId int) (chart_classify_id string, err error)
 }
 
 func GetRecommendChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartInfoView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.* FROM my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id `
 	if condition != "" {
@@ -377,8 +358,7 @@ func GetRecommendChartListByCondition(condition string, pars []interface{}, star
 }
 
 func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
 
 	sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
@@ -391,8 +371,7 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 }
 
 func GetMyChartSearchByCondition(condition string, pars []interface{}) (item []*MyChartList, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
 			FROM  my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
@@ -419,8 +398,7 @@ type MyChartEditReq struct {
 }
 
 func GetMyChartClassifyMappingCount(adminId, myChartId, myChartClassifyId int) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count
 			FROM  my_chart_classify_mapping 
 			WHERE 1=1 AND admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
@@ -429,8 +407,7 @@ func GetMyChartClassifyMappingCount(adminId, myChartId, myChartClassifyId int) (
 }
 
 func DeleteMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM my_chart_classify_mapping
 			WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	_, err = o.Raw(sql, adminId, myChartId, myChartClassifyId).Exec()
@@ -438,8 +415,7 @@ func DeleteMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (er
 }
 
 func GetMyChartSort(adminId, myChartClassifyId, sort int) (item *MyChartClassifyMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
 	if sort == 1 {
 		sql += ` ORDER BY sort DESC LIMIT 1 `
@@ -451,8 +427,7 @@ func GetMyChartSort(adminId, myChartClassifyId, sort int) (item *MyChartClassify
 }
 
 func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChartView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM my_chart WHERE 1=1 `
 	sql := `SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
@@ -468,8 +443,7 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 }
 
 func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *MyChartView, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -479,8 +453,7 @@ func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *My
 }
 
 func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Begin()
 
 	defer func() {
@@ -548,16 +521,14 @@ func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err e
 
 // Update 更新分类基础信息
 func (myChartClassify *MyChartClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(myChartClassify, cols...)
 	return
 }
 
 // GetFirstMyChartClassifyByAdminId 获取当前账号下，排序第一条的分类数据
 func GetFirstMyChartClassifyByAdminId(adminId int) (item *MyChartClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? order by sort asc,my_chart_classify_id asc limit 1`
 	err = o.Raw(sql, adminId).QueryRow(&item)
 	return
@@ -565,8 +536,7 @@ func GetFirstMyChartClassifyByAdminId(adminId int) (item *MyChartClassify, err e
 
 // UpdateMyChartClassifySortByClassifyId 根据分类id更新排序
 func UpdateMyChartClassifySortByClassifyId(adminId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` update my_chart_classify set sort = ` + updateSort + ` WHERE admin_id = ? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( my_chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`

models/data_manage/my_chart_log.go

@@ -18,8 +18,7 @@ type MyChartLog struct {
 }
 
 func AddMyChartLog(item *MyChartLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }

models/data_manage/search_keyword.go

@@ -12,8 +12,7 @@ type SearchKeyword struct {
 }
 
 func AddSearchKeyword(item *SearchKeyword) (err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Insert(item)
 	return
 }

models/data_manage/smm_data.go

@@ -13,8 +13,7 @@ type SmmClassify struct {
 
 func GetSmmClassify() (items []*SmmClassify, err error) {
 	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_smm_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -24,8 +23,7 @@ type SmmFrequency struct {
 }
 
 func GetSmmFrequencyByClassifyId(typeCode string) (items []*GlFrequency, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	var type2, type3 string
 	if strings.Contains(typeCode, "#") {
 		typeArr := strings.Split(typeCode, "#")
@@ -77,8 +75,7 @@ type SmmIndex struct {
 }
 
 func GetSmmIndex(condition string, pars interface{}) (items []*SmmIndex, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_smm_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -114,16 +111,14 @@ type SmmIndexData struct {
 }
 
 func GetSmmIndexData(indexCode string, startSize, pageSize int) (items []*SmmIndexData, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
 	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
 	return
 }
 
 func GetSmmIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_smm_data WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&count)
 	return

models/share_chart_refresh_log.go

@@ -15,8 +15,7 @@ type ShareChartRefreshLog struct {
 
 // AddShareChartRefreshLog 添加日志
 func AddShareChartRefreshLog(item *ShareChartRefreshLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }

models/target.go

@@ -395,8 +395,7 @@ type ManualUserClassify struct {
 }
 
 func GetManualUserClassify(sysUserId int) (list []*ManualUserClassify, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM manual_user_classify WHERE admin_id=? `
 	_, err = o.Raw(sql, sysUserId).QueryRows(&list)
 	return