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