定时任务每隔半小时更新图表信息

main.go

@@ -11,7 +11,7 @@ func main() {
 		beego.BConfig.WebConfig.DirectoryIndex = true
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
-	//ervices.UpdateChart(1784)
+	//	services.EtaForumChartUpdate()
 	go services.Task()
 	beego.Run()
 }

models/chart_classify.go

@@ -24,7 +24,7 @@ type ChartClassify struct {
 }
 
 func AddChartClassify(item *ChartClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -36,7 +36,7 @@ type AddChartClassifyReq struct {
 }
 
 func GetChartClassifyCount(chartClassifyName string, parentId, source int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM chart_classify WHERE parent_id=? AND source = ? AND chart_classify_name=? `
 	err = o.Raw(sql, parentId, source, chartClassifyName).QueryRow(&count)
 	return
@@ -48,21 +48,21 @@ type EditChartClassifyReq struct {
 }
 
 func GetChartClassifyById(classifyId int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
+	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 := 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, source int, chartClassifyName string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE chart_classify SET chart_classify_name=?,modify_time=NOW() WHERE chart_classify_id=? AND source = ? `
 	_, err = o.Raw(sql, chartClassifyName, classifyId, source).Exec()
 	return
@@ -74,7 +74,7 @@ type DeleteChartClassifyReq struct {
 }
 
 func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
+	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 
@@ -92,7 +92,7 @@ func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
 }
 
 func DeleteChartClassify(classifyId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM chart_classify
 				WHERE chart_classify_id IN(
 				SELECT t.chart_classify_id FROM
@@ -112,7 +112,7 @@ func DeleteChartClassify(classifyId int) (err error) {
 // GetChartClassifyByParentId
 // @param source int 1：ETA图库；2：商品价格曲线；3：相关性图表
 func GetChartClassifyByParentId(parentId, source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? AND source = ? order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, parentId, source).QueryRows(&items)
 	return
@@ -121,7 +121,7 @@ func GetChartClassifyByParentId(parentId, source int) (items []*ChartClassifyIte
 // GetChartClassifyAll
 // @param source int 1：ETA图库；2：商品价格曲线；3：相关性图表
 func GetChartClassifyAll(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id<>0 AND source = ? order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
@@ -178,7 +178,7 @@ type ChartClassifyDeleteCheckReq struct {
 }
 
 func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err error) {
-	o := orm.NewOrm()
+	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,
@@ -193,7 +193,7 @@ func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err erro
 }
 
 func GetChartClassifyByCondition(condition string, pars []interface{}) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -212,7 +212,7 @@ type MoveChartClassifyReq struct {
 
 // GetFirstChartClassifyByParentId 获取当前父级图表分类下的排序第一条的数据
 func GetFirstChartClassifyByParentId(parentId int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
+	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
@@ -220,7 +220,7 @@ func GetFirstChartClassifyByParentId(parentId int) (item *ChartClassify, err err
 
 // GetFirstChartClassifyByParentIdAndSource 获取当前父级图表分类下的排序第一条的数据
 func GetFirstChartClassifyByParentIdAndSource(parentId, source int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=?  and source = ? order by sort asc,chart_classify_id asc limit 1`
 	err = o.Raw(sql, parentId, source).QueryRow(&item)
 	return
@@ -228,7 +228,7 @@ func GetFirstChartClassifyByParentIdAndSource(parentId, source int) (item *Chart
 
 // UpdateChartClassifySortByParentId 根据图表父类id更新排序
 func UpdateChartClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrm()
+	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) + `)`
@@ -239,14 +239,14 @@ func UpdateChartClassifySortByParentId(parentId, classifyId, nowSort int, update
 
 // Update 更新图表分类基础信息
 func (chartClassify *ChartClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(chartClassify, cols...)
 	return
 }
 
 // GetChartClassifyMaxSort 获取图表分类下最大的排序数
 func GetChartClassifyMaxSort(parentId, source int) (sort int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM chart_classify WHERE parent_id=? AND source = ? `
 	err = o.Raw(sql, parentId, source).QueryRow(&sort)
 	return
@@ -259,49 +259,49 @@ type ChartClassifyView struct {
 }
 
 func GetChartClassifyViewById(classifyId int) (item *ChartClassifyView, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
 }
 
 func GetChartClassifyByParentIdFromETA(parentId int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? AND source = 1 order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
 
 func GetChartClassifyAllFromETA() (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE parent_id<>0 AND source = 1 order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetChartClassifyTwo(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE level=3 AND source = ? order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
 }
 
 func GetChartClassifyByLevel(level, source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE level=? AND source = ? order by sort asc,chart_classify_id asc`
 	_, err = o.Raw(sql, level, source).QueryRows(&items)
 	return
 }
 
 func EditChartClassifySysUser(classifyId, sysUserId int, chartClassifyName string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE chart_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
 	_, err = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
 	return
 }
 
 func GetAllChartClassifyItemsBySource(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_classify WHERE source = ? order by sort ASC,chart_classify_id ASC`
 	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
@@ -309,7 +309,7 @@ func GetAllChartClassifyItemsBySource(source int) (items []*ChartClassifyItems,
 
 // GetChartClassifyByParentIdAndName 根据父级ID和名称获取分类
 func GetChartClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *ChartClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE parent_id = ? AND chart_classify_name = ? AND chart_classify_id <> ? LIMIT 1`
 	err = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
 	return
@@ -327,7 +327,7 @@ func GetChartClassifyByIdList(classifyIdList []int) (items []*ChartClassify, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
 
@@ -343,7 +343,7 @@ func GetChartClassifyByIdList(classifyIdList []int) (items []*ChartClassify, err
 // @return items []*ChartClassify
 // @return err error
 func GetChartClassifyBySourceAndIsJoinPermission(source, isJoinPermission int) (items []*ChartClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_classify WHERE source = ? AND is_join_permission = ? `
 	_, err = o.Raw(sql, source, isJoinPermission).QueryRows(&items)
 	return

models/chart_edb_mapping.go

@@ -38,13 +38,13 @@ type ChartEdbMapping struct {
 }
 
 func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(len(items), items)
 	return
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.classify_id,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,
 b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.edb_type,b.is_join_permission,
 a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit 
@@ -57,7 +57,7 @@ a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit
 }
 
 func GetChartEdbMappingListByChartInfoIds(chartInfoIds string) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.edb_type,b.classify_id,b.is_join_permission
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
@@ -73,7 +73,7 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
@@ -89,7 +89,7 @@ func GetChartEdbMappingListByIdList(chartInfoIdList []int) (list []*ChartEdbInfo
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type,b.edb_type AS edb_info_category_type,b.classify_id,b.is_join_permission
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
@@ -100,7 +100,7 @@ func GetChartEdbMappingListByIdList(chartInfoIdList []int) (list []*ChartEdbInfo
 }
 
 func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
@@ -113,7 +113,7 @@ func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, sta
 }
 
 func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
@@ -125,7 +125,7 @@ func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}
 
 // GetEtaEdbChartEdbMapping       商品曲线图查询对应的普通指标
 func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 
 	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.classify_id,b.is_join_permission
@@ -139,7 +139,7 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 
 // GetFutureGoodEdbChartEdbMapping       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
              FROM chart_edb_mapping AS a
@@ -152,7 +152,7 @@ func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping
 
 // GetFutureGoodEdbChartEdbMappingList       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
              FROM chart_edb_mapping AS a
@@ -165,7 +165,7 @@ func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfo
 
 // GetChartEdbMappingListV2 根据图表id获取指标信息,不连表查询指标表
 func GetChartEdbMappingListV2(chartInfoId int) (list []*ChartEdbMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
@@ -175,7 +175,7 @@ func GetChartEdbMappingListV2(chartInfoId int) (list []*ChartEdbMapping, err err
 
 // GetChartEdbMappingByEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT edb_info_id,source_name,classify_id,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,edb_type,max_value,min_value,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id = ? limit 1`
@@ -185,7 +185,7 @@ func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, er
 
 // GetChartEdbMappingByFutureGoodEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT future_good_edb_info_id as edb_info_id,future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.region_type
              FROM future_good_edb_info b
 			 WHERE future_good_edb_info_id = ?  limit 1 `
@@ -201,7 +201,7 @@ func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoM
 // @param edbInfoList []*EdbInfo
 // @return err error
 func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("data").Begin()
 	if err != nil {
 		return
 	}
@@ -293,7 +293,7 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 
 func DeleteChartEdbMappingByChartEdbMappingId(removeIdStr string) (err error) {
 	// 删除映射关系
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(` DELETE FROM chart_edb_mapping WHERE chart_edb_mapping_id in (%s) `, removeIdStr)
 	_, err = o.Raw(sql).Exec()
 	if err != nil {
@@ -305,13 +305,13 @@ func DeleteChartEdbMappingByChartEdbMappingId(removeIdStr string) (err error) {
 
 func (c *ChartEdbMapping) Update(col []string) (err error) {
 	// 删除映射关系
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(c, col...)
 	return
 }
 
 func GetChartEdbMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
+	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

models/chart_info.go

@@ -63,13 +63,13 @@ type ChartInfoMore struct {
 }
 
 func AddChartInfo(item *ChartInfo) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func UpdateChartInfo(item *ChartInfo) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(&item)
 	return
 }
@@ -88,7 +88,7 @@ func GetChartInfoAll(sourceList []int) (items []*ChartClassifyItems, err error)
 		return
 	}
 
-	o := orm.NewOrm()
+	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,source
             FROM chart_info WHERE source in (` + utils.GetOrmInReplace(num) + `)  ORDER BY sort asc,chart_info_id ASC `
@@ -103,7 +103,7 @@ func GetChartInfoByAdminId(sourceList []int, adminId int) (items []*ChartClassif
 		return
 	}
 
-	o := orm.NewOrm()
+	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 where source in (` + utils.GetOrmInReplace(num) + `)  AND sys_user_id = ? ORDER BY sort asc,create_time ASC `
@@ -113,7 +113,7 @@ func GetChartInfoByAdminId(sourceList []int, adminId int) (items []*ChartClassif
 
 // 用于分类展示
 func GetChartInfoAllList() (items []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *
             FROM chart_info ORDER BY create_time ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
@@ -139,21 +139,21 @@ type ChartInfoSearchResp struct {
 }
 
 func GetChartInfoById(chartInfoId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	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 := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id=? `
 	err = o.Raw(sql, chartInfoId).QueryRow(&item)
 	return
 }
 
 func GetChartInfoViewByIds(chartInfoIds []string) (list []*ChartInfoView, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in ("` + strings.Join(chartInfoIds, `","`) + `") `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -200,7 +200,7 @@ type ChartSaveItem struct {
 }
 
 func DeleteChartInfoAndData(chartInfoId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -224,7 +224,7 @@ func DeleteChartInfoAndData(chartInfoId int) (err error) {
 }
 
 func GetChartInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -277,7 +277,7 @@ type EditChartEnInfoEdbItem struct {
 }
 
 func ModifyChartInfo(item *EditChartInfoReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info
 			SET
 			  chart_name =?,
@@ -306,7 +306,7 @@ type ChartInfoListResp struct {
 }
 
 func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -316,14 +316,14 @@ func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartI
 }
 
 func GetChartInfoByNewest(source int) (item *ChartInfoList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 AND source = ? ORDER BY modify_time DESC LIMIT 1 `
 	err = o.Raw(sql, source).QueryRow(&item)
 	return
 }
 
 func ModifyChartInfoModifyTime(chartInfoId int64) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info SET modify_time = NOW() WHERE chart_info_id = ? `
 	_, err = o.Raw(sql, chartInfoId).Exec()
 	return
@@ -337,7 +337,7 @@ type MoveChartInfoReq struct {
 }
 
 func MoveChartInfo(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  chart_info
 			SET
 			  chart_classify_id = ?
@@ -370,7 +370,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 := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId, startDate, endDate).QueryRows(&list)
 	return
 }
@@ -490,7 +490,7 @@ type YData struct {
 }
 
 func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chartType int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -635,7 +635,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 
 // EditChartInfoAndMapping 修改 ETA图库 的 图表与指标 的关系
 func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -821,7 +821,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 
 // EditFutureGoodChartInfoAndMapping 修改商品价格曲线的 图表与指标 的关系
 func EditFutureGoodChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -969,7 +969,7 @@ func EditFutureGoodChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr strin
 }
 
 func EditChartEnInfoAndEdbEnInfo(req *EditChartEnInfoReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -1119,13 +1119,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 := orm.NewOrmUsingDB("data")
 	err = o.Raw(sql, edbInfoIdStr).QueryRow(&count)
 	return
 }
 
 func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 
 	var pars []interface{}
@@ -1150,7 +1150,7 @@ func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*Char
 // ChartInfoSearchByEmptyKeyWord 没有关键字的时候获取默认100条数据
 func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermissionChartIdList []int, startSize, pageSize int) (total int64, searchList []*ChartInfo, err error) {
 	num := len(sourceList)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 
 	baseSql := `  FROM chart_info WHERE 1=1 AND source in (` + utils.GetOrmInReplace(num) + `)`
 
@@ -1185,7 +1185,7 @@ func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermission
 }
 
 func GetNextChartInfo(classifyId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	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>?
@@ -1201,7 +1201,7 @@ type SetChartInfoImageReq struct {
 }
 
 func EditChartInfoImage(req *SetChartInfoImageReq) (err error) {
-	o := orm.NewOrm()
+	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()
@@ -1226,14 +1226,14 @@ type ChartInfoDetailFromUniqueCodeResp struct {
 }
 
 func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
 	err = o.Raw(sql, uniqueCode).QueryRow(&item)
 	return
 }
 
 func GetChartInfoViewByUniqueCode(uniqueCode string) (item *ChartInfoView, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
 	err = o.Raw(sql, uniqueCode).QueryRow(&item)
 	return
@@ -1241,7 +1241,7 @@ func GetChartInfoViewByUniqueCode(uniqueCode string) (item *ChartInfoView, err e
 
 // GetFirstChartInfoByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstChartInfoByClassifyId(classifyId int) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	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
@@ -1249,7 +1249,7 @@ func GetFirstChartInfoByClassifyId(classifyId int) (item *ChartInfo, err error)
 
 // UpdateChartInfoSortByClassifyId 根据图表id更新排序
 func UpdateChartInfoSortByClassifyId(classifyId, nowSort, prevChartInfoId int, sourceList []int, updateSort string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	num := len(sourceList)
 	if num <= 0 {
 		return
@@ -1264,7 +1264,7 @@ func UpdateChartInfoSortByClassifyId(classifyId, nowSort, prevChartInfoId int, s
 
 // Update 更新图表基础信息
 func (chartInfo *ChartInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(chartInfo, cols...)
 	return
 }
@@ -1352,7 +1352,7 @@ type ImageSvgToPngResp struct {
 
 // GetChartInfoByClassifyIdAndName 根据分类id和图表名获取图表信息
 func GetChartInfoByClassifyIdAndName(classifyId int, chartName string) (item *ChartInfo, err error) {
-	o := orm.NewOrm()
+	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
@@ -1371,7 +1371,7 @@ func GetChartInfoListByUniqueCodeSlice(uniqueCodeSlice []string) (total int64, i
 	if len(uniqueCodeSlice) <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code in ("` + strings.Join(uniqueCodeSlice, `","`) + `") `
 	total, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -1386,7 +1386,7 @@ type CopyAddChartInfoReq struct {
 
 // GetChartInfoListByCondition 根据条件获取图表数据了列表
 func GetChartInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -1402,7 +1402,7 @@ func GetChartInfoListGroupByUserId(edbIdList []string) (items []*ChartInfo, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
 	_, err = o.Raw(sql, edbIdList).QueryRows(&items)
@@ -1419,7 +1419,7 @@ func GetChartInfoListByChartIdList(charIdList []string) (items []*ChartInfo, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
 	_, err = o.Raw(sql, charIdList).QueryRows(&items)
@@ -1437,7 +1437,7 @@ func GetChartInfoListByUserId(userIdList []int, source int) (items []*ChartInfo,
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE source = ? AND  sys_user_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
 	_, err = o.Raw(sql, source, userIdList).QueryRows(&items)
@@ -1450,7 +1450,7 @@ func ModifyChartInfoUserIdByCodeList(edbIdList []string, userId int, userName st
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE chart_info SET sys_user_id=?,sys_user_real_name=? WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, userId, userName, edbIdList).Exec()
 	return
@@ -1469,7 +1469,7 @@ func ModifyChartInfoUserIdByOldUserId(oldUserIdList []int, userId int, userName
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE chart_info SET sys_user_id=?,sys_user_real_name=? WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, userId, userName, oldUserIdList).Exec()
 
@@ -1540,7 +1540,7 @@ type CorrelationChartInfoEdbItemReq struct {
 /*
 // EditCorrelationChartInfoAndMapping 修改相关性图表的 图表与指标 的关系
 func EditCorrelationChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, correlationChart *ChartInfoCorrelation, correlationUpdateCols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -1800,7 +1800,7 @@ type RollingCorrelationChartDataResp struct {
 // GetChartInfoAll 用于分类展示
 // @param source int 1：ETA图库；2：商品价格曲线
 func GetChartInfoAllByClassifyId(source, classifyId int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,chart_name_en AS chart_classify_name_en,
              unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date,is_join_permission
             FROM chart_info WHERE chart_classify_id = ? AND source = ?  ORDER BY sort asc,create_time DESC `
@@ -1817,7 +1817,7 @@ type ProfitFutureGoodChartResp struct {
 }
 
 func FIXChartClassifyId(newId, oldId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE chart_info SET chart_classify_id=? WHERE chart_classify_id=? `
 	_, err = o.Raw(sql, newId, oldId).Exec()
 	return
@@ -1830,7 +1830,7 @@ func GetChartInfoByAdminIdAndClassify(sourceList []int, adminId, classifyId int)
 		return
 	}
 
-	o := orm.NewOrm()
+	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,is_join_permission
             FROM chart_info where source in (` + utils.GetOrmInReplace(num) + `)  AND sys_user_id = ? AND chart_classify_id = ? ORDER BY sort asc,create_time ASC `
@@ -1840,7 +1840,7 @@ func GetChartInfoByAdminIdAndClassify(sourceList []int, adminId, classifyId int)
 
 // GetChartInfoAdminList 根据条件获取图表数据了列表
 func GetChartInfoAdminList() (items []int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT sys_user_id FROM chart_info GROUP BY sys_user_id `
 
 	_, err = o.Raw(sql).QueryRows(&items)
@@ -1849,7 +1849,7 @@ func GetChartInfoAdminList() (items []int, err error) {
 
 // EditChartInfoExtraConfig 修改 ETA图库 的 图表额外配置
 func EditChartInfoExtraConfig(chartId int, extraConfig string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	var pars []interface{}
 	pars = append(pars, extraConfig)
 

models/chart_theme.go

@@ -30,7 +30,7 @@ type ChartTheme struct {
 // @return item *ChartTheme
 // @return err error
 func GetChartThemeId(chartThemeId int) (item *ChartTheme, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme where chart_theme_id = ? AND is_delete = 0`
 	err = o.Raw(sql, chartThemeId).QueryRow(&item)
 
@@ -49,7 +49,7 @@ func (m *ChartTheme) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	lastId, err := o.Insert(m)
 	if err != nil {
 		return
@@ -67,7 +67,7 @@ func (m *ChartTheme) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *ChartTheme) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(m, cols...)
 	return
 }
@@ -79,7 +79,7 @@ func (m *ChartTheme) Update(cols []string) (err error) {
 // @return list []*ChartTheme
 // @return err error
 func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme WHERE chart_theme_type_id = ? AND  is_delete=0 ORDER BY chart_theme_id ASC `
 	_, err = o.Raw(sql, chartThemeTypeId).QueryRows(&list)
 
@@ -93,7 +93,7 @@ func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err er
 // @return list []*ChartTheme
 // @return err error
 func GetAllChartThemeList() (list []*ChartTheme, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme WHERE  is_delete=0 ORDER BY chart_theme_id ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 
@@ -125,7 +125,7 @@ type ChartThemeItem struct {
 // @return list []*ChartThemeConfig
 // @return err error
 func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a 
          JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id 
          WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
@@ -142,7 +142,7 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 // @return item *ChartTheme
 // @return err error
 func GetSystemChartTheme(chartThemeTypeId int) (item *ChartTheme, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.* FROM chart_theme a
          WHERE a.chart_theme_type_id = ? AND a.is_system_theme=1 ORDER BY a.chart_theme_id ASC `
 	err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)

models/chart_theme_default_data.go

@@ -30,7 +30,7 @@ func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData,
 	sql := `SELECT * FROM chart_theme_default_data WHERE edb_info_id=? `
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId).QueryRows(&list)
 	return
 }
@@ -43,7 +43,7 @@ func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData,
 // @param cols []string
 // @return err error
 func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(m, cols...)
 
 	return
@@ -65,7 +65,7 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
 	return
 }
@@ -82,7 +82,7 @@ func GetChartEdbMappingListByEdbInfoId(edbInfoIdList []int) (list []*ChartEdbInf
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_theme_default_edb_info WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
               `
 	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&list)

models/chart_theme_type.go

@@ -25,7 +25,7 @@ type ChartThemeType struct {
 // @param cols []string
 // @return err error
 func (m *ChartThemeType) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(m, cols...)
 	return
 }
@@ -37,7 +37,7 @@ func (m *ChartThemeType) Update(cols []string) (err error) {
 // @return list []*ChartThemeType
 // @return err error
 func GetAllChartThemeTypeList() (list []*ChartThemeType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type ORDER BY chart_theme_type_id ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 
@@ -52,7 +52,7 @@ func GetAllChartThemeTypeList() (list []*ChartThemeType, err error) {
 // @return list []*ChartThemeType
 // @return err error
 func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type WHERE chart_source = ?  ORDER BY chart_theme_type_id ASC `
 	_, err = o.Raw(sql, source).QueryRows(&list)
 
@@ -67,7 +67,7 @@ func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type where chart_theme_type_id = ? `
 	err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)
 
@@ -82,7 +82,7 @@ func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeByChartTypeAndSource(chartType, source int) (item *ChartThemeType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type where chart_type = ? AND chart_source = ? `
 	err = o.Raw(sql, chartType, source).QueryRow(&item)
 

models/db.go

@@ -15,11 +15,40 @@ func init() {
 	db, _ := orm.GetDB("default")
 	db.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("rddp", "mysql", utils.MYSQL_URL_RDDP)
+	orm.SetMaxIdleConns("rddp", 50)
+	orm.SetMaxOpenConns("rddp", 100)
+
+	report_db, _ := orm.GetDB("rddp")
+	report_db.SetConnMaxLifetime(10 * time.Minute)
+
+	_ = orm.RegisterDataBase("edb", "mysql", utils.MYSQL_URL_EDB)
+	orm.SetMaxIdleConns("edb", 50)
+	orm.SetMaxOpenConns("edb", 100)
+
+	edb_db, _ := orm.GetDB("edb")
+	edb_db.SetConnMaxLifetime(10 * time.Minute)
+
+	_ = orm.RegisterDataBase("data", "mysql", utils.MYSQL_URL_DATA)
+	orm.SetMaxIdleConns("data", 50)
+	orm.SetMaxOpenConns("data", 100)
+
+	data_db, _ := orm.GetDB("data")
+	data_db.SetConnMaxLifetime(10 * time.Minute)
+
+	_ = orm.RegisterDataBase("gl", "mysql", utils.MYSQL_URL_GL)
+	orm.SetMaxIdleConns("gl", 50)
+	orm.SetMaxOpenConns("gl", 100)
+
+	gl, _ := orm.GetDB("gl")
+	gl.SetConnMaxLifetime(10 * time.Minute)
+
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 
 	initChart()
 	initEdbData()
+	InitEdbSourceVar()
 }
 
 // initChart 图表 数据表

models/edb_info.go

@@ -63,14 +63,14 @@ type EdbInfoFullClassify struct {
 }
 
 func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // 更新指标信息
 func (e *EdbInfo) Update(col []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(e, col...)
 	return
 }
@@ -127,14 +127,14 @@ type EdbInfoSearchResp struct {
 }
 
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	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 := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return
@@ -148,7 +148,7 @@ func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
 // @return item *EdbInfo
 // @return err error
 func GetEdbInfoByUniqueCode(uniqueCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE unique_code=? `
 	err = o.Raw(sql, uniqueCode).QueryRow(&item)
 	return
@@ -160,14 +160,14 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
 	return
 }
 
 func DeleteEdbInfo(edbInfoId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -195,7 +195,7 @@ func DeleteEdbInfo(edbInfoId int) (err error) {
 }
 
 func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -220,7 +220,7 @@ type EditEdbEnInfoReq struct {
 }
 
 func ModifyEdbInfo(item *EditEdbInfoReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name =?,
@@ -236,7 +236,7 @@ func ModifyEdbInfo(item *EditEdbInfoReq) (err error) {
 
 // ModifyEdbEnInfo 修改指标英文信息
 func ModifyEdbEnInfo(item *EditEdbEnInfoReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name_en =?,

models/edb_info_calculate_mapping.go

@@ -25,13 +25,13 @@ type EdbInfoCalculateMapping struct {
 }
 
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func DeleteEdbInfoMapping(edbInfoId int64) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	// 删除计算指标的关系
 	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=? `
 	_, err = o.Raw(sql, edbInfoId).Exec()
@@ -39,7 +39,7 @@ func DeleteEdbInfoMapping(edbInfoId int64) (err error) {
 }
 
 func GetEdbInfoCalculateMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
+	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
@@ -68,7 +68,7 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrm()
+	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=? `
@@ -103,7 +103,7 @@ type EdbInfoCalculateMappingInfo struct {
 
 // GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update 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=? `

services/alarm_msg/alarm_msg.go

@@ -17,6 +17,7 @@ import (
 // msgBody-消息内容
 // level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
 func SendAlarmMsg(msgBody string, level int) {
+	utils.FileLog.Info(msgBody)
 	if utils.AlarmMsgUrl == `` {
 		return
 	}
@@ -30,6 +31,7 @@ func SendAlarmMsg(msgBody string, level int) {
 		utils.FileLog.Info("SendAlarmMsg json.Marshal Err:" + err.Error())
 		return
 	}
+	utils.FileLog.Info(string(param))
 	_, _ = Post(utils.AlarmMsgUrl, string(param), "application/json")
 }
 

services/chart_info.go

@@ -1,17 +1,71 @@
 package services
 
 import (
+	"context"
 	"encoding/json"
 	"eta/eta_forum_task/models"
+	"eta/eta_forum_task/services/alarm_msg"
 	"eta/eta_forum_task/services/eta_forum"
 	"eta/eta_forum_task/utils"
 	"fmt"
+	"time"
 )
 
-func EtaForumChartUpdate() (err error) {
+func EtaForumChartUpdate(cont context.Context) (err error) {
+	var tmpErr []error
+	defer func() {
+		stack := ""
+		if err != nil {
+			stack = fmt.Sprintln(stack + err.Error())
+		}
+		if len(tmpErr) > 0 {
+			for _, v := range tmpErr {
+				stack = fmt.Sprintln(stack + v.Error())
+			}
+		}
+		if stack != "" {
+			go alarm_msg.SendAlarmMsg(utils.APP_NAME_CN+"更新社区图表信息失败"+time.Now().Format("2006-01-02 15:04:05")+"<br/>"+stack, 3)
+		}
+	}()
 	// 设置缓存判断处理中则不更新
+	condition := " and forum_chart_info_id > 0 and source=1 "
+	// 查询需要更新的图表信息总数
+	total, err := models.GetChartInfoCountByCondition(condition, []interface{}{})
+	if err != nil {
+		return
+	}
+	if total == 0 {
+		return
+	}
+	// 更新图表数据
+	offset := 0
+	pageSize := 100
+	success := 0
+
 	// 循环更新100个图表数据
+	for i := 0; offset < total; i++ {
+		// 查询需要更新的图表信息
+		chartInfos, e := models.GetChartInfoListByCondition(condition, []interface{}{}, offset, pageSize)
+		if e != nil {
+			err = fmt.Errorf("查询需要更新的图表信息失败: %v", e)
+			return
+		}
+		// 循环更新图表数据
+		for _, chartInfo := range chartInfos {
+			// 更新图表数据
+			er, msg := UpdateChart(chartInfo.ChartInfoId)
+			if er != nil {
+				er = fmt.Errorf("图表ID %d, 更新图表数据失败: %s, %v", chartInfo.ChartInfoId, msg, er)
+				tmpErr = append(tmpErr, er)
+				continue
+			}
+			success += 1
+		}
 
+		offset = (i + 1) * pageSize
+		time.Sleep(2 * time.Second)
+	}
+	fmt.Println("更新图表数据完成, 更新图表数据总数:", success)
 	return
 }
 

services/task.go

@@ -13,8 +13,8 @@ func Task() {
 		releaseTask()
 	}
 	// 定时更新图表数据到eta社区
-	//etaForumChartUpdate := task.NewTask("publishSmartReport", "0 */1 * * * *", EtaForumChartUpdate)
-	//task.AddTask("定时更新图表数据到eta社区", etaForumChartUpdate)
+	etaForumChartUpdate := task.NewTask("publishSmartReport", "0 */1 * * * *", EtaForumChartUpdate)
+	task.AddTask("定时更新图表数据到eta社区", etaForumChartUpdate)
 
 	task.StartTask()
 	fmt.Println("task end")

utils/config.go

@@ -8,14 +8,15 @@ import (
 )
 
 var (
-	RunMode            string //运行模式
-	APP_NAME_CN        string
-	MYSQL_URL          string //数据库连接
-	MONGODB_URL        string //mongodb连接
-	MONGODB_COMMUNITY  string //mongodb库名
-	MONGODB_CREDENTIAL string
-	Re                 error       //redis错误
-	Rc                 RedisClient //redis缓存
+	RunMode        string //运行模式
+	APP_NAME_CN    string
+	MYSQL_URL      string //数据库连接
+	MYSQL_URL_RDDP string //数据库连接
+	MYSQL_URL_EDB  string
+	MYSQL_URL_DATA string
+	MYSQL_URL_GL   string
+	Re             error       //redis错误
+	Rc             RedisClient //redis缓存
 )
 
 // ES配置
@@ -98,9 +99,10 @@ func init() {
 	}
 	APP_NAME_CN = appNameCn
 	MYSQL_URL = config["mysql_url"]
-	MONGODB_URL = config["mongodb_url"]
-	MONGODB_COMMUNITY = config["mongodb_community"]
-	MONGODB_CREDENTIAL = config["mongodb_credential"]
+	MYSQL_URL_RDDP = config["mysql_url_rddp"]
+	MYSQL_URL_EDB = config["mysql_url_edb"]
+	MYSQL_URL_DATA = config["mysql_url_data"]
+	MYSQL_URL_GL = config["mysql_url_gl"]
 	// 公共api内部服务调用
 	{
 		// 公共指标库相关