Merge branch 'feature/eta_zsh' of http://8.136.199.33:3000/eta_server/eta_api into feature/eta_zsh

controllers/data_manage/base_from_ly_index_controller.go

@@ -444,7 +444,7 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 		rowModifyCell := rowModifyDate.AddCell()
 		rowModifyCell.SetValue("更新时间/Update Time")
 
-		dataMap := make(map[string]map[string]*data_manage.BaseFromLyData)
+		dataMap := make(map[string]map[string]*data_manage.BaseFromLyDataItem)
 		var tradeCodeList []string
 		for _, v := range lyIndices {
 			cellSenName := rowSecName.AddCell()
@@ -454,10 +454,10 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 			celUnit := rowUnit.AddCell()
 			celUnit.SetValue(v.Unit)
 			rowModifyCell := rowModifyDate.AddCell()
-			rowModifyCell.SetValue(v.ModifyTime)
+			rowModifyCell.SetValue(v.ModifyTime.Format(utils.FormatDateTime))
 			tradeCodeList = append(tradeCodeList, v.IndexCode)
 
-			var lyDataList []*data_manage.BaseFromLyData
+			var lyDataList []*data_manage.BaseFromLyDataItem
 			lyDataList, err = data_manage.GetBaseFromLyDataByIndexCode(v.IndexCode)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.ErrMsg = "GetBaseFromLyDataByIndexCode,Err:" + err.Error()
@@ -466,7 +466,7 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 			}
 			for _, item := range lyDataList {
 				if dataMap[item.IndexCode] == nil {
-					dataMap[item.IndexCode] = make(map[string]*data_manage.BaseFromLyData)
+					dataMap[item.IndexCode] = make(map[string]*data_manage.BaseFromLyDataItem)
 				}
 				dataMap[item.IndexCode][item.DataTime] = item
 			}
@@ -480,7 +480,11 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		for _, dataTime := range dataTimeList {
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
+		for _, dataTime := range dataTimeStrList {
 			rowData := sheet.AddRow()
 			celDate := rowData.AddCell()
 			celDate.SetValue(dataTime)

controllers/data_manage/base_from_rzd_index_controller.go

@@ -600,7 +600,12 @@ func (this *BaseFromRzdIndexController) RzdIndexDataExport() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		for _, dataTime := range dataTimeList {
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
+
+		for _, dataTime := range dataTimeStrList {
 			rowData := sheet.AddRow()
 			celDate := rowData.AddCell()
 			celDate.SetValue(dataTime)

controllers/data_manage/gpr_risk_data.go

@@ -379,7 +379,7 @@ func (this *BaseFromGprRiskController) GprRiskSingleData() {
 	for _, v := range dataTmpList {
 		tmp := &data_manage.GprRiskSingleData{
 			Value:    v.Value,
-			DataTime: v.DataTime,
+			DataTime: v.DataTime.Format(utils.FormatDateTime),
 		}
 		dataList = append(dataList, tmp)
 	}
@@ -910,10 +910,14 @@ func (this *BaseFromGprRiskController) ExportGprRiskList() {
 			fmt.Println("获取数据时间失败", err.Error())
 			return
 		}
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
 
 		// 添加excel左侧指标日期
 		setRowIndex := 4
-		for rk, dv := range dataTimeList {
+		for rk, dv := range dataTimeStrList {
 			rowIndex := setRowIndex + rk
 			row := sheetNew.Row(rowIndex)
 			displayDate, _ := time.Parse(utils.FormatDate, dv)
@@ -946,17 +950,13 @@ func (this *BaseFromGprRiskController) ExportGprRiskList() {
 			frequencyRow.AddCell().SetValue(icl.Frequency)
 			unitRow.AddCell().SetValue(icl.Unit)
 
-			timeDate, err := time.Parse(utils.FormatDateTime, dataList[0].ModifyTime)
-			if err != nil {
-				continue
-			}
-			lastModifyDateRow.AddCell().SetValue(timeDate.Format(utils.FormatDate))
+			lastModifyDateRow.AddCell().SetValue(dataList[0].ModifyTime.Format(utils.FormatDate))
 			dataInfoMap := make(map[string]*data_manage.BaseFromGprRiskData)
 			for _, v := range dataList {
-				dataInfoMap[v.DataTime] = v
+				dataInfoMap[v.DataTime.Format(utils.FormatDate)] = v
 			}
 
-			for rk, dtv := range dataTimeList {
+			for rk, dtv := range dataTimeStrList {
 				rowIndex := setRowIndex + rk
 				row := sheetNew.Row(rowIndex)
 				displayDateCell := row.AddCell()

controllers/hisugar_data.go

@@ -741,10 +741,14 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			fmt.Println("获取数据时间失败", err.Error())
 			return
 		}
+		dataTimeStrList := make([]string, 0)
+		for _, v := range dataTimeList {
+			dataTimeStrList = append(dataTimeStrList, v.Format(utils.FormatDate))
+		}
 
 		// 添加excel左侧指标日期
 		setRowIndex := 4
-		for rk, dv := range dataTimeList {
+		for rk, dv := range dataTimeStrList {
 			rowIndex := setRowIndex + rk
 			row := sheetNew.Row(rowIndex)
 			displayDate, _ := time.Parse(utils.FormatDate, dv)
@@ -785,7 +789,7 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 				dataInfoMap[v.DataTime] = v
 			}
 
-			for rk, dtv := range dataTimeList {
+			for rk, dtv := range dataTimeStrList {
 				rowIndex := setRowIndex + rk
 				row := sheetNew.Row(rowIndex)
 				displayDateCell := row.AddCell()

controllers/trade_analysis/trade_analysis.go

@@ -32,6 +32,9 @@ func (c *TradeAnalysisController) GetClassifyName() {
 	}()
 	//userinfo := userService.GetInfoByClaims(c)
 	list, err, errMsg := trade_analysis.GetClassifyName(c.Lang)
+	fmt.Println(err)
+	fmt.Println(errMsg)
+	fmt.Println(list)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = "获取失败, ErrMsg: " + err.Error()

models/data_manage/base_from_fenwei.go

@@ -254,7 +254,7 @@ func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenwei
 
 // GetFenWeiDataListByIndexCodes 根据指标编码查询
 func GetFenWeiDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+	sql := ` SELECT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time ORDER BY data_time  DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/data_manage/base_from_gpr_risk.go

@@ -16,13 +16,37 @@ type BaseFromGprRiskIndex struct {
 	Frequency              string
 	Unit                   string
 	Sort                   int
-	StartDate              string `description:"开始日期"`
-	EndDate                string `description:"结束日期"`
+	StartDate              time.Time `description:"开始日期"`
+	EndDate                time.Time `description:"结束日期"`
 	EndValue               float64
 	CreateTime             time.Time
 	ModifyTime             time.Time
 }
 
+func (m *BaseFromGprRiskIndex) ToList() (item *BaseFromGprRiskIndexList) {
+	return &BaseFromGprRiskIndexList{
+		BaseFromGprRiskIndexId: m.BaseFromGprRiskIndexId,
+		ClassifyId:             m.ClassifyId,
+		//Interface:              ``,
+		//EdbInfoId:              0,
+		//EdbUniqueCode:          "",
+		//EdbClassifyId:          0,
+		StartDate:  m.StartDate.Format(utils.FormatDate),
+		EndDate:    m.EndDate.Format(utils.FormatDate),
+		EndValue:   m.EndValue,
+		IndexCode:  m.IndexCode,
+		IndexName:  m.IndexName,
+		Frequency:  m.Frequency,
+		Unit:       m.Unit,
+		Sort:       m.Sort,
+		CreateTime: m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime: m.ModifyTime.Format(utils.FormatDateTime),
+		//EdbExist:               0,
+		//DataList:               nil,
+		//Paging:                 nil,
+	}
+}
+
 type BaseFromGprRiskIndexList struct {
 	BaseFromGprRiskIndexId int `orm:"column(base_from_gpr_risk_index_id);pk"`
 	ClassifyId             int
@@ -77,24 +101,42 @@ func GetGprRiskIndexByClassifyId(classifyId int) (items []*BaseFromGprRiskIndex,
 }
 
 func GetGprRiskIndex(condition string, pars interface{}) (items []*BaseFromGprRiskIndexList, err error) {
+	var ormList []*BaseFromGprRiskIndex
+	items = make([]*BaseFromGprRiskIndexList, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_gpr_risk_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_gpr_risk_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToList())
+	}
+
 	return
 }
 
 func GetGprRiskIndexPage(condition string, pars interface{}, startSize, pageSize int) (items []*BaseFromGprRiskIndexList, err error) {
+	var ormList []*BaseFromGprRiskIndex
+	items = make([]*BaseFromGprRiskIndexList, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_gpr_risk_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_gpr_risk_index_id asc LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToList())
+	}
+
 	return
 }
 
@@ -172,7 +214,7 @@ func GetGprRiskFrequencyByCondition(condition string, pars []interface{}) (items
 }
 
 // GetGprRiskDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
-func GetGprRiskDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
+func GetGprRiskDataDataTimeByIndexId(indexIdList []int) (items []time.Time, err error) {
 	if len(indexIdList) == 0 {
 		return
 	}
@@ -186,10 +228,10 @@ type BaseFromGprRiskData struct {
 	BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);pk"`
 	BaseFromGprRiskIndexId int
 	IndexCode              string
-	DataTime               string
+	DataTime               time.Time
 	Value                  string
-	CreateTime             string
-	ModifyTime             string
+	CreateTime             time.Time
+	ModifyTime             time.Time
 	DataTimestamp          int64
 }
 

models/data_manage/base_from_hisugar.go

@@ -366,7 +366,7 @@ func GetHisugarDataViewList(indexIds []int) (items []*BaseFromHisugarDataItem, e
 }
 
 // GetHisugarDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
-func GetHisugarDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
+func GetHisugarDataDataTimeByIndexId(indexIdList []int) (items []time.Time, err error) {
 	if len(indexIdList) == 0 {
 		return
 	}

models/data_manage/base_from_ly_data.go

@@ -3,12 +3,36 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
+	"time"
 )
 
 type BaseFromLyData struct {
+	BaseFromLyDataId  int       `orm:"column(base_from_ly_data_id);pk" description:"数据ID"`
+	CreateTime        time.Time `orm:"column(create_time)" description:"创建时间"`
+	ModifyTime        time.Time `orm:"column(modify_time)" description:"修改时间"`
+	BaseFromLyIndexId int       `orm:"column(base_from_ly_index_id)" description:"指标id"`
+	IndexCode         string    `orm:"column(index_code)" description:"指标编码"`
+	DataTime          time.Time `orm:"column(data_time)" description:"数据日期"`
+	Value             float64   `orm:"column(value)" description:"数据值"`
+}
+
+func (m *BaseFromLyData) ToItem() (item *BaseFromLyDataItem) {
+	return &BaseFromLyDataItem{
+		BaseFromLyDataId:  m.BaseFromLyDataId,
+		CreateTime:        m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime:        m.ModifyTime.Format(utils.FormatDateTime),
+		BaseFromLyIndexId: m.BaseFromLyIndexId,
+		IndexCode:         m.IndexCode,
+		DataTime:          m.DataTime.Format(utils.FormatDate),
+		Value:             m.Value,
+	}
+}
+
+type BaseFromLyDataItem struct {
 	BaseFromLyDataId  int     `orm:"column(base_from_ly_data_id);pk" description:"数据ID"`
 	CreateTime        string  `orm:"column(create_time)" description:"创建时间"`
 	ModifyTime        string  `orm:"column(modify_time)" description:"修改时间"`
@@ -23,8 +47,8 @@ func init() {
 }
 
 type BaseFromLyDataPage struct {
-	List   []*BaseFromLyData  `description:"指标数据列表"`
-	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*BaseFromLyDataItem `description:"指标数据列表"`
+	Paging *paging.PagingItem    `description:"分页数据"`
 }
 
 // GetLyDataCountByIndexId 获取指标数据总数
@@ -36,30 +60,51 @@ func GetLyDataCountByIndexId(indexId int) (count int, err error) {
 }
 
 // GetLyDataPageByIndexId 获取指标数据分页列表
-func GetLyDataPageByIndexId(indexId int, startSize, pageSize int) (items []*BaseFromLyData, err error) {
+func GetLyDataPageByIndexId(indexId int, startSize, pageSize int) (items []*BaseFromLyDataItem, err error) {
+	var ormList []*BaseFromLyData
+	items = make([]*BaseFromLyDataItem, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? ORDER BY data_time desc LIMIT ?,?`
-	_, err = o.Raw(sql, indexId, (startSize-1)*pageSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, indexId, (startSize-1)*pageSize, pageSize).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetBaseFromLyDataByIndexCode 根据指标编码查询
-func GetBaseFromLyDataByIndexCode(indexCode string) (items []*BaseFromLyData, err error) {
+func GetBaseFromLyDataByIndexCode(indexCode string) (items []*BaseFromLyDataItem, err error) {
+	var ormList []*BaseFromLyData
+	items = make([]*BaseFromLyDataItem, 0)
 	sql := `SELECT * FROM base_from_ly_data WHERE index_code=? ORDER BY data_time desc`
 	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	_, err = o.Raw(sql, indexCode).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
-func GetLyDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_ly_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+func GetLyDataListByIndexCodes(IndexCodes string) (items []time.Time, err error) {
+	sql := ` SELECT data_time FROM base_from_ly_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time ORDER BY data_time DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // GetLyLastUpdateTimeLastByIndexCode 根据指标编码查询 返回ModifyTime最后一条数据
-func GetLyLastUpdateTimeLastByIndexCode(indexCodes []string) (items []*BaseFromLyData, err error) {
+func GetLyLastUpdateTimeLastByIndexCode(indexCodes []string) (items []*BaseFromLyDataItem, err error) {
+	var ormList []*BaseFromLyData
+	items = make([]*BaseFromLyDataItem, 0)
+
 	o := orm.NewOrmUsingDB("data")
 
 	// 将 indexCodes 切片转换为逗号分隔的字符串
@@ -72,17 +117,23 @@ func GetLyLastUpdateTimeLastByIndexCode(indexCodes []string) (items []*BaseFromL
             GROUP BY index_code`
 
 	// 执行 SQL 查询
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	_, err = o.Raw(sql, indexCodes).QueryRows(&ormList)
 	if err != nil {
 		return nil, err
 	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return items, nil
 }
 
 // GetLyLastDataTimeByIndexCode 根据指标编码查询 返回data_time最后一条数据的value
-func GetLyLastDataTimeByIndexCode(indexCodes []string) (items []*BaseFromLyData, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetLyLastDataTimeByIndexCode(indexCodes []string) (items []*BaseFromLyDataItem, err error) {
+	var ormList []*BaseFromLyData
+	items = make([]*BaseFromLyDataItem, 0)
 
+	o := orm.NewOrmUsingDB("data")
 	// 将 indexCodes 切片转换为逗号分隔的字符串
 	placeholders := strings.Repeat("?,", len(indexCodes)-1) + "?"
 
@@ -100,9 +151,13 @@ func GetLyLastDataTimeByIndexCode(indexCodes []string) (items []*BaseFromLyData,
    `
 
 	// 执行 SQL 查询
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	_, err = o.Raw(sql, indexCodes).QueryRows(&ormList)
 	if err != nil {
 		return nil, err
 	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return items, nil
 }

models/data_manage/base_from_ly_index.go

@@ -3,20 +3,41 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
 )
 
 type BaseFromLyIndex struct {
-	BaseFromLyIndexId    int    `orm:"column(base_from_ly_index_id);pk" description:"指标ID"`
-	CreateTime           string `orm:"column(create_time)" description:"创建时间"`
-	ModifyTime           string `orm:"column(modify_time)" description:"修改时间"`
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)" description:"原始数据指标分类id"`
-	IndexCode            string `orm:"column(index_code)" description:"指标编码"`
-	IndexName            string `orm:"column(index_name)" description:"指标名称"`
-	Frequency            string `orm:"column(frequency)" description:"频度"`
-	Unit                 string `orm:"column(unit)" description:"单位"`
-	EdbExist             int    `orm:"column(edb_exist)" description:"指标库是否已添加：0-否；1-是"`
+	BaseFromLyIndexId    int       `orm:"column(base_from_ly_index_id);pk" description:"指标ID"`
+	CreateTime           time.Time `orm:"column(create_time)" description:"创建时间"`
+	ModifyTime           time.Time `orm:"column(modify_time)" description:"修改时间"`
+	BaseFromLyClassifyId int       `orm:"column(base_from_ly_classify_id)" description:"原始数据指标分类id"`
+	IndexCode            string    `orm:"column(index_code)" description:"指标编码"`
+	IndexName            string    `orm:"column(index_name)" description:"指标名称"`
+	Frequency            string    `orm:"column(frequency)" description:"频度"`
+	Unit                 string    `orm:"column(unit)" description:"单位"`
+	EdbExist             int       `orm:"column(edb_exist)" description:"指标库是否已添加：0-否；1-是"`
+	StartDate            time.Time `orm:"column(start_date)"`
+	EndDate              time.Time `orm:"column(end_date)"`
+	LatestValue          float64   `orm:"column(latest_value)" description:"数据值"`
+}
+
+func (m *BaseFromLyIndex) ToIndexAndData() (item *BaseFromLyIndexAndData) {
+	return &BaseFromLyIndexAndData{
+		BaseFromLyIndexId:    m.BaseFromLyIndexId,
+		CreateTime:           m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime:           m.ModifyTime.Format(utils.FormatDateTime),
+		BaseFromLyClassifyId: m.BaseFromLyClassifyId,
+		IndexCode:            m.IndexCode,
+		IndexName:            m.IndexName,
+		Frequency:            m.Frequency,
+		Unit:                 m.Unit,
+		EdbExist:             m.EdbExist,
+		//ModifyTimeMax:        "",
+		//Value:                0,
+	}
 }
 
 // 在 init 函数中注册模型
@@ -70,6 +91,10 @@ type IndexCheckData struct {
 
 // GetLyIndexByClassifyIds 通过分类ids查询指标列表
 func GetLyIndexByClassifyIds(classifyIds []int) (items []*BaseFromLyIndex, err error) {
+	num := len(classifyIds)
+	if num <= 0 {
+		return
+	}
 	o := orm.NewOrmUsingDB("data")
 
 	// 创建查询条件
@@ -112,6 +137,9 @@ func GetLyIndexCount(classifyId string, searchParam string) (count int, err erro
 
 // GetLyIndexPage 获取指标列表
 func GetLyIndexPage(classifyId string, searchParam string, currentIndex, pageSize int) (items []*BaseFromLyIndexAndData, err error) {
+	var ormList []*BaseFromLyIndex
+	items = make([]*BaseFromLyIndexAndData, 0)
+
 	o := orm.NewOrmUsingDB("data")
 
 	// 构建 SQL 查询语句
@@ -136,10 +164,14 @@ func GetLyIndexPage(classifyId string, searchParam string, currentIndex, pageSiz
 	params = append(params, (currentIndex-1)*pageSize, pageSize)
 
 	// 执行查询
-	_, err = o.Raw(sql, params...).QueryRows(&items)
+	_, err = o.Raw(sql, params...).QueryRows(&ormList)
 	if err != nil {
 		return nil, err
 	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToIndexAndData())
+	}
+
 	return
 }
 

models/data_manage/base_from_rzd_data.go

@@ -137,7 +137,7 @@ func GetBaseFormRzdDataByCondition(condition string, pars interface{}) (items []
 }
 
 // GetRzdDataListByIndexCodes 根据指标编码查询
-func GetRzdDataListByIndexCodes(IndexCodes string) (items []string, err error) {
+func GetRzdDataListByIndexCodes(IndexCodes string) (items []time.Time, err error) {
 	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time ORDER BY data_time DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)

models/edb_monitor/edb_monitor.go

@@ -116,7 +116,7 @@ func GetEdbMonitorInfoPageByCondition(condition string, pars []interface{}, star
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY create_time DESC LIMIT?,?`
+	sql += ` ORDER BY create_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/data/base_from_ly_index_service.go

@@ -41,7 +41,7 @@ func GetIndexPage(classifyId string, searchParam string, currentIndex, pageSize
 		return nil, err
 	}
 	// 将lyIndexData转换为map
-	lyIndexDataMap := make(map[string]*data_manage.BaseFromLyData)
+	lyIndexDataMap := make(map[string]*data_manage.BaseFromLyDataItem)
 	for _, v := range lyIndexData {
 		lyIndexDataMap[v.IndexCode] = v
 	}
@@ -51,7 +51,7 @@ func GetIndexPage(classifyId string, searchParam string, currentIndex, pageSize
 		return nil, err
 	}
 	// 将lyData转换为map
-	lyDataMap := make(map[string]*data_manage.BaseFromLyData)
+	lyDataMap := make(map[string]*data_manage.BaseFromLyDataItem)
 	for _, v := range lyData {
 		lyDataMap[v.IndexCode] = v
 	}

services/data/trade_analysis/trade_analysis.go

@@ -83,18 +83,22 @@ func GetClassifyName(lang string) (list trade_analysis.TradeClassifyNameListSort
 		}
 		nameList, ok := classifyExchangeMap[k]
 		if !ok {
-			err = fmt.Errorf("查询交易所分类信息失败")
-			errMsg = "查询交易所分类信息失败"
-			return
+			//err = fmt.Errorf("查询交易所分类信息失败")
+			//errMsg = "查询交易所分类信息失败"
+			//fmt.Println("line 91")
+			//return
+			continue
 		}
 
 		// 查询交易所最新更新时间失败
 		if timeLast, ok := timeLastMap[k]; ok {
 			tmp.DataTime = timeLast.Format(utils.FormatDateTime)
 		} else {
-			err = fmt.Errorf("查询交易所最新更新时间失败")
-			errMsg = "查询交易所最新更新时间失败"
-			return
+			//err = fmt.Errorf("查询交易所最新更新时间失败")
+			//errMsg = "查询交易所最新更新时间失败"
+			//fmt.Println("line 101")
+			//return
+			continue
 		}
 
 		classifyMap := make(map[string][]trade_analysis.TradeClassifyNameListItemItem)