数据源涌益搜索

controllers/data_manage/yongyi_data.go

@@ -153,7 +153,7 @@ func (this *EdbInfoController) YongyiSearchList() {
 	}
 
 	//关键字
-	/*keyword := this.GetString("Keyword")
+	keyword := this.GetString("Keyword")
 
 	// todo es 模糊搜索
 	list, err := data_manage.GetYongyiItemList(keyword)
@@ -166,7 +166,7 @@ func (this *EdbInfoController) YongyiSearchList() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = list*/
+	br.Data = list
 }
 
 // YongyiSingleData
@@ -176,7 +176,7 @@ func (this *EdbInfoController) YongyiSearchList() {
 // @Success 200 {object} models.BaseResponse
 // @router /yongyi/single_data [get]
 func (this *EdbInfoController) YongyiSingleData() {
-	/*br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
@@ -195,28 +195,36 @@ func (this *EdbInfoController) YongyiSingleData() {
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
 	}
-	dataList, err := data_manage.GetYongyiIndexDataByCode(indexCode)
+	dataTmpList, err := data_manage.GetYongyiIndexDataByCode(indexCode)
 	if err != nil {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
-	var ret data_manage.BaseFromYongyiSingleDataResp
+	var ret data_manage.YongyiSingleDataResp
+	var dataList []*data_manage.YongyiSingleData
+
 	ret.ClassifyId = indexInfo.ClassifyId
-	ret.BaseFromYongyiIndexId = indexInfo.BaseFromYongyiIndexId
+	ret.YongyiIndexId = indexInfo.YongyiIndexId
 	ret.IndexCode = indexInfo.IndexCode
 	ret.IndexName = indexInfo.IndexName
 	ret.Frequency = indexInfo.Frequency
-	ret.Interface = indexInfo.Interface
 	ret.CreateTime = indexInfo.CreateTime.Format(utils.FormatDateTime)
 	ret.ModifyTime = indexInfo.ModifyTime.Format(utils.FormatDateTime)
 	ret.Unit = indexInfo.Unit
+	for _, v := range dataTmpList {
+		tmp := &data_manage.YongyiSingleData{
+			Value:    v.Value,
+			DataTime: v.DataTime,
+		}
+		dataList = append(dataList, tmp)
+	}
 	ret.Data = dataList
 
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = ret*/
+	br.Data = ret
 }
 
 // ExportYongyiList

models/data_manage/base_from_yongyi.go

@@ -2,7 +2,6 @@ package data_manage
 
 import (
 	"eta/eta_api/utils"
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
@@ -11,7 +10,6 @@ import (
 type BaseFromYongyiIndex struct {
 	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
 	ClassifyId    int
-	Interface     string
 	IndexCode     string
 	IndexName     string
 	Frequency     string
@@ -36,6 +34,24 @@ type BaseFromYongyiIndexList struct {
 	Paging        *paging.PagingItem `description:"分页数据"`
 }
 
+type YongyiSingleDataResp struct {
+	YongyiIndexId int
+	ClassifyId    int
+	IndexCode     string
+	IndexName     string
+	Frequency     string
+	Unit          string
+	StartTime     string
+	CreateTime    string
+	ModifyTime    string
+	Data          []*YongyiSingleData
+}
+
+type YongyiSingleData struct {
+	Value    string `orm:"column(value)" description:"日期"`
+	DataTime string `orm:"column(data_time)" description:"值"`
+}
+
 func GetYongyiIndex(condition string, pars interface{}) (items []*BaseFromYongyiIndexList, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE 1=1  `
@@ -61,18 +77,6 @@ func GetYongyiIndexData(indexCode string, startSize, pageSize int) (items []*Bas
 	return
 }
 
-func GetYongyiDataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_yongyi_index AS a
-				INNER JOIN base_from_yongyi_data AS b ON a.index_code=b.index_code
-				WHERE a.classify_id=?
-				GROUP BY a.yongyi_index_id
-			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
-	return
-}
-
 func GetYongyiIndexDataByCodes(indexCode []string) (items []*BaseFromYongyiData, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_yongyi_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
@@ -80,13 +84,6 @@ func GetYongyiIndexDataByCodes(indexCode []string) (items []*BaseFromYongyiData,
 	return
 }
 
-func GetBaseFromYongyiIndex() (list []*BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_index `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
 type BaseFromYongyiData struct {
 	YongyiDataId  int `orm:"column(yongyi_data_id);pk"`
 	YongyiIndexId int
@@ -98,41 +95,22 @@ type BaseFromYongyiData struct {
 	DataTimestamp int64
 }
 
-func AddBaseFromYongyiData(item *BaseFromYongyiData) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromYongyiDataAll() (list []*BaseFromYongyiData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_data `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-func ModifyBaseFromYongyiData(YongyiDataId int, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_yongyi_data SET value=?,modify_time=NOW() WHERE yongyi_data_id=? `
-	_, err = o.Raw(sql, value, YongyiDataId).Exec()
-	return
-}
-
-func GetBaseFromYongyiIndexByYongyiCode(YongyiCode string) (list []*BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_yongyi_index WHERE interface=? `
-	_, err = o.Raw(sql, YongyiCode).QueryRows(&list)
-	return
+type BaseFromYongyiIndexSearchItem struct {
+	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
+	ClassifyId    int
+	IndexCode     string
+	IndexName     string
 }
 
-func GetBaseFromYongyiMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
+// GetYongyiItemList 模糊查询Yongyi数据库指标列表
+func GetYongyiItemList(keyword string) (items []*BaseFromYongyiIndexSearchItem, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_yongyi_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+	sql := "SELECT * FROM base_from_yongyi_index WHERE CONCAT(index_name,index_code) LIKE '%" + keyword + "%'"
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-func GetBaseFromYongyiDataAllByIndexCode(indexCode string) (list []*BaseFromYongyiData, err error) {
+func GetYongyiIndexDataByCode(indexCode string) (list []*BaseFromYongyiData, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_yongyi_data WHERE index_code=? `
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -146,118 +124,11 @@ func GetBaseFromYongyiIndexByIndexCode(indexCode string) (list *BaseFromYongyiIn
 	return
 }
 
-// GetBaseFromYongyiIndexCountByClassifyIds 获取分类下指标的个数
-func GetBaseFromYongyiIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	num := len(classifyIds)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT COUNT(1) AS count FROM base_from_yongyi_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
-	return
-}
-
-// GetBaseFromYongyiIndexByClassifyId 获取根据分类查询指标
-func GetBaseFromYongyiIndexByClassifyId(classifyId int) (list []*BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_index WHERE classify_id =? ORDER BY sort ASC, yongyi_index_id ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
-	return
-}
-
-// GetYongyiIndexAll 用于分类展示
-func GetYongyiIndexAll() (items []*BaseFromYongyiClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT yongyi_index_id, classify_id, index_name as classify_name, index_code as base_from_yongyi_index_code
-            FROM base_from_yongyi_index ORDER BY sort ASC, yongyi_index_id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// GetBaseFromYongyiIndexByIndexId 根据指标id获取指标信息
-func GetBaseFromYongyiIndexByIndexId(indexId int) (item *BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_index WHERE yongyi_index_id=? `
-	err = o.Raw(sql, indexId).QueryRow(&item)
-	return
-}
-
-// GetBaseFromYongyiIndexMaxSortByClassifyId 根据指标id获取指标信息
-func GetBaseFromYongyiIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT max(sort) FROM base_from_yongyi_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
-	return
-}
-
-// GetBaseFromYongyiIndexMinSortByClassifyId 获取最小不等于0的排序
-func GetBaseFromYongyiIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT min(sort) FROM base_from_yongyi_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
-	return
-}
-
 type BaseFromYongyiIndexType struct {
 	Type2 string `orm:"column(type_2)"`
 	Type3 string `orm:"column(type_3)"`
 }
 
-// GetBaseFromYongyiIndexType 获取历史指标信息类型
-func GetBaseFromYongyiIndexType() (list []BaseFromYongyiIndexType, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT type_2, type_3 from base_from_yongyi_index where type_2 <> "" GROUP BY type_2, type_3`
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// MoveBaseFromYongyiIndex 移动指标分类
-func MoveBaseFromYongyiIndex(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_yongyi_index
-			SET
-			  classify_id = ?, modify_time=NOW() 
-			WHERE yongyi_index_id = ?`
-	_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
-	return
-}
-
-// UpdateBaseFromYongyiIndexByClassifyId 根据指标id更新排序
-func UpdateBaseFromYongyiIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_yongyi_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
-	if prevIndexInfoId > 0 {
-		sql += ` ( sort > ? or (yongyi_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	}
-	_, err = o.Raw(sql, classifyId, nowSort).Exec()
-	return
-}
-
-// MoveUpYongyiIndexBySort 往上移动
-func MoveUpYongyiIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_yongyi_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, classifyId, nextSort, currentSort).Exec()
-	return
-}
-
-// MoveDownYongyiIndexBySort 往下移动
-func MoveDownYongyiIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_yongyi_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, classifyId, prevSort, currentSort).Exec()
-	return
-}
-
-// GetFirstBaseFromYongyiIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
-func GetFirstBaseFromYongyiIndexByClassifyId(classifyId int) (item *BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_yongyi_index WHERE classify_id=? order by sort asc,yongyi_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
-
 // Update 更新Yongyi指标基础信息
 func (item *BaseFromYongyiIndex) Update(cols []string) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -265,38 +136,6 @@ func (item *BaseFromYongyiIndex) Update(cols []string) (err error) {
 	return
 }
 
-// DeleteBaseFromYongyiIndexById 根据指标id删除对应的指标、指标数据
-func DeleteBaseFromYongyiIndexById(YongyiIndexId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	//删除指标
-	sql := `DELETE FROM base_from_yongyi_index WHERE yongyi_index_id = ? `
-	_, err = to.Raw(sql, YongyiIndexId).Exec()
-	if err != nil {
-		return
-	}
-
-	//删除指标数据
-	sql = `DELETE FROM base_from_yongyi_data WHERE yongyi_index_id = ? `
-	_, err = to.Raw(sql, YongyiIndexId).Exec()
-	if err != nil {
-		return
-	}
-
-	return
-}
-
 // EditYongyiIndexInfoResp 新增指标的返回
 type EditYongyiIndexInfoResp struct {
 	YongyiIndexId int    `description:"指标ID"`