数据源导出

controllers/data_manage/yongyi_data.go

@@ -4,7 +4,12 @@ import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
+	"os"
+	"path/filepath"
+	"time"
 )
 
 // YongyiClassify
@@ -41,16 +46,15 @@ func (this *EdbInfoController) YongyiClassify() {
 	br.Data = ret
 }
 
-// YongyiData
+// YongyiIndexData
 // @Title 获取钢联数据
 // @Description 获取钢联数据接口
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   ClassifyId   query   string  true       "分类id"
-// @Param   Frequency   query   string  true       "频度名称"
 // @Success 200 {object} data_manage.LzFrequency
-// @router /yongyi/index [get]
-func (this *EdbInfoController) YongyiData() {
+// @router /yongyi/index/data [get]
+func (this *EdbInfoController) YongyiIndexData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -221,13 +225,10 @@ func (this *EdbInfoController) YongyiSingleData() {
 // @Param   IndexName   query   string  false       "名称关键词"
 // @Param   IndexCode   query   string  false       "指标唯一编码"
 // @Param   ClassifyId   query   string  true       "分类"
-// @Param   Frequency   query   string  true       "频度"
-// @Param   UnitName   query   string  false       "单位"
-// @Param   ModifyTime   query   string  false       "更新时间"
 // @Success 200  导出成功
-// @router /export/yongyiList [get]
+// @router /yongyi/export [get]
 func (this *EdbInfoController) ExportYongyiList() {
-	/*br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
@@ -239,12 +240,9 @@ func (this *EdbInfoController) ExportYongyiList() {
 		return
 	}
 
-	//typeName := this.GetString("TypeName") //分类
-	//frequency := this.GetString("Frequency")
-
 	indexCode := this.GetString("IndexCode") //指标唯一编码
 	classifyId, _ := this.GetInt("ClassifyId")
-	secNameList := make([]*models.EdbdataExportList, 0)
+	//secNameList := make([]*models.EdbdataExportList, 0)
 
 	dir, _ := os.Executable()
 	exPath := filepath.Dir(dir)
@@ -252,240 +250,137 @@ func (this *EdbInfoController) ExportYongyiList() {
 	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
 	xlsxFile := xlsx.NewFile()
 
-	if classifyId >= 0 && indexCode == "" {
-
-		frequencies, err := data_manage.GetYongyiFrequency(classifyId)
-		if err != nil {
-			fmt.Println("GetYongyiFrequency err:", err.Error())
-			utils.FileLog.Info("GetYongyiFrequency err:" + err.Error())
+	var pars []interface{}
+	condition := ""
+	if classifyId > 0 {
+		//获取指标
+		condition += " AND classify_id=?"
+		pars = append(pars, classifyId)
+	}
+	if indexCode != "" {
+		//获取指标
+		condition += " AND index_code=?"
+		pars = append(pars, indexCode)
+	}
+	indexList, err := data_manage.GetYongyiIndex(condition, pars)
+	if err != nil {
+		fmt.Println("获取数据失败，Err:" + err.Error())
+		return
+	}
+	if len(indexList) <= 0 {
+		fmt.Println("indexList 为空")
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "success"
+		return
+	}
+	sheetNew := new(xlsx.Sheet)
+	// todo 分类名称
+	sheetNew, err = xlsxFile.AddSheet("日度")
+	//sheetNew.SetColWidth()
+	//获取指标数据
+	windRow := sheetNew.AddRow()
+	secNameRow := sheetNew.AddRow()
+	indexCodeRow := sheetNew.AddRow()
+	frequencyRow := sheetNew.AddRow()
+	unitRow := sheetNew.AddRow()
+	lastModifyDateRow := sheetNew.AddRow()
+	//获取分类下指标最大数据量
+	var dataMax int
+	setRowIndex := 6
+	indexCodeList := make([]string, 0)
+	for _, v := range indexList {
+		indexCodeList = append(indexCodeList, v.IndexCode)
+	}
+	dataListMap := make(map[string][]*data_manage.BaseFromYongyiData)
+	if len(indexList) > 0 {
+		allDataList, e := data_manage.GetYongyiIndexDataByCodes(indexCodeList)
+		if e != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取数据失败,Err:" + e.Error()
 			return
 		}
-		for _, frequency := range frequencies {
-
-			//获取指标
-			var pars []interface{}
-			pars = append(pars, classifyId)
-			pars = append(pars, frequency)
-			condition := " AND classify_id=? AND frequency=? "
-			secNameList, err := data_manage.GetYongyiIndex(condition, pars)
-			if err != nil {
-				fmt.Println("获取数据失败，Err:" + err.Error())
-				return
-			}
-			if len(secNameList) <= 0 {
-				fmt.Println("secNameList长度为0")
-				return
-			}
-
-			var sheetNew *xlsx.Sheet
-			if *frequency == "" {
-				newFrequency := "无频度"
-				sheetNew, err = xlsxFile.AddSheet(newFrequency)
-			} else {
-				sheetNew, err = xlsxFile.AddSheet(*frequency)
-			}
-
-			if err != nil {
-				fmt.Println("新增Sheet失败", err.Error())
-				return
-			}
-			//sheetNew.SetColWidth()
-			//获取指标数据
-			windRow := sheetNew.AddRow()
-			secNameRow := sheetNew.AddRow()
-			indexCodeRow := sheetNew.AddRow()
-			frequencyRow := sheetNew.AddRow()
-			unitRow := sheetNew.AddRow()
-			lastModifyDateRow := sheetNew.AddRow()
-			//获取分类下指标最大数据量
-			dataMax, err := data_manage.GetYongyiDataMaxCount(classifyId)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			fmt.Println("dataMax:", dataMax)
-			setRowIndex := 6
-			for k, sv := range secNameList {
-				//获取数据
-				dataList, err := data_manage.GetYongyiIndexDataByCode(sv.IndexCode)
-				if err != nil {
-					br.Msg = "获取数据失败"
-					br.ErrMsg = "获取数据失败,Err:" + err.Error()
-					return
-				}
-				if len(dataList) > 0 {
-					windRow.AddCell().SetValue("Yongyi")
-					secNameRow.AddCell().SetValue("指标名称")
-					indexCodeRow.AddCell().SetValue("指标ID")
-					frequencyRow.AddCell().SetValue("频率")
-					unitRow.AddCell().SetValue("单位")
-					lastModifyDateRow.AddCell().SetValue("更新时间")
-
-					secNameRow.AddCell().SetValue(sv.IndexName)
-					indexCodeRow.AddCell().SetValue(sv.IndexCode)
-					frequencyRow.AddCell().SetValue(sv.Frequency)
-
-					unitRow.AddCell().SetValue(sv.Unit)
-					lastModifyDateRow.AddCell().SetValue(sv.ModifyTime)
-
-					windRow.AddCell()
-					windRow.AddCell()
-					secNameRow.AddCell()
-					indexCodeRow.AddCell()
-					frequencyRow.AddCell()
-					unitRow.AddCell()
-					lastModifyDateRow.AddCell()
-					min := k * 3
-					sheetNew.SetColWidth(min, min, 15)
-
-					if len(dataList) <= 0 {
-						for n := 0; n < dataMax; n++ {
-							rowIndex := setRowIndex + n
-							row := sheetNew.Row(rowIndex)
-							row.AddCell()
-							row.AddCell()
-							row.AddCell()
-						}
-					} else {
-						endRowIndex := 0
-						for rk, dv := range dataList {
-							rowIndex := setRowIndex + rk
-							row := sheetNew.Row(rowIndex)
-							displayDate, _ := time.Parse(utils.FormatDate, dv.DataTime)
-							displayDateCell := row.AddCell()
-							style := new(xlsx.Style)
-							style.ApplyAlignment = true
-							style.Alignment.WrapText = true
-							displayDateCell.SetStyle(style)
-							displayDateCell.SetDate(displayDate)
-
-							row.AddCell().SetValue(dv.Value)
-							row.AddCell()
-							endRowIndex = rowIndex
-						}
-						if len(dataList) < dataMax {
-							dataLen := dataMax - len(dataList)
-							for n := 0; n < dataLen; n++ {
-								rowIndex := (endRowIndex + 1) + n
-								row := sheetNew.Row(rowIndex)
-								row.AddCell()
-								row.AddCell()
-								row.AddCell()
-							}
-						}
-					}
-				}
-			}
-		}
-	} else {
-		frequencies, err := data_manage.GetYongyiFrequencyByCode(indexCode)
-		if err != nil {
-			fmt.Println("GetYongyiFrequencyByCode err:", err.Error())
-			utils.FileLog.Info("GetYongyiFrequencyByCode err:" + err.Error())
-			return
+		for _, v := range allDataList {
+			dataListMap[v.IndexCode] = append(dataListMap[v.IndexCode], v)
 		}
-		for _, frequency := range frequencies {
-			//获取数据
-			dataList, err := data_manage.GetYongyiIndexDataByCode(indexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
+		for _, v := range dataListMap {
+			if len(v) > dataMax {
+				dataMax = len(v)
 			}
-			if len(dataList) > 0 {
-				name := this.GetString("IndexName")
-				unit := this.GetString("UnitName")
-				modifyTime := this.GetString("ModifyTime")
-
-				var sheet *xlsx.Sheet
-				if *frequency == "" {
-					newFrequency := "无频度"
-					sheet, err = xlsxFile.AddSheet(newFrequency)
-				} else {
-					sheet, err = xlsxFile.AddSheet(*frequency)
-				}
+		}
+	}
 
-				if err != nil {
-					br.Msg = "新增Sheet失败"
-					br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-					return
+	for k, sv := range indexList {
+		//获取数据
+		dataList, ok := dataListMap[sv.IndexCode]
+		if !ok {
+			continue
+		}
+		if len(dataList) > 0 {
+			windRow.AddCell().SetValue("涌益咨询")
+			secNameRow.AddCell().SetValue("指标名称")
+			indexCodeRow.AddCell().SetValue("指标ID")
+			frequencyRow.AddCell().SetValue("频率")
+			unitRow.AddCell().SetValue("单位")
+			lastModifyDateRow.AddCell().SetValue("更新时间")
+
+			secNameRow.AddCell().SetValue(sv.IndexName)
+			indexCodeRow.AddCell().SetValue(sv.IndexCode)
+			frequencyRow.AddCell().SetValue(sv.Frequency)
+
+			unitRow.AddCell().SetValue(sv.Unit)
+			lastModifyDateRow.AddCell().SetValue(sv.ModifyTime)
+
+			windRow.AddCell()
+			windRow.AddCell()
+			secNameRow.AddCell()
+			indexCodeRow.AddCell()
+			frequencyRow.AddCell()
+			unitRow.AddCell()
+			lastModifyDateRow.AddCell()
+			min := k * 3
+			sheetNew.SetColWidth(min, min, 15)
+
+			if len(dataList) <= 0 {
+				for n := 0; n < dataMax; n++ {
+					rowIndex := setRowIndex + n
+					row := sheetNew.Row(rowIndex)
+					row.AddCell()
+					row.AddCell()
+					row.AddCell()
 				}
-				//获取指标数据
-				windRow := sheet.AddRow()
-				windRow.AddCell().SetValue("Yongyi")
-				rowSecName := sheet.AddRow()
-				celSecName := rowSecName.AddCell()
-				celSecName.SetValue("指标名称")
-				cellSenName := rowSecName.AddCell()
-				cellSenName.SetValue(name)
-				indexCodeRow := sheet.AddRow()
-				indexCodeRow.AddCell().SetValue("指标ID")
-				indexCodeRow.AddCell().SetValue(indexCode)
-
-				rowFrequency := sheet.AddRow()
-				celFrequency := rowFrequency.AddCell()
-				celFrequency.SetValue("频率")
-				cellFrequency := rowFrequency.AddCell()
-				cellFrequency.SetValue(*frequency)
-
-				rowUnit := sheet.AddRow()
-				celUnit := rowUnit.AddCell()
-				celUnit.SetValue("单位")
-				cellUnit := rowUnit.AddCell()
-				cellUnit.SetValue(unit)
-
-				rowModifyDate := sheet.AddRow()
-				rowModifyCell := rowModifyDate.AddCell()
-				rowModifyCell.SetValue("更新时间")
-				rowModifyCell = rowModifyDate.AddCell()
-				rowModifyCell.SetValue(modifyTime)
-				dataMax, err := data_manage.GetYongyiIndexDataCount(indexCode)
-				if err != nil {
-					br.Msg = "查询数量失败"
-					br.ErrMsg = "GetYongyiIndexDataCount,Err:" + err.Error()
-					return
+			} else {
+				endRowIndex := 0
+				for rk, dv := range dataList {
+					rowIndex := setRowIndex + rk
+					row := sheetNew.Row(rowIndex)
+					displayDate, _ := time.Parse(utils.FormatDate, dv.DataTime)
+					displayDateCell := row.AddCell()
+					style := new(xlsx.Style)
+					style.ApplyAlignment = true
+					style.Alignment.WrapText = true
+					displayDateCell.SetStyle(style)
+					displayDateCell.SetDate(displayDate)
+
+					row.AddCell().SetValue(dv.Value)
+					row.AddCell()
+					endRowIndex = rowIndex
 				}
-				if len(dataList) <= 0 {
-					for n := 0; n < dataMax; n++ {
-						rowIndex := 6 + n
-						row := sheet.Row(rowIndex)
-						row.AddCell()
+				if len(dataList) < dataMax {
+					dataLen := dataMax - len(dataList)
+					for n := 0; n < dataLen; n++ {
+						rowIndex := (endRowIndex + 1) + n
+						row := sheetNew.Row(rowIndex)
 						row.AddCell()
 						row.AddCell()
-					}
-				} else {
-					endRowIndex := 0
-					for rk, dv := range dataList {
-						rowIndex := 6 + rk
-						row := sheet.Row(rowIndex)
-						displayDate, _ := time.Parse(utils.FormatDate, dv.DataTime)
-						displayDateCell := row.AddCell()
-						style := new(xlsx.Style)
-						style.ApplyAlignment = true
-						style.Alignment.WrapText = true
-						displayDateCell.SetStyle(style)
-						displayDateCell.SetDate(displayDate)
-
-						row.AddCell().SetValue(dv.Value)
 						row.AddCell()
-						endRowIndex = rowIndex
-					}
-					if len(dataList) < dataMax {
-						dataLen := dataMax - len(dataList)
-						for n := 0; n < dataLen; n++ {
-							rowIndex := (endRowIndex + 1) + n
-							row := sheet.Row(rowIndex)
-							row.AddCell()
-							row.AddCell()
-							row.AddCell()
-						}
 					}
 				}
 			}
 		}
 	}
 
-	err := xlsxFile.Save(downLoadnFilePath)
+	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {
 		//有指标无数据时先导出一遍空表
 		sheet, err := xlsxFile.AddSheet("无数据")
@@ -504,9 +399,9 @@ func (this *EdbInfoController) ExportYongyiList() {
 			return
 		}
 	}
-	fileName := `Yongyi数据`
-	if len(secNameList) > 0 {
-		fileName = secNameList[0].ClassifyName
+	fileName := `涌益咨询数据`
+	if len(indexList) > 0 {
+		fileName = indexList[0].IndexName
 	}
 	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
 	this.Ctx.Output.Download(downLoadnFilePath, fileName)
@@ -516,5 +411,5 @@ func (this *EdbInfoController) ExportYongyiList() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "success"
-	*/
+
 }

models/data_manage/base_from_yongyi.go

@@ -42,7 +42,7 @@ func GetYongyiIndex(condition string, pars interface{}) (items []*BaseFromYongyi
 	if condition != "" {
 		sql += condition
 	}
-	sql += `ORDER BY sort ASC, yongyi_index_id asc`
+	sql += ` ORDER BY sort ASC, yongyi_index_id asc`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
@@ -61,6 +61,25 @@ 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  `
+	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	return
+}
+
 func GetBaseFromYongyiIndex() (list []*BaseFromYongyiIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_yongyi_index `
@@ -69,14 +88,14 @@ func GetBaseFromYongyiIndex() (list []*BaseFromYongyiIndex, err error) {
 }
 
 type BaseFromYongyiData struct {
-	YongyiDataId          int `orm:"column(Yongyi_data_id);pk"`
-	BaseFromYongyiIndexId int
-	IndexCode             string
-	DataTime              string
-	Value                 string
-	CreateTime            string
-	ModifyTime            string
-	DataTimestamp         int64
+	YongyiDataId  int `orm:"column(yongyi_data_id);pk"`
+	YongyiIndexId int
+	IndexCode     string
+	DataTime      string
+	Value         string
+	CreateTime    string
+	ModifyTime    string
+	DataTimestamp int64
 }
 
 func AddBaseFromYongyiData(item *BaseFromYongyiData) (lastId int64, err error) {
@@ -94,7 +113,7 @@ func GetBaseFromYongyiDataAll() (list []*BaseFromYongyiData, err error) {
 
 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=? `
+	sql := `UPDATE base_from_yongyi_data SET value=?,modify_time=NOW() WHERE yongyi_data_id=? `
 	_, err = o.Raw(sql, value, YongyiDataId).Exec()
 	return
 }
@@ -113,13 +132,6 @@ func GetBaseFromYongyiMaxOrMinDate(indexCode string) (min_date, max_date string,
 	return
 }
 
-func ModifyBaseFromYongyiMinDateAndMaxDate(baseFromYongyiIndexId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_yongyi_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_yongyi_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromYongyiIndexId).Exec()
-	return
-}
-
 func GetBaseFromYongyiDataAllByIndexCode(indexCode string) (list []*BaseFromYongyiData, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_yongyi_data WHERE index_code=? `
@@ -149,7 +161,7 @@ func GetBaseFromYongyiIndexCountByClassifyIds(classifyIds []int) (count int, err
 // 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, base_from_yongyi_index_id ASC `
+	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
 }
@@ -157,8 +169,8 @@ func GetBaseFromYongyiIndexByClassifyId(classifyId int) (list []*BaseFromYongyiI
 // GetYongyiIndexAll 用于分类展示
 func GetYongyiIndexAll() (items []*BaseFromYongyiClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT base_from_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, base_from_yongyi_index_id ASC `
+	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
 }
@@ -166,7 +178,7 @@ func GetYongyiIndexAll() (items []*BaseFromYongyiClassifyItems, err error) {
 // GetBaseFromYongyiIndexByIndexId 根据指标id获取指标信息
 func GetBaseFromYongyiIndexByIndexId(indexId int) (item *BaseFromYongyiIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_index WHERE base_from_yongyi_index_id=? `
+	sql := `SELECT * FROM base_from_yongyi_index WHERE yongyi_index_id=? `
 	err = o.Raw(sql, indexId).QueryRow(&item)
 	return
 }
@@ -206,7 +218,7 @@ func MoveBaseFromYongyiIndex(chartInfoId, classifyId int) (err error) {
 	sql := ` UPDATE base_from_yongyi_index
 			SET
 			  classify_id = ?, modify_time=NOW() 
-			WHERE base_from_yongyi_index_id = ?`
+			WHERE yongyi_index_id = ?`
 	_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
 	return
 }
@@ -216,7 +228,7 @@ func UpdateBaseFromYongyiIndexByClassifyId(classifyId, nowSort, prevIndexInfoId
 	o := orm.NewOrmUsingDB("data")
 	sql := ` update base_from_yongyi_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
 	if prevIndexInfoId > 0 {
-		sql += ` ( sort > ? or (base_from_yongyi_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
+		sql += ` ( sort > ? or (yongyi_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	}
 	_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	return
@@ -241,7 +253,7 @@ func MoveDownYongyiIndexBySort(classifyId, prevSort, currentSort int) (err error
 // 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,base_from_yongyi_index_id asc limit 1`
+	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
 }
@@ -269,14 +281,14 @@ func DeleteBaseFromYongyiIndexById(YongyiIndexId int) (err error) {
 	}()
 
 	//删除指标
-	sql := `DELETE FROM base_from_yongyi_index WHERE base_from_yongyi_index_id = ? `
+	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 base_from_yongyi_index_id = ? `
+	sql = `DELETE FROM base_from_yongyi_data WHERE yongyi_index_id = ? `
 	_, err = to.Raw(sql, YongyiIndexId).Exec()
 	if err != nil {
 		return
@@ -287,6 +299,6 @@ func DeleteBaseFromYongyiIndexById(YongyiIndexId int) (err error) {
 
 // EditYongyiIndexInfoResp 新增指标的返回
 type EditYongyiIndexInfoResp struct {
-	BaseFromYongyiIndexId int    `description:"指标ID"`
-	IndexCode             string `description:"指标code"`
+	YongyiIndexId int    `description:"指标ID"`
+	IndexCode     string `description:"指标code"`
 }

routers/commentsRouter.go

@@ -2734,15 +2734,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
-        beego.ControllerComments{
-            Method: "ExportYongyiList",
-            Router: `/export/yongyiList`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "GlClassify",
@@ -3159,8 +3150,17 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
-            Method: "YongyiData",
-            Router: `/yongyi/index`,
+            Method: "ExportYongyiList",
+            Router: `/yongyi/export`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "YongyiIndexData",
+            Router: `/yongyi/index/data`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,