数据源-泛糖科技

models/base_from_hisugar.go

@@ -32,8 +32,35 @@ type BaseFromHisugarData struct {
 	ModifyTime             time.Time // 修改时间
 }
 
+type BaseFromHisugarDataOrm struct {
+	BaseFromHisugarDataId  int    // 数据表ID
+	BaseFromHisugarIndexId int    // 指标ID
+	IndexCode              string // 指标编码
+	DataTime               time.Time
+	Value                  string
+	CreateTime             time.Time // 创建时间
+	ModifyTime             time.Time // 修改时间
+}
+
+func (ormItem *BaseFromHisugarDataOrm) convertToSugarData() *BaseFromHisugarData {
+	return &BaseFromHisugarData{
+		BaseFromHisugarDataId:  ormItem.BaseFromHisugarDataId,
+		BaseFromHisugarIndexId: ormItem.BaseFromHisugarIndexId,
+		IndexCode:              ormItem.IndexCode,
+		DataTime:               ormItem.DataTime.Format(utils.FormatDate),
+		Value:                  ormItem.Value,
+		CreateTime:             ormItem.CreateTime,
+		ModifyTime:             ormItem.ModifyTime,
+	}
+}
+func convertToSugarDataList(ormList []*BaseFromHisugarDataOrm) (list []*BaseFromHisugarData) {
+	for _, ormItem := range ormList {
+		list = append(list, ormItem.convertToSugarData())
+	}
+	return
+}
 
-//添加数据
+// 添加数据
 func AddBaseFromHisugarIndexMuti(items []*BaseFromHisugarIndex) (err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(500, items)
@@ -104,11 +131,15 @@ func AddEdbDataFromHisugar(edbCode string) (err error) {
 func GetHisugarDataByCode(indexCode string) (items []*BaseFromHisugarData, err error) {
 	o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_hisugar_data WHERE index_code=? "
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	var ormList []*BaseFromHisugarDataOrm
+	_, err = o.Raw(sql, indexCode).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	items = convertToSugarDataList(ormList)
 	return
 }
 
-
 // RefreshEdbDataFromHisugar 刷新隆众资讯
 func RefreshEdbDataFromHisugar(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_OILCHEM
@@ -227,11 +258,15 @@ func GetBaseFromHisugarDataByCondition(condition string, pars []interface{}) (li
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	var ormList []*BaseFromHisugarDataOrm
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	list = convertToSugarDataList(ormList)
 	return
 }
 
-
 type HandleHisugarEdbDataReq struct {
 	List []*BaseFromHisugarIndexReq
 }
@@ -246,12 +281,17 @@ func GetBaseFromHisugarIndex() (list []*BaseFromHisugarIndex, err error) {
 func GetBaseFromHisugarData(indexCode, dataTime string) (item *BaseFromHisugarData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_hisugar_data where index_code=? And data_time = ? `
-	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	var ormItem *BaseFromHisugarDataOrm
+	err = o.Raw(sql, indexCode, dataTime).QueryRow(&ormItem)
+	if err != nil {
+		return
+	}
+	item = ormItem.convertToSugarData()
 	return
 }
 
 // UpdateBaseFromSci99Data
-func UpdateBaseFromHisugarData(value , indexCode, dataTime string) (err error) {
+func UpdateBaseFromHisugarData(value, indexCode, dataTime string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE base_from_sci99_data SET value=?,modify_time=NOW() WHERE index_code = ? AND data_time = ? `
 	_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
@@ -273,4 +313,4 @@ type BaseFromHisugarIndexReq struct {
 	IndexNameStr           string    // 指标名称字符串
 	MarketName             string    // 市场名称
 	Value                  string    // 值
-}
+}