Przeglądaj źródła

删除百川盈孚数据管理接口

- 移除了百川盈孚数据分类、频度、搜索、导出等相关接口
- 删除了百川盈孚数据移动、编辑、删除等操作接口
- 移除了与百川盈孚数据交互的所有相关代码和逻辑
Roc 5 miesięcy temu
rodzic
commit
90bdf25f3d
47 zmienionych plików z 12 dodań i 14946 usunięć
  1. 0 507
      controllers/commodity_trade_base_index.go
  2. 0 1138
      controllers/data_manage/baiinfo_data.go
  3. 0 58
      controllers/data_manage/base_from_changes_visitors_covid.go
  4. 0 599
      controllers/data_manage/ccf_data.go
  5. 0 276
      controllers/data_manage/edb_info.go
  6. 0 291
      controllers/data_manage/eia_steo.go
  7. 0 1026
      controllers/data_manage/fenwei_data.go
  8. 0 172
      controllers/data_manage/jiayue_edb_source.go
  9. 0 474
      controllers/data_manage/national_statistics.go
  10. 0 1106
      controllers/data_manage/sci_data.go
  11. 0 1549
      controllers/data_manage/sci_hq_data.go
  12. 0 790
      controllers/oilchem_data.go
  13. 0 167
      models/data_manage/baiinfo_data.go
  14. 0 247
      models/data_manage/base_from_baiinfo.go
  15. 0 258
      models/data_manage/base_from_baiinfo_classify.go
  16. 0 137
      models/data_manage/base_from_ccf.go
  17. 0 55
      models/data_manage/base_from_ccf_classify.go
  18. 0 38
      models/data_manage/base_from_changes_visitors_covid.go
  19. 0 160
      models/data_manage/base_from_eia_stero.go
  20. 0 265
      models/data_manage/base_from_fenwei.go
  21. 0 68
      models/data_manage/base_from_fenwei_classify.go
  22. 0 189
      models/data_manage/base_from_mtjh.go
  23. 0 102
      models/data_manage/base_from_national_statistics_classify.go
  24. 0 90
      models/data_manage/base_from_national_statistics_data.go
  25. 0 161
      models/data_manage/base_from_national_statistics_index.go
  26. 0 273
      models/data_manage/base_from_oilchem.go
  27. 0 242
      models/data_manage/base_from_sci.go
  28. 0 246
      models/data_manage/base_from_sci_classify.go
  29. 0 207
      models/data_manage/base_from_sci_hq_classify.go
  30. 0 52
      models/data_manage/base_from_sci_hq_data.go
  31. 0 378
      models/data_manage/base_from_sci_hq_index.go
  32. 0 159
      models/data_manage/ccf_stock_classify.go
  33. 0 177
      models/data_manage/ccf_stock_excel.go
  34. 0 47
      models/data_manage/request/sci_data.go
  35. 0 71
      models/data_manage/request/sci_hq_data.go
  36. 0 35
      models/data_manage/response/sci_hq_data.go
  37. 0 149
      models/data_manage/sci_data.go
  38. 0 13
      models/db2.go
  39. 12 867
      routers/commentsRouter.go
  40. 0 4
      routers/router.go
  41. 0 9
      services/data/base_bridge.go
  42. 0 527
      services/data/base_from_baiinfo.go
  43. 0 162
      services/data/base_from_fenwei_index_service.go
  44. 0 59
      services/data/base_from_oilchem.go
  45. 0 522
      services/data/base_from_sci.go
  46. 0 583
      services/data/base_from_sci_hq.go
  47. 0 241
      services/data/jiayue_index.go

+ 0 - 507
controllers/commodity_trade_base_index.go

@@ -2549,510 +2549,3 @@ func (this *TradeCommonController) EicDataListV2() {
 	br.Msg = "获取成功"
 	br.Data = data
 }
-
-// CoalMineClassify
-// @title	获取煤炭江湖分类列表
-// @Description	获取煤炭江湖分类列表
-// @Success 200 {object} models.
-// @router /data/mtjh/classify [get]
-func (this *TradeCommonController) MtjhClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	list, err := data_manage.GetMtjhClassifyList()
-	if err != nil {
-		br.Msg = "获取煤炭分类数据失败"
-		br.ErrMsg = "获取煤炭度分类数据失败,Err: " + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// CoalMineData
-// @title	获取煤炭江湖详细数据列表
-// @Description	获取煤炭江湖详细数据接口
-// @Param	ClassifyId query int true	"数据id"
-// @Param	GroupName query string true	"分组名"
-// @Param	Frequency query string true	"频度"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Success 200 {object} []data_manage.CoalmineDataResp
-// @router /data/mtjh/data [get]
-func (this *TradeCommonController) MtjhData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	area := this.GetString("Area")
-	if area == "" {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if area != "" {
-		condition += ` AND area=? `
-		pars = append(pars, area)
-	}
-
-	mtjhList, err := data_manage.GetMtjhMapping(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_manage.BaseFromMtjhIndexList, 0)
-	for _, v := range mtjhList {
-		product := new(data_manage.BaseFromMtjhIndexList)
-		product.BaseFromMtjhMappingId = v.BaseFromMtjhMappingId
-		product.Unit = v.Unit
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Port = v.Port
-		product.Area = v.Area
-		product.Variety = v.Variety
-		product.Frequency = v.Frequency
-		product.CreateTime = v.CreateTime
-
-		modifyTime, err := data_manage.GetMtjhIndexLatestDate(v.IndexCode)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取更新时间失败"
-			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
-			return
-		}
-		product.ModifyTime = modifyTime
-
-		total, err := data_manage.GetMtjhIndexDataCount(v.IndexCode)
-		if err != nil {
-			br.Msg = "获取总数失败"
-			br.ErrMsg = "获取总数失败,Err:" + err.Error()
-			return
-		}
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, err := data_manage.GetMtjhIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.BaseFromMtjhIndexItem, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-	return
-}
-
-// CoalSearchList
-// @Title 煤炭江湖模糊搜索
-// @Description 煤炭江湖模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /data/mtjh/search [get]
-func (this *TradeCommonController) MtjhSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	//关键字
-	keyword := this.GetString("Keyword")
-
-	list, err := data_manage.GetMtjhItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// CoalSingleData
-// @Title 获取煤炭江湖单条数据
-// @Description 获取煤炭江湖单条数据
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} []data_manage.CoalmineSingalDataResp
-// @router  /data/mtjh/single_data [get]
-func (this *TradeCommonController) MtjhSingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	indexCode := this.GetString("IndexCode")
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	mapping, err := data_manage.GetMtjhMappingItemByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取煤炭数据失败"
-		br.ErrMsg = "获取煤炭度数据失败,Err:" + err.Error()
-		return
-	}
-	items, err := data_manage.GetMtjhIndexData(indexCode, startSize, pageSize)
-	if err != nil {
-		br.Msg = "获取煤炭数据失败"
-		br.ErrMsg = "获取煤炭度数据失败,Err:" + err.Error()
-		return
-	}
-
-	modifyTime, err := data_manage.GetMtjhIndexLatestDate(indexCode)
-	if err != nil {
-		br.Msg = "获取更新时间失败"
-		br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
-		return
-	}
-
-	total, err := data_manage.GetMtjhIndexDataCount(indexCode)
-	if err != nil {
-		br.Msg = "获取总数失败"
-		br.ErrMsg = "获取总数失败,Err:" + err.Error()
-		return
-	}
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := data_manage.BaseFromMtjhIndexList{
-		BaseFromMtjhMappingId: mapping.BaseFromMtjhMappingId,
-		IndexName:             mapping.IndexName,
-		IndexCode:             mapping.IndexCode,
-		Area:                  mapping.Area,
-		Port:                  mapping.Port,
-		Unit:                  mapping.Unit,
-		Frequency:             mapping.Frequency,
-		CreateTime:            mapping.CreateTime,
-		ModifyTime:            modifyTime,
-		Variety:               mapping.Variety,
-		DataList:              items,
-		Paging:                page,
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-	return
-}
-
-// MtjhFrequency
-// @title	获取煤炭江湖频度
-// @Description	获取煤炭江湖频度
-// @Param	ClassifyId query int true	"数据id"
-// @Success 200 {object} models.
-// @router /data/mtjh/frequency [get]
-func (this *TradeCommonController) MtjhFrequency() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	area := this.GetString("Area")
-
-	list, err := data_manage.GetMtjhFrequencyByArea(area)
-	if err != nil {
-		br.Msg = "获取煤炭频度数据失败"
-		br.ErrMsg = "获取煤炭频度数据失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// ExportCoalList
-// @Title 导出煤炭江湖数据
-// @Description 导出煤炭江湖数据
-// @Param	ClassifyId query int true	"数据id"
-// @Param   IndexName   query   string  true       "名称关键词"
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Param   TypeName   query   string  true       "分类"
-// @Param   Frequency   query   string  false       "频度"
-// @Param   UnitName   query   string  false       "单位"
-// @Success 200  导出成功
-// @router /export/mtjh [get]
-func (this *TradeCommonController) ExportMtjhList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	area := this.GetString("Area")
-	indexCode := this.GetString("IndexCode") //指标唯一编码
-
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	//不为空就是导出分类表
-	if indexCode == "" {
-		//获取指标
-		var secNameList []*string
-		var err error
-
-		secNameList, err = data_manage.GetClassifyMtjhByArea(area)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-
-		if len(secNameList) <= 0 {
-			fmt.Println("secNameList长度为0")
-			return
-		}
-		sheetNew, err := xlsxFile.AddSheet(area)
-
-		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()
-		//获取分类下指标最大数据量
-		var dataMax int
-
-		dataMax, err = data_manage.GetCoalMtjhMaxCount(area)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-
-		setRowIndex := 6
-		for k, sv := range secNameList {
-			//获取数据
-			dataList, err := data_manage.GetBaseFromMtjhIndexByCode(*sv)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			windRow.AddCell().SetValue(area)
-			secNameRow.AddCell().SetValue("指标名称")
-			indexCodeRow.AddCell().SetValue("指标ID")
-			frequencyRow.AddCell().SetValue("频率")
-			unitRow.AddCell().SetValue("单位")
-			lastModifyDateRow.AddCell().SetValue("更新时间")
-
-			secNameRow.AddCell().SetValue(dataList[0].IndexName)
-			indexCodeRow.AddCell().SetValue(dataList[0].IndexCode)
-			frequencyRow.AddCell().SetValue(dataList[0].Frequency)
-			unitRow.AddCell().SetValue(dataList[0].Unit)
-			lastModifyDateRow.AddCell().SetValue(dataList[0].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.DealValue)
-					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 {
-		sheet, err := xlsxFile.AddSheet("指标")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		//获取数据
-		dataList, err := data_manage.GetBaseFromMtjhIndexByCode(indexCode)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-
-		mapping, err := data_manage.GetMtjhMappingItemByCode(indexCode)
-		if err != nil {
-			br.Msg = "获取煤炭数据失败"
-			br.ErrMsg = "获取煤炭度数据失败,Err:" + err.Error()
-			return
-		}
-		//获取指标数据
-		windRow := sheet.AddRow()
-		windRow.AddCell().SetValue("煤炭江湖")
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("指标名称")
-		cellSenName := rowSecName.AddCell()
-		cellSenName.SetValue(mapping.IndexName)
-		indexCodeRow := sheet.AddRow()
-		indexCodeRow.AddCell().SetValue("指标ID")
-		indexCodeRow.AddCell().SetValue(indexCode)
-
-		rowFrequency := sheet.AddRow()
-		celFrequency := rowFrequency.AddCell()
-		celFrequency.SetValue("频率")
-		rowFrequency.AddCell().SetValue(mapping.Frequency)
-
-		rowUnit := sheet.AddRow()
-		celUnit := rowUnit.AddCell()
-		celUnit.SetValue("单位")
-		cellUnit := rowUnit.AddCell()
-		cellUnit.SetValue(mapping.Unit)
-
-		rowModifyDate := sheet.AddRow()
-		rowModifyCell := rowModifyDate.AddCell()
-		rowModifyCell.SetValue("更新时间")
-		rowModifyCell = rowModifyDate.AddCell()
-		rowModifyCell.SetValue(dataList[len(dataList)-1].ModifyTime)
-
-		fmt.Println("len(dataList):", len(dataList))
-		dataMax, err := data_manage.GetMtjhCount(indexCode)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-		fmt.Println("dataMax:", dataMax)
-		if len(dataList) <= 0 {
-			for n := 0; n < dataMax; n++ {
-				rowIndex := 6 + n
-				row := sheet.Row(rowIndex)
-				row.AddCell()
-				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.DealValue)
-				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)
-	if err != nil {
-		br.Msg = "保存文件失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := `煤炭江湖数据`
-	if len(secNameList) > 0 {
-		fileName = secNameList[0].ClassifyName
-	}
-	fileName += time.Now().Format(utils.FormatDateUnSpace) + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}

+ 0 - 1138
controllers/data_manage/baiinfo_data.go

@@ -1,1138 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_manage/request"
-	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// @Title 百川盈孚数据分类
-// @Description 百川盈孚数据分类接口
-// @Success 200 {object} data_manage.BaiinfoClassify
-// @router /baiinfo/classify [get]
-func (this *EdbInfoController) BaiinfoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	rootList, err := data_manage.GetBaseFromBaiinfoClassifyByParentId(0)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	classifyAll, err := data_manage.GetAllBaseFromBaiinfoClassify()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	baseFromBaiinfoIndexMap := make(map[int][]*data_manage.BaseFromBaiinfoClassifyItems)
-
-	allBaseFromBaiinfoIndex, err := data_manage.GetBaiinfoIndexAll()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	for _, v := range allBaseFromBaiinfoIndex {
-		baseFromBaiinfoIndexMap[v.ClassifyId] = append(baseFromBaiinfoIndexMap[v.ClassifyId], v)
-	}
-
-	rootChildMap := make(map[int][]*data_manage.BaseFromBaiinfoClassifyItems)
-	for _, v := range classifyAll {
-		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		if existItems, ok := baseFromBaiinfoIndexMap[v.ClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromBaiinfoClassifyItems, 0)
-			v.Children = items
-		}
-	}
-	var ret data_manage.BaseFromBaiinfoClassifyResp
-	nodeAll := make([]*data_manage.BaseFromBaiinfoClassifyItems, 0)
-	for _, v := range rootList {
-		if existItems, ok := rootChildMap[v.ClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromBaiinfoClassifyItems, 0)
-			v.Children = items
-		}
-		nodeAll = append(nodeAll, v)
-	}
-
-	//查询未分类的指标列表
-	initClassify := &data_manage.BaseFromBaiinfoClassifyItems{
-		ClassifyId:             0,
-		BaseFromBaiinfoIndexId: 0,
-		ClassifyName:           "未分类",
-		ClassifyNameEn:         "Unclassified",
-		ParentId:               0,
-		Level:                  1,
-		Sort:                   0,
-		Children:               nil,
-	}
-	initIndexList, err := data_manage.GetBaseFromBaiinfoIndexByClassifyId(initClassify.ClassifyId)
-	if err != nil {
-		br.Msg = "获取未分类指标失败"
-		br.ErrMsg = "获取未分类指标失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range initIndexList {
-		tmp := &data_manage.BaseFromBaiinfoClassifyItems{
-			ClassifyId:               v.ClassifyId,
-			BaseFromBaiinfoIndexId:   v.BaseFromBaiinfoIndexId,
-			BaseFromBaiinfoIndexCode: v.IndexCode,
-			ClassifyName:             v.IndexName,
-			ParentId:                 0,
-			Level:                    0,
-			Sort:                     0,
-			Children:                 nil,
-		}
-		initClassify.Children = append(initClassify.Children, tmp)
-	}
-	finalList := make([]*data_manage.BaseFromBaiinfoClassifyItems, 0)
-	finalList = append(finalList, initClassify)
-	finalList = append(finalList, nodeAll...)
-	ret.List = finalList
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// BaiinfoClassifyName
-// @Title 百川盈孚数据分类名称查询
-// @Description 百川盈孚数据分类名称查询接口
-// @Success 200 {object} data_manage.BaiinfoClassify
-// @router /baiinfo/classify/name [get]
-func (this *EdbInfoController) BaiinfoClassifyName() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	rootList, err := data_manage.GetBaseFromBaiinfoClassifyByParentId(0)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	classifyAll, err := data_manage.GetAllBaseFromBaiinfoClassify()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	rootChildMap := make(map[int][]*data_manage.BaseFromBaiinfoClassifyNameItems)
-	for _, v := range classifyAll {
-		tmp := &data_manage.BaseFromBaiinfoClassifyNameItems{
-			ClassifyId:   v.ClassifyId,
-			ClassifyName: v.ClassifyName,
-			ParentId:     v.ParentId,
-			Children:     nil,
-		}
-		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], tmp)
-	}
-	var ret data_manage.BaseFromBaiinfoClassifyNameResp
-	nodeAll := make([]*data_manage.BaseFromBaiinfoClassifyNameItems, 0)
-	for _, v := range rootList {
-		tmp := &data_manage.BaseFromBaiinfoClassifyNameItems{
-			ClassifyId:   v.ClassifyId,
-			ClassifyName: v.ClassifyName,
-			ParentId:     v.ParentId,
-			Children:     nil,
-		}
-		if existItems, ok := rootChildMap[v.ClassifyId]; ok {
-			tmp.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromBaiinfoClassifyNameItems, 0)
-			tmp.Children = items
-		}
-		nodeAll = append(nodeAll, tmp)
-	}
-
-	ret.List = nodeAll
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// AddBaiinfoClassify
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddBaseFromBaiinfoClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /baiinfo/classify/add [post]
-func (this *EdbInfoController) AddBaiinfoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromBaiinfoClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		br.IsSendEmail = false
-		return
-	}
-	req.ClassifyName = utils.TrimStr(req.ClassifyName)
-	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
-
-	//添加指标
-	baiinfoClassifyInfo, err, errMsg := data.AddBaiinfoClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	// 如果是添加一级分类,那么默认加上 价格、供应、需求、库存 四个二级分类
-	if baiinfoClassifyInfo.ParentId == 0 {
-		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
-		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddBaiinfoClassify(v, baiinfoClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
-			if tmpErrMsg != `` {
-				go alarm_msg.SendAlarmMsg("SCI原始数据-添加一级分类时,默认添加二级分类失败,一级分类名称:"+req.ClassifyName+",二级分类名称:"+v+", Err:"+tmpErrMsg, 3)
-				return
-			}
-		}
-	}
-	resp := data_manage.AddBaiinfoClassifyResp{
-		ClassifyId: baiinfoClassifyInfo.ClassifyId,
-		//UniqueCode:                        fmt.Sprint(BaiinfoClassifyInfo.BaseFromBaiinfoClassifyId),
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// EditBaiinfoClassify
-// @Title 修改分类
-// @Description 修改分类接口
-// @Param	request	body data_manage.EditBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
-// @router /baiinfo/classify/edit [post]
-func (this *EdbInfoController) EditBaiinfoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromBaiinfoClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.EditBaiinfoClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// @Title 百川盈孚数据频度
-// @Description 百川盈孚数据频度接口
-// @Param   ClassifyId   query   string  true       "分类Id"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /baiinfo/frequency [get]
-func (this *EdbInfoController) BaiinfoFrequency() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	frequencyList, err := data_manage.GetBaiinfoFrequencyByClassifyId(classifyId)
-	if err != nil {
-		br.Msg = "获取频度失败"
-		br.ErrMsg = "获取频度失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// MoveBaiinfoClassify
-// @Title 分类移动接口
-// @Description 分类移动接口
-// @Success 200 {object} data_manage.MoveBaseFromMysteelChemicalClassifyReq
-// @router /baiinfo/classify/move [post]
-func (this *EdbInfoController) MoveBaiinfoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.MoveBaseFromBaiinfoClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveBaiinfoClassify(req.ClassifyId, req.ParentId, req.PrevClassifyId, req.NextClassifyId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// DeleteBaiinfoClassify
-// @Title 删除分类
-// @Description 删除分类接口
-// @Param	request	body data_manage.DelBaseFromBaiinfoClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /baiinfo/classify/del [post]
-func (this *EdbInfoController) DeleteBaiinfoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromBaiinfoClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelBaiinfoClassify(req.ClassifyId, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// MoveBaiinfoData
-// @Title SCI指标移动接口
-// @Description SCI指标移动接口
-// @Success 200 {object} data_manage.MoveBaseFromBaiinfoReq
-// @router /baiinfo/move [post]
-func (this *EdbInfoController) MoveBaiinfoData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.MoveBaseFromBaiinfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromBaiinfoIndexId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "指标id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveBaiinfoData2(req.BaseFromBaiinfoIndexId, req.ClassifyId, req.PrevBaseFromBaiinfoIndexId, req.NextBaseFromBaiinfoIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// EditBaiinfo
-// @Title 编辑百川盈孚指标
-// @Description 编辑百川盈孚指标接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /baiinfo/edit [post]
-func (this *EdbInfoController) EditBaiinfo() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromBaiinfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.BaseFromBaiinfoIndexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-	if req.ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	//百川数据可能没有频度和单位
-	//if req.Frequency == "" {
-	//	br.Msg = "请输入频度名称"
-	//	br.IsSendEmail = false
-	//	return
-	//}
-	//
-	//if req.Unit == "" {
-	//	br.Msg = "请输入单位名称"
-	//	br.IsSendEmail = false
-	//	return
-	//}
-
-	//编辑指标
-	baiinfoIndexInfo, err, errMsg := data.EditBaiinfoIndex(req.BaseFromBaiinfoIndexId, req.ClassifyId, req.Frequency, req.Unit, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	resp := data_manage.EditBaiinfoIndexInfoResp{
-		BaseFromBaiinfoIndexId: baiinfoIndexInfo.BaseFromBaiinfoIndexId,
-		IndexCode:              baiinfoIndexInfo.IndexCode,
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// @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 /baiinfo/data [get]
-func (this *EdbInfoController) BaiinfoData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-	frequency := this.GetString("Frequency")
-	//if frequency == "" {
-	//	br.Msg = "请选择频度"
-	//	br.ErrMsg = "请选择频度"
-	//	return
-	//}
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, classifyId)
-	}
-
-	if frequency != "" {
-		condition += ` AND frequency=? `
-		pars = append(pars, frequency)
-	}
-
-	baiinfoList, err := data_manage.GetBaiinfoIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_manage.BaiinfoIndexList, 0)
-	for _, v := range baiinfoList {
-		product := new(data_manage.BaiinfoIndexList)
-		product.BaseFromBaiinfoIndexId = v.BaseFromBaiinfoIndexId
-		product.Unit = v.Unit
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.ModifyTime = v.ModifyTime
-
-		total, err := data_manage.GetBaiinfoIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, err := data_manage.GetBaiinfoIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.BaiinfoIndexData, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// BaiinfoSearchList
-// @Title SCI模糊搜索
-// @Description SCI模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /baiinfo/search_list [get]
-func (this *EdbInfoController) BaiinfoSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	//关键字
-	keyword := this.GetString("Keyword")
-
-	list, err := data_manage.GetBaiinfoItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// BaiinfoSingleData
-// @Title 获取Baiinfo数据
-// @Description 获取baiinfo单条数据接口
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /baiinfo/single_data [get]
-func (this *EdbInfoController) BaiinfoSingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	indexCode := this.GetString("IndexCode")
-	indexInfo, err := data_manage.GetBaseFromBaiinfoIndexByIndexCode(indexCode)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	dataList, err := data_manage.GetBaiinfoIndexDataByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	var ret data_manage.BaiinfoSingleDataResp
-	ret.ClassifyId = indexInfo.ClassifyId
-	ret.BaseFromBaiinfoIndexId = indexInfo.BaseFromBaiinfoIndexId
-	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
-	ret.Data = dataList
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// DeleteBaiinfoData
-// @Title 删除指标
-// @Description 删除指标接口
-// @Param	request	body data_manage.DelBaseFromBaiinfoReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /baiinfo/del [post]
-func (this *EdbInfoController) DeleteBaiinfoData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromBaiinfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromBaiinfoIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelBaiinfoData(req.BaseFromBaiinfoIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ResetBaiinfoData
-// @Title 指标数据清除分类
-// @Description 指标数据清除分类
-// @Param	request	body data_manage.DelBaseFromBaiinfoReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /baiinfo/reset [post]
-func (this *EdbInfoController) ResetBaiinfoData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromBaiinfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromBaiinfoIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.ResetBaiinfoData(req.BaseFromBaiinfoIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "操作成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ExportBaiinfoList
-// @Title 导出Baiinfo数据
-// @Description 导出Baiinfo数据
-// @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/baiinfoList [get]
-func (this *EdbInfoController) ExportBaiinfoList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	//typeName := this.GetString("TypeName") //分类
-	//frequency := this.GetString("Frequency")
-
-	indexCode := this.GetString("IndexCode") //指标唯一编码
-	classifyId, _ := this.GetInt("ClassifyId")
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	if classifyId >= 0 && indexCode == "" {
-
-		frequencies, err := data_manage.GetBaiinfoFrequency(classifyId)
-		if err != nil {
-			fmt.Println("GetBaiinfoFrequency err:", err.Error())
-			utils.FileLog.Info("GetBaiinfoFrequency err:" + err.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.GetBaiinfoIndex(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.GetBaiinfoDataMaxCount(classifyId)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			fmt.Println("dataMax:", dataMax)
-			setRowIndex := 6
-			for k, sv := range secNameList {
-				//获取数据
-				dataList, err := data_manage.GetBaiinfoIndexDataByCode(sv.IndexCode)
-				if err != nil {
-					br.Msg = "获取数据失败"
-					br.ErrMsg = "获取数据失败,Err:" + err.Error()
-					return
-				}
-				if len(dataList) > 0 {
-					windRow.AddCell().SetValue("Baiinfo")
-					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.GetBaiinfoFrequencyByCode(indexCode)
-		if err != nil {
-			fmt.Println("GetBaiinfoFrequencyByCode err:", err.Error())
-			utils.FileLog.Info("GetBaiinfoFrequencyByCode err:" + err.Error())
-			return
-		}
-		for _, frequency := range frequencies {
-			//获取数据
-			dataList, err := data_manage.GetBaiinfoIndexDataByCode(indexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			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
-				}
-				//获取指标数据
-				windRow := sheet.AddRow()
-				windRow.AddCell().SetValue("Baiinfo")
-				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.GetBaiinfoIndexDataCount(indexCode)
-				if err != nil {
-					br.Msg = "查询数量失败"
-					br.ErrMsg = "GetBaiinfoIndexDataCount,Err:" + err.Error()
-					return
-				}
-				if len(dataList) <= 0 {
-					for n := 0; n < dataMax; n++ {
-						rowIndex := 6 + n
-						row := sheet.Row(rowIndex)
-						row.AddCell()
-						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)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `Baiinfo数据`
-	if len(secNameList) > 0 {
-		fileName = secNameList[0].ClassifyName
-	}
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}

+ 0 - 58
controllers/data_manage/base_from_changes_visitors_covid.go

@@ -1,58 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/controllers"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-)
-
-// 谷歌出行数据
-type BaseFromChangesVisitorsCovidController struct {
-	controllers.BaseAuthController
-}
-
-// @Title 获取最新日期
-// @Description 获取最新日期接口
-// @Success 200
-// @router /visitors_covid/last_date [get]
-func (this *BaseFromChangesVisitorsCovidController) VisitorsCovidLastDate() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	lastDate, err := data_manage.GetVisitorsCovidLastDate()
-	if err != nil {
-		br.Msg = "获取最新日期失败"
-		br.ErrMsg = "获取最新日期失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = lastDate
-}
-
-// @Title 获取最新日期
-// @Description 获取最新日期接口
-// @Param   Day   query   string  false       "日期"
-// @Success 200
-// @router /visitors_covid/list [get]
-func (this *BaseFromChangesVisitorsCovidController) VisitorsCovidList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	day := this.GetString("Day")
-	list, err := data_manage.GetVisitorsCovidList(day)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}

+ 0 - 599
controllers/data_manage/ccf_data.go

@@ -1,599 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// CCFClassify
-// @Title CCF化纤分类
-// @Description CCF化纤分类接口
-// @Success 200 {object} data_manage.BaseFromCCFClassifyItem
-// @router /ccf/classify [get]
-func (this *EdbInfoController) CCFClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	classifies, e := data_manage.GetBaseFromCCFClassify()
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取CCF化纤分类失败, Err: " + e.Error()
-		return
-	}
-
-	classifyOb := new(data_manage.BaseFromCCFClassify)
-	resp := make([]*data_manage.BaseFromCCFClassifyItem, 0)
-	parentMap := make(map[int][]*data_manage.BaseFromCCFClassifyItem)
-	for _, v := range classifies {
-		t := classifyOb.Format2Item(v)
-		if v.ParentId == 0 {
-			resp = append(resp, t)
-		}
-		if v.ParentId > 0 {
-			if parentMap[v.ParentId] == nil {
-				parentMap[v.ParentId] = make([]*data_manage.BaseFromCCFClassifyItem, 0)
-			}
-			parentMap[v.ParentId] = append(parentMap[v.ParentId], t)
-		}
-	}
-	for _, v := range resp {
-		v.Child = parentMap[v.ClassifyId]
-	}
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// CCFIndexData
-// @Title 获取CCF化纤数据
-// @Description 获取CCF化纤接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Param   ClassifyId   query   string  true       "分类id"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /ccf/index/data [get]
-func (this *EdbInfoController) CCFIndexData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	// 获取指标
-	var condition string
-	var pars []interface{}
-	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, classifyId)
-	}
-
-	indexes, err := data_manage.GetCCFIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	indexCodes := make([]string, 0)
-	for _, v := range indexes {
-		indexCodes = append(indexCodes, v.IndexCode)
-	}
-	indexCounts, e := data_manage.GetCCFIndexDataCountGroup(indexCodes)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标数据总量失败, Err:" + err.Error()
-		return
-	}
-	countMap := make(map[string]int)
-	for _, v := range indexCounts {
-		countMap[v.IndexCode] = v.Count
-	}
-
-	resultList := make([]*data_manage.BaseFromCCFIndexList, 0)
-	for _, v := range indexes {
-		product := new(data_manage.BaseFromCCFIndexList)
-		product.BaseFromCcfIndexId = v.BaseFromCcfIndexId
-		product.ClassifyId = v.ClassifyId
-		product.Unit = v.Unit
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.CreateTime = v.CreateTime
-		product.ModifyTime = v.ModifyTime
-
-		total := countMap[v.IndexCode]
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, e := data_manage.GetCCFIndexData(v.IndexCode, startSize, pageSize)
-		if e != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + e.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.BaseFromCCFData, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// CCFSearchList
-// @Title CCF模糊搜索
-// @Description CCF模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} data_manage.BaseFromCCFIndexSearchItem
-// @router /ccf/search_list [get]
-func (this *EdbInfoController) CCFSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	list := make([]*data_manage.BaseFromCCFIndexSearchItem, 0)
-	var err error
-	// 关键字
-	keyword := this.GetString("Keyword")
-	if keyword != "" {
-		keyWordArr := strings.Split(keyword, " ")
-
-		if len(keyWordArr) > 0 {
-			condition := ""
-			for _, v := range keyWordArr {
-				condition += ` AND CONCAT(index_name,index_code) LIKE '%` + v + `%'`
-			}
-			list, err = data_manage.GetCCFItemList(condition)
-			if err != nil {
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				br.Msg = "获取失败"
-				return
-			}
-		}
-	} else {
-		list, err = data_manage.GetCCFItemList("")
-		if err != nil {
-			br.ErrMsg = "获取失败,Err:" + err.Error()
-			br.Msg = "获取失败"
-			return
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// CCFSingleData
-// @Title 获取CCF数据
-// @Description 获取CCF单条数据接口
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /ccf/single_data [get]
-func (this *EdbInfoController) CCFSingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	indexCode := this.GetString("IndexCode")
-	indexInfo, err := data_manage.GetBaseFromCCFIndexByIndexCode(indexCode)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	dataTmpList, err := data_manage.GetCCFIndexDataByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	var ret data_manage.CCFSingleDataResp
-	var dataList []*data_manage.CCFSingleData
-
-	ret.ClassifyId = indexInfo.ClassifyId
-	ret.BaseFromCcfIndexId = indexInfo.BaseFromCcfIndexId
-	ret.IndexCode = indexInfo.IndexCode
-	ret.IndexName = indexInfo.IndexName
-	ret.Frequency = indexInfo.Frequency
-	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.CCFSingleData{
-			Value:    v.Value,
-			DataTime: v.DataTime,
-		}
-		dataList = append(dataList, tmp)
-	}
-	ret.Data = dataList
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// ExportCCFList
-// @Title 导出CCF数据
-// @Description 导出CCF数据
-// @Param   IndexName   query   string  false       "名称关键词"
-// @Param   IndexCode   query   string  false       "指标唯一编码"
-// @Param   ClassifyId   query   string  true       "分类"
-// @Success 200  导出成功
-// @router /ccf/export [get]
-func (this *EdbInfoController) ExportCCFList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	indexCode := this.GetString("IndexCode") //指标唯一编码
-	classifyId, _ := this.GetInt("ClassifyId")
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downFile := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	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.GetCCFIndex(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)
-	sheetNew, err = xlsxFile.AddSheet("CCF化纤")
-
-	//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.BaseFromCCFData)
-	if len(indexList) > 0 {
-		allDataList, e := data_manage.GetCCFIndexDataByCodes(indexCodeList)
-		if e != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + e.Error()
-			return
-		}
-		for _, v := range allDataList {
-			dataListMap[v.IndexCode] = append(dataListMap[v.IndexCode], v)
-		}
-		for _, v := range dataListMap {
-			if len(v) > dataMax {
-				dataMax = len(v)
-			}
-		}
-	}
-
-	for k, sv := range indexList {
-		//获取数据
-		dataList, ok := dataListMap[sv.IndexCode]
-		if !ok {
-			continue
-		}
-		if len(dataList) > 0 {
-			windRow.AddCell().SetValue("CCF化纤")
-			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()
-			minCol := k * 3
-			sheetNew.SetColWidth(minCol, minCol, 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()
-					}
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downFile)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downFile)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `CCF化纤信息`
-	//if len(indexList) > 0 {
-	//	fileName = indexList[0].IndexName
-	//}
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downFile, fileName)
-	defer func() {
-		os.Remove(downFile)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}
-
-// CCFStockClassify
-// @Title CCF化纤信息-装置分类
-// @Description CCF化纤信息-装置分类
-// @Success 200 {object} data_manage.CCFStockClassify
-// @router /ccf/stock/classify [get]
-func (this *EdbInfoController) CCFStockClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	classifyOb := new(data_manage.CCFStockClassify)
-	items, e := classifyOb.GetItemsByCondition(``, make([]interface{}, 0), []string{}, "ccf_stock_classify_id ASC")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取CCF化纤分类列表失败, Err: " + e.Error()
-		return
-	}
-	resp := make([]*data_manage.CCFStockClassifyItem, 0)
-	for _, v := range items {
-		resp = append(resp, v.Format2Item())
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// CCFStockTable
-// @Title CCF化纤信息-装置表格详情
-// @Description CCF化纤信息-装置表格详情
-// @Param   ClassifyId   query   int  true       "分类ID"
-// @Param   TableDate   query   string  false       "表格日期"
-// @Success 200 {object} data_manage.CCFStockExcel
-// @router /ccf/stock/table [get]
-func (this *EdbInfoController) CCFStockTable() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	classifyId, _ := this.GetInt("ClassifyId", 0)
-	tableDate := this.GetString("TableDate")
-	if tableDate != "" {
-		_, e := time.ParseInLocation(utils.FormatDate, tableDate, time.Local)
-		if e != nil {
-			br.Msg = "日期格式有误"
-			return
-		}
-	}
-
-	excelOb := new(data_manage.CCFStockExcel)
-	cond := ``
-	pars := make([]interface{}, 0)
-	if classifyId > 0 {
-		cond += fmt.Sprintf(` AND %s = ?`, excelOb.Cols().ClassifyId)
-		pars = append(pars, classifyId)
-	}
-	if tableDate != "" {
-		cond += fmt.Sprintf(` AND %s = ?`, excelOb.Cols().ExcelDate)
-		pars = append(pars, tableDate)
-	}
-
-	// 若无tableDate默认取最近的有数据的表格
-	item, e := excelOb.GetItemByCondition(cond, pars, fmt.Sprintf("%s DESC", excelOb.Cols().ExcelDate))
-	if e != nil {
-		if utils.IsErrNoRow(e) {
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "该日期暂无数据"
-			br.Data = data_manage.CCFStockExcel{}
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取CCF化纤装置表格失败, Err: " + e.Error()
-		return
-	}
-	resp := item.Format2Item()
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

+ 0 - 276
controllers/data_manage/edb_info.go

@@ -1334,51 +1334,6 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.Unit = glInfo.Unit
 				searchItem.EdbName = glInfo.IndexName
 			}
-		} else if source == utils.DATA_SOURCE_EIA_STEO { //eia steo报告
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
-				return
-			}
-
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				item, err := data_manage.GetEdbInfoMaxAndMinInfo(source, subSource, edbCode)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取eia steo日期信息失败,Err:" + err.Error()
-					return
-				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = item.MinDate
-				searchItem.EndDate = item.MaxDate
-			} else {
-				respItem, err := data.AddEdbData(source, edbCode, frequency)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-				if respItem.Ret != 200 {
-					br.Msg = "未搜索到该指标"
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
-				}
-				isAdd = true
-			}
-			//获取指标信息
-			eiasteoInfo, err := data_manage.GetBaseFromEiaSteoIndexByCode(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
-				return
-			}
-			if eiasteoInfo != nil {
-				searchItem.Frequency = eiasteoInfo.Frequency
-				searchItem.Unit = eiasteoInfo.Unit
-				searchItem.EdbName = eiasteoInfo.IndexName
-			}
 		} else if source == utils.DATA_SOURCE_COM_TRADE { // un数据源
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
 			if err != nil && !utils.IsErrNoRow(err) {
@@ -1433,171 +1388,6 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				}
 				searchItem.EdbName = eiasteoInfo.Name
 			}
-		} else if source == utils.DATA_SOURCE_SCI { //卓创数据(红桃三)
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取SCI已存在信息失败,Err:" + err.Error()
-				return
-			}
-
-			fmt.Println("dataItems:", len(dataItems))
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				minDate, maxDate, err := data_manage.GetEdbDataSciMaxAndMinDate(edbCode)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取SCI日期信息失败,Err:" + err.Error()
-					return
-				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = minDate
-				searchItem.EndDate = maxDate
-			} else {
-				//endDate := dateNow.AddDate(utils.DATA_END_DATE_LIMIT, 0, 0).Format(utils.FormatDate)
-				//searchItem, err = data_manage.GetEdbDataByYs(edbCode, startDate, endDate)
-				//if err != nil {
-				//	br.Msg = "获取失败"
-				//	br.ErrMsg = "获取失败,GetEdbDataByYs Err:" + err.Error()
-				//	return
-				//}
-				//if searchItem.StartDate == "" {
-				//	minDate, maxDate, _ := data_manage.GetEdbDataYsMaxAndMinDate(edbCode)
-				//	searchItem.StartDate = minDate
-				//	searchItem.EndDate = maxDate
-				//}
-				respItem, err := data.AddEdbData(source, edbCode, frequency)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-				if respItem.Ret != 200 {
-					br.Msg = "未搜索到该指标"
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
-				}
-				isAdd = true
-			}
-
-			//获取指标信息
-			smmInfo, err := data_manage.GetBaseFromSciIndexByIndexCode(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取Sci指标详情失败,Err:" + err.Error()
-				return
-			}
-			if smmInfo != nil {
-				searchItem.Frequency = smmInfo.Frequency
-				searchItem.Unit = smmInfo.Unit
-				searchItem.EdbName = smmInfo.IndexName
-			}
-
-		} else if source == utils.DATA_SOURCE_BAIINFO { //百川盈孚
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取BAIINFO已存在信息失败,Err:" + err.Error()
-				return
-			}
-
-			fmt.Println("dataItems:", len(dataItems))
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				minDate, maxDate, err := data_manage.GetEdbDataBaiinfoMaxAndMinDate(edbCode)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取BAIINFO日期信息失败,Err:" + err.Error()
-					return
-				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = minDate
-				searchItem.EndDate = maxDate
-			} else {
-				//endDate := dateNow.AddDate(utils.DATA_END_DATE_LIMIT, 0, 0).Format(utils.FormatDate)
-				//searchItem, err = data_manage.GetEdbDataByYs(edbCode, startDate, endDate)
-				//if err != nil {
-				//	br.Msg = "获取失败"
-				//	br.ErrMsg = "获取失败,GetEdbDataByYs Err:" + err.Error()
-				//	return
-				//}
-				//if searchItem.StartDate == "" {
-				//	minDate, maxDate, _ := data_manage.GetEdbDataYsMaxAndMinDate(edbCode)
-				//	searchItem.StartDate = minDate
-				//	searchItem.EndDate = maxDate
-				//}
-				respItem, err := data.AddEdbData(source, edbCode, frequency)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-				if respItem.Ret != 200 {
-					br.Msg = "未搜索到该指标"
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
-				}
-				isAdd = true
-			}
-
-			//获取指标信息
-			baiInfo, err := data_manage.GetBaseFromBaiinfoIndexByIndexCode(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取Baiinfo指标详情失败,Err:" + err.Error()
-				return
-			}
-			if baiInfo != nil {
-				searchItem.Frequency = baiInfo.Frequency
-				searchItem.Unit = baiInfo.Unit
-				searchItem.EdbName = baiInfo.IndexName
-			}
-
-		} else if source == utils.DATA_SOURCE_NATIONAL_STATISTICS { // 国家统计局
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取国家统计局已存在信息失败,Err:" + err.Error()
-				return
-			}
-
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				item, err := data_manage.GetEdbInfoMaxAndMinInfo(source, subSource, edbCode)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取国家统计局日期信息失败,Err:" + err.Error()
-					return
-				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = item.MinDate
-				searchItem.EndDate = item.MaxDate
-			} else {
-				respItem, err := data.AddEdbData(source, edbCode, frequency)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-				if respItem.Ret != 200 {
-					br.Msg = "未搜索到该指标"
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
-				}
-				isAdd = true
-			}
-			//获取指标信息
-			nationalInfo, err := data_manage.GetBaseFromNationalStatisticsIndexByIndexCode(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取国家统计局详情失败,Err:" + err.Error()
-				return
-			}
-			if nationalInfo != nil {
-				searchItem.Frequency = nationalInfo.Frequency
-				searchItem.Unit = nationalInfo.Unit
-				searchItem.EdbName = fmt.Sprintf("%s%s", nationalInfo.Reg, nationalInfo.IndexName)
-			}
 		} else if source == utils.DATA_SOURCE_FUBAO { //数宝
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_FUBAO, subSource, utils.EDB_DATA_LIMIT)
 			if err != nil && !utils.IsErrNoRow(err) {
@@ -1803,52 +1593,6 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.Unit = "元/吨"
 				searchItem.EdbName = indexInfo.IndexName
 			}
-		} else if source == utils.DATA_SOURCE_SCI_HQ {
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取SCIHQ已存在信息失败,Err:" + err.Error()
-				return
-			}
-
-			fmt.Println("dataItems:", len(dataItems))
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				minDate, maxDate, err := data_manage.GetEdbDataSciHqMaxAndMinDate(edbCode)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取SCIHQ日期信息失败,Err:" + err.Error()
-					return
-				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = minDate
-				searchItem.EndDate = maxDate
-			} else {
-				respItem, err := data.AddEdbData(source, edbCode, frequency)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-				if respItem.Ret != 200 {
-					br.Msg = "未搜索到该指标"
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
-				}
-				isAdd = true
-			}
-			//获取指标信息
-			sciHqInfo, err := data_manage.GetSciHqIndexByIndexCode(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取SciHq指标详情失败,Err:" + err.Error()
-				return
-			}
-			if sciHqInfo != nil {
-				searchItem.Frequency = sciHqInfo.Frequency
-				searchItem.Unit = sciHqInfo.Unit
-				searchItem.EdbName = sciHqInfo.IndexName
-			}
 		} else if source == utils.DATA_SOURCE_OILCHEM { //隆众资讯
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
 			if err != nil && !utils.IsErrNoRow(err) {
@@ -1953,26 +1697,6 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.Frequency = baseIndexInfo.Frequency
 				searchItem.Unit = baseIndexInfo.Unit
 			}
-			// 指标来源于桥接服务: 桥接服务获取指标取频度信息等
-			if sourceItem.BridgeFlag != "" {
-				bridgeOb := data.InitBridgeOB(sourceItem.BridgeFlag)
-				if bridgeOb != nil {
-					var r data.GetIndexFromBridgeReq
-					r.IndexCode = edbCode
-					r.Source = sourceItem.EdbSourceId
-					r.SourceExtend = sourceItem.SourceExtend
-					r.IndexCodeRequired = sourceItem.EdbCodeRequired
-					bridgeIndex, e := bridgeOb.GetIndex(r)
-					if e != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "桥接服务获取指标信息失败, Err: " + e.Error()
-						return
-					}
-					searchItem.EdbName = bridgeIndex.IndexName
-					searchItem.Frequency = bridgeIndex.Frequency
-					searchItem.Unit = bridgeIndex.Unit
-				}
-			}
 		}
 		if isAdd {
 			if subSource == utils.DATA_SUB_SOURCE_DATE {

+ 0 - 291
controllers/data_manage/eia_steo.go

@@ -1,291 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// EiaSteoClassify
-// @Title EiaSteo数据分类
-// @Description EiaSteo数据分类接口
-// @Success 200 {object} data_manage.LzClassify
-// @router /eia_steo/classify [get]
-func (this *EdbInfoController) EiaSteoClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	classifyList, err := data_manage.GetEiaSteoClassifyList()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	for _, v := range classifyList {
-		if v.ClassifyName == `` {
-			v.ClassifyName = v.ClassifyNameOriginal
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyList
-}
-
-// EiaSteoData
-// @Title 获取EiaSteo数据
-// @Description 获取EiaSteo数据接口
-// @Param   BaseFromEiaSteoClassifyId   query   int  true       "指标分类id"
-// @Param   IndexCode   query   string  true       "指标code"
-// @Param   IsExport   query   bool  false       "是否导出excel,默认是false"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /eia_steo/data [get]
-func (this *EdbInfoController) EiaSteoData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-	//是否导出报表
-	isExport, _ := this.GetBool("IsExport")
-	if isExport {
-		pageSize = 10000
-		currentIndex = 1
-	}
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	var condition string
-	var pars []interface{}
-
-	indexCode := this.GetString("IndexCode")
-	if indexCode != "" {
-		condition += ` AND index_code = ? `
-		pars = append(pars, utils.TrimStr(indexCode))
-	}
-	classifyId, _ := this.GetInt("BaseFromEiaSteoClassifyId")
-	if classifyId > 0 {
-		condition += ` AND base_from_eia_steo_classify_id = ? `
-		pars = append(pars, classifyId)
-	}
-
-	//获取指标
-	indexList, err := data_manage.GetEiaSteoIndexList(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]data_manage.EiaSteoIndexListResp, 0)
-	for _, v := range indexList {
-
-		indexName := v.IndexName
-		if indexName == `` {
-			indexName = v.IndexNameOriginal
-		}
-		product := data_manage.EiaSteoIndexListResp{
-			BaseFromEiaSteoIndexId:    v.BaseFromEiaSteoIndexId,
-			BaseFromEiaSteoClassifyId: v.BaseFromEiaSteoClassifyId,
-			IndexCode:                 v.IndexCode,
-			IndexName:                 indexName,
-			//IndexNameOriginal:          v.IndexNameOriginal,
-			Unit:       v.Unit,
-			Frequency:  v.Frequency,
-			StartDate:  v.StartDate.Format(utils.FormatDate),
-			EndDate:    v.EndDate.Format(utils.FormatDate),
-			ModifyTime: v.ModifyTime.Format(utils.FormatDateTime),
-			CreateTime: v.CreateTime.Format(utils.FormatDateTime),
-			//Paging:     tmpPaging,
-			//DataList:   nil,
-		}
-
-		total, err := data_manage.GetEiaSteoIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-
-		dataList, err := data_manage.GetEiaSteoIndexDataList(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.BaseFromEiaSteoDataItem, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-
-	//导出excel
-	if isExport {
-		EiaSteoDataExport(this, resultList, br)
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// EiaSteoSearchList
-// @Title EiaSteo模糊搜索
-// @Description EiaSteo模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /eia_steo/search_list [get]
-func (this *EdbInfoController) EiaSteoSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	//关键字
-	keyword := this.GetString("Keyword")
-	list, err := data_manage.GetEiaSteoItemList(utils.TrimStr(keyword))
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// EiaSteoDataExport 表格导出
-func EiaSteoDataExport(this *EdbInfoController, list []data_manage.EiaSteoIndexListResp, br *models.BaseResponse) {
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	sheet, err := xlsxFile.AddSheet("数据报表")
-
-	//获取指标数据
-	rowSecName := sheet.AddRow()
-	celSecName := rowSecName.AddCell()
-	celSecName.SetValue("指标名称")
-	rowUnit := sheet.AddRow()
-	celUnit := rowUnit.AddCell()
-	celUnit.SetValue("单位")
-
-	rowModifyDate := sheet.AddRow()
-	rowModifyCell := rowModifyDate.AddCell()
-	rowModifyCell.SetValue("更新时间")
-
-	dataMap := make(map[string]map[string]*data_manage.BaseFromEiaSteoDataItem)
-	var indexCodeList []string
-	for _, v := range list {
-		cellSenName := rowSecName.AddCell()
-		cellSenName.SetValue(v.IndexName)
-		celUnit := rowUnit.AddCell()
-		celUnit.SetValue(v.Unit)
-		rowModifyCell := rowModifyDate.AddCell()
-		rowModifyCell.SetValue(v.ModifyTime)
-
-		indexCodeList = append(indexCodeList, v.IndexCode)
-
-		dataMap[v.IndexCode] = make(map[string]*data_manage.BaseFromEiaSteoDataItem)
-		for _, item := range v.DataList {
-			dataMap[item.IndexCode][item.DataTime] = item
-		}
-	}
-
-	dateList, err := data_manage.GetEiaSteoDateList(indexCodeList)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	for _, n := range dateList {
-		dateStr := n.DataTime //当前日期
-		rowData := sheet.AddRow()
-		celDate := rowData.AddCell()
-		celDate.SetValue(dateStr)
-
-		for _, m := range list {
-			celData := rowData.AddCell()
-			if dataMap[m.IndexCode][dateStr] != nil {
-				celData.SetValue(dataMap[m.IndexCode][dateStr].Value)
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadnFilePath)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `EiaSteo数据`
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}

+ 0 - 1026
controllers/data_manage/fenwei_data.go

@@ -1,1026 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// FenweiClassify
-// @Title 汾渭数据分类
-// @Description 汾渭数据分类接口
-// @Success 200 {object} data_manage.BaseFromFenweiClassifyItem
-// @router /fenwei/classify [get]
-func (this *EdbInfoController) FenweiClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	classifies, e := data_manage.GetBaseFromFenweiClassify()
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取汾渭数据分类失败, Err: " + e.Error()
-		return
-	}
-
-	classifyOb := new(data_manage.BaseFromFenweiClassify)
-	resp := make([]*data_manage.BaseFromFenweiClassifyItem, 0)
-	parentMap := make(map[int][]*data_manage.BaseFromFenweiClassifyItem)
-	for _, v := range classifies {
-		t := classifyOb.Format2Item(v)
-		if v.ParentId == 0 {
-			resp = append(resp, t)
-		}
-		if v.ParentId > 0 {
-			if parentMap[v.ParentId] == nil {
-				parentMap[v.ParentId] = make([]*data_manage.BaseFromFenweiClassifyItem, 0)
-			}
-			parentMap[v.ParentId] = append(parentMap[v.ParentId], t)
-		}
-	}
-	for _, v := range resp {
-		addChildren(v, parentMap)
-	}
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-func addChildren(parent *data_manage.BaseFromFenweiClassifyItem, parentMap map[int][]*data_manage.BaseFromFenweiClassifyItem) {
-	if children, ok := parentMap[parent.ClassifyId]; ok {
-		parent.Child = children
-		for _, child := range children {
-			addChildren(child, parentMap)
-		}
-	}
-}
-
-// FenweiIndexData
-// @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 /fenwei/index/data [get]
-func (this *EdbInfoController) FenweiIndexData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-	frequency := this.GetString("Frequency")
-
-	// 获取指标
-	var condition string
-	var pars []interface{}
-	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, classifyId)
-	}
-
-	if frequency != "" {
-		condition += ` AND frequency=? `
-		pars = append(pars, frequency)
-	}
-
-	indexes, err := data_manage.GetFenweiIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	indexCodes := make([]string, 0)
-	for _, v := range indexes {
-		indexCodes = append(indexCodes, v.IndexCode)
-	}
-	indexCounts, e := data_manage.GetFenweiIndexDataCountGroup(indexCodes)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标数据总量失败, Err:" + err.Error()
-		return
-	}
-	countMap := make(map[string]int)
-	for _, v := range indexCounts {
-		countMap[v.IndexCode] = v.Count
-	}
-
-	// 判断是否存在于指标库
-	edbCodeList, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_FENWEI, indexCodes)
-	if err != nil {
-		return
-	}
-	edbCodeMap := make(map[string]*data_manage.EdbInfo)
-	for _, v := range edbCodeList {
-		edbCodeMap[v.EdbCode] = v
-	}
-
-	resultList := make([]*data_manage.BaseFromFenweiIndexList, 0)
-	for _, v := range indexes {
-		product := new(data_manage.BaseFromFenweiIndexList)
-		product.FenweiIndexId = v.FenweiIndexId
-		product.ClassifyId = v.ClassifyId
-		product.Unit = v.Unit
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.CreateTime = v.CreateTime
-		product.ModifyTime = v.ModifyTime
-
-		edbInfo := edbCodeMap[v.IndexCode]
-		if edbInfo != nil {
-			product.EdbInfoId = edbInfo.EdbInfoId
-		}
-
-		total := countMap[v.IndexCode]
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, e := data_manage.GetFenweiIndexData(v.IndexCode, startSize, pageSize)
-		if e != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + e.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.BaseFromFenweiData, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// FenweiSearchList
-// @Title Fenwei模糊搜索
-// @Description Fenwei模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} data_manage.BaseFromFenweiIndexSearchItem
-// @router /fenwei/search_list [get]
-func (this *EdbInfoController) FenweiSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	list := make([]*data_manage.BaseFromFenweiIndexSearchItem, 0)
-	var err error
-	// 关键字
-	keyword := this.GetString("Keyword")
-	if keyword != "" {
-		keyWordArr := strings.Split(keyword, " ")
-
-		if len(keyWordArr) > 0 {
-			condition := ""
-			for _, v := range keyWordArr {
-				condition += ` AND CONCAT(index_name,index_code) LIKE '%` + v + `%'`
-			}
-			list, err = data_manage.GetFenweiItemList(condition)
-			if err != nil {
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				br.Msg = "获取失败"
-				return
-			}
-		}
-	} else {
-		list, err = data_manage.GetFenweiItemList("")
-		if err != nil {
-			br.ErrMsg = "获取失败,Err:" + err.Error()
-			br.Msg = "获取失败"
-			return
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// FenweiSingleData
-// @Title 获取Fenwei数据
-// @Description 获取Fenwei单条数据接口
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /fenwei/single_data [get]
-func (this *EdbInfoController) FenweiSingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	indexCode := this.GetString("IndexCode")
-	indexInfo, err := data_manage.GetBaseFromFenweiIndexByIndexCode(indexCode)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	dataTmpList, err := data_manage.GetFenweiIndexDataByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	indexCodeList := []string{indexCode}
-	edbCodeList, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_FENWEI, indexCodeList)
-	if err != nil {
-		return
-	}
-
-	var ret data_manage.FenweiSingleDataResp
-	var dataList []*data_manage.FenweiSingleData
-
-	ret.ClassifyId = indexInfo.ClassifyId
-	ret.FenweiIndexId = indexInfo.FenweiIndexId
-	ret.IndexCode = indexInfo.IndexCode
-	ret.IndexName = indexInfo.IndexName
-	ret.Frequency = indexInfo.Frequency
-	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.FenweiSingleData{
-			Value:    v.Value,
-			DataTime: v.DataTime,
-		}
-		dataList = append(dataList, tmp)
-	}
-	ret.Data = dataList
-	if len(edbCodeList) > 0 {
-		edbInfo := edbCodeList[0]
-		ret.EdbInfoId = edbInfo.EdbInfoId
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// ExportFenweiList
-// @Title 导出Fenwei数据
-// @Description 导出Fenwei数据
-// @Param   IndexName   query   string  false       "名称关键词"
-// @Param   IndexCode   query   string  false       "指标唯一编码"
-// @Param   ClassifyId   query   string  true       "分类"
-// @Success 200  导出成功
-// @router /fenwei/export [get]
-func (this *EdbInfoController) ExportFenweiList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	indexCode := this.GetString("IndexCode") //指标唯一编码
-	classifyId, _ := this.GetInt("ClassifyId")
-	//secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	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.GetFenweiIndex(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.BaseFromFenweiData)
-	if len(indexList) > 0 {
-		allDataList, e := data_manage.GetFenweiIndexDataByCodes(indexCodeList)
-		if e != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + e.Error()
-			return
-		}
-		for _, v := range allDataList {
-			dataListMap[v.IndexCode] = append(dataListMap[v.IndexCode], v)
-		}
-		for _, v := range dataListMap {
-			if len(v) > dataMax {
-				dataMax = len(v)
-			}
-		}
-	}
-
-	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()
-				}
-			} 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()
-					}
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadnFilePath)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `汾渭数据`
-	if len(indexList) > 0 {
-		fileName = indexList[0].IndexName
-	}
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}
-
-// GetFenWeiFrequencyList
-// @Title 查询频率列表
-// @Description 查询频率列表
-// @Param   classifyId   query  int  false   "指标唯一编码"
-// @Success 200 {object} []string
-// @router /fenwei/frequency/list [get]
-func (this *EdbInfoController) GetFenWeiFrequencyList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	classifyId, _ := this.GetInt("ClassifyId")
-
-	frequencyList, err := data_manage.GetFenWeiIndexFrequency(classifyId)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// FenWeiIndexAddValidate
-// @Title 新增加入到指标库校验
-// @Description 新增加入到指标库校验
-// @Param   req    body   data_manage.BaseFromFenWeiIndexBatchAddCheckReq     true        "请求参数"
-// @Success 200 {object} []data_manage.IndexCheckData
-// @router /fenwei/index/add/validate [post]
-func (this *EdbInfoController) FenWeiIndexAddValidate() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req *data_manage.BaseFromFenWeiIndexBatchAddCheckReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-
-	codeLen := len(req.IndexCodes)
-	var codeMax = 30
-	if codeLen > codeMax {
-		br.Msg = "批量添加指标数量不得超过" + strconv.Itoa(codeMax) + "个"
-		br.ErrMsg = "批量添加指标数量不得超过" + strconv.Itoa(codeMax) + "个"
-		return
-	}
-
-	// 校验指标编码是否存在
-	addValidate, err := data.FenWeiIndexAddValidate(req.IndexCodes)
-	if err != nil {
-		return
-	}
-	br.Data = addValidate
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "操作成功"
-}
-
-// FenWeiIndexAdd
-// @Title 指标添加到指标库
-// @Description 指标添加到指标库
-// @Param   req    body   []data_manage.AddEdbInfoReq     true        "请求参数"
-// @Success 200 string "操作成功"
-// @router /fenwei/index/add [post]
-func (this *EdbInfoController) FenWeiIndexAdd() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	deleteCache := true
-	cacheKey := "CACHE_EDB_INFO_BATCH_ADD_FENWEI_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			_ = utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中,请稍后重试!"
-		br.ErrMsg = "系统处理中,请稍后重试!" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-
-	var req []*data_manage.AddEdbInfoReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	codeMax := 30
-	if len(req) > codeMax {
-		br.Msg = "批量添加指标数量不得超过" + strconv.Itoa(codeMax) + "个"
-		return
-	}
-
-	indexNames := make([]string, 0)
-	resp := make([]*data_manage.FenWeiNameCheckResult, 0)
-	for _, index := range req {
-		index.EdbCode = strings.TrimSpace(index.EdbCode)
-		if index.EdbCode == "" {
-			br.Msg = "指标ID不可为空"
-			return
-		}
-		index.EdbName = strings.TrimSpace(index.EdbName)
-		if index.EdbName == "" {
-			br.Msg = "请输入指标名称"
-			return
-		}
-		index.Frequency = strings.TrimSpace(index.Frequency)
-		if index.Frequency == "" {
-			br.Msg = "请选择频度"
-			return
-		}
-		index.Unit = strings.TrimSpace(index.Unit)
-		if index.Unit == "" {
-			br.Msg = "请输入单位"
-			return
-		}
-		if index.ClassifyId <= 0 {
-			br.Msg = "请选择分类"
-			return
-		}
-		indexNames = append(indexNames, index.EdbName)
-		resp = append(resp, &data_manage.FenWeiNameCheckResult{
-			IndexCode: index.EdbCode,
-			IndexName: index.EdbName,
-			Exist:     false,
-		})
-	}
-
-	// 指标名称重复校验
-	nameCheck, err := data.FenWeiIndexNameCheck(indexNames, resp)
-	if err != nil {
-		br.Msg = err.Error()
-		br.ErrMsg = err.Error()
-		return
-	}
-	for _, v := range nameCheck {
-		if v.Exist {
-			br.Msg = "指标名称重复"
-			br.Data = nameCheck
-			br.Ret = 200
-			br.Success = true
-			return
-		}
-	}
-
-	for _, v := range req {
-		var fenWeiIndexAddReq data_manage.FenWeiIndexAddReq
-		fenWeiIndexAddReq.EdbCode = v.EdbCode
-		fenWeiIndexAddReq.EdbName = v.EdbName
-		fenWeiIndexAddReq.Frequency = v.Frequency
-		fenWeiIndexAddReq.Unit = v.Unit
-		fenWeiIndexAddReq.ClassifyId = v.ClassifyId
-		fenWeiIndexAddReq.AdminId = sysUser.AdminId
-		fenWeiIndexAddReq.AdminRealName = sysUser.RealName
-
-		// 新增指标到指标库
-		edbInfo, e, errMsg, skip := data.FenWeiIndexAdd(fenWeiIndexAddReq, this.Lang)
-		if e != nil {
-			br.Msg = "操作失败"
-			if errMsg != "" {
-				br.Msg = errMsg
-			}
-			br.ErrMsg = e.Error()
-			return
-		}
-		if skip {
-			continue
-		}
-
-		// 新增操作日志
-		{
-			edbLog := new(data_manage.EdbInfoLog)
-			edbLog.EdbInfoId = edbInfo.EdbInfoId
-			edbLog.SourceName = edbInfo.SourceName
-			edbLog.Source = edbInfo.Source
-			edbLog.EdbCode = edbInfo.EdbCode
-			edbLog.EdbName = edbInfo.EdbName
-			edbLog.ClassifyId = edbInfo.ClassifyId
-			edbLog.SysUserId = sysUser.AdminId
-			edbLog.SysUserRealName = sysUser.RealName
-			edbLog.CreateTime = time.Now()
-			edbLog.Content = string(this.Ctx.Input.RequestBody)
-			edbLog.Status = "新增指标"
-			edbLog.Method = this.Ctx.Input.URI()
-			go data_manage.AddEdbInfoLog(edbLog)
-		}
-	}
-
-	br.Msg = "操作成功"
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// FenWeiIndexDataExport
-// @Title 导出指标数据
-// @Description 导出指标数据
-// @Param  IndexCode     query   string     false        "指标编码"
-// @Param  ClassifyId     query   int     false        "分类ID"
-// @Success 200 string "操作成功"
-// @router /fenwei/index/data/export [get]
-func (this *EdbInfoController) FenWeiIndexDataExport() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	classifyId, _ := this.GetInt("ClassifyId") //分类
-	indexCode := this.GetString("IndexCode")   //指标唯一编码
-
-	if classifyId <= 0 {
-		br.Msg = "请选择分类"
-		return
-	}
-
-	//userId := sysUser.AdminId
-	//超管账号可以查看分类下的所有频度数据
-	/*if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
-		userId = 0
-	}*/
-	//获取账户所拥有权限的分类id集合
-	/*classifyIdStrList, err := data.GetEdbClassifyListByAdminId(int64(userId))
-	if err != nil {
-		br.Msg = "获取分类数据失败"
-		return
-	}*/
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-	frequencies, err := data_manage.GetFenWeiIndexFrequency(classifyId)
-	if err != nil {
-		br.Msg = "查询频度失败"
-		br.ErrMsg = "查询频度失败"
-		return
-	}
-
-	fileName := `汾渭网页数据`
-	if classifyId > 0 && indexCode == "" {
-		fenWeiClassify, err := data_manage.GetFenweiClassifyItemByClassifyId(classifyId)
-		if err != nil {
-			return
-		}
-		fileName = fenWeiClassify.ClassifyName
-	}
-	if frequencies == nil {
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-	}
-
-	for _, frequency := range frequencies {
-		fenWeiIndices, err := data_manage.GetFenWeiIndexByCodeAndClassify(indexCode, classifyId, frequency)
-		if err != nil {
-			return
-		}
-		var sheet *xlsx.Sheet
-		if len(fenWeiIndices) > 0 {
-			sheetName := *frequency
-			if sheetName == "" {
-				sheetName = "无频度"
-			}
-			sheet, err = xlsxFile.AddSheet(sheetName)
-			if err != nil {
-				br.Msg = "新增Sheet失败"
-				br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-				return
-			}
-		} else {
-			continue
-		}
-
-		if indexCode != "" {
-			fileName = fenWeiIndices[0].IndexName
-		}
-
-		//获取指标数据
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("指标名称")
-		rowFrequency := sheet.AddRow()
-		celFrequency := rowFrequency.AddCell()
-		celFrequency.SetValue("频率")
-		rowUnit := sheet.AddRow()
-		celUnit := rowUnit.AddCell()
-		celUnit.SetValue("单位")
-		rowModifyDate := sheet.AddRow()
-		rowModifyCell := rowModifyDate.AddCell()
-		rowModifyCell.SetValue("更新时间")
-
-		dataMap := make(map[string]map[string]*data_manage.BaseFromFenweiData)
-		var tradeCodeList []string
-		for _, v := range fenWeiIndices {
-			cellSenName := rowSecName.AddCell()
-			cellSenName.SetValue(v.IndexName)
-			celFrequency := rowFrequency.AddCell()
-			celFrequency.SetValue(v.Frequency)
-			celUnit := rowUnit.AddCell()
-			celUnit.SetValue(v.Unit)
-			rowModifyCell := rowModifyDate.AddCell()
-			updateTimeStr := utils.TimeToStr(v.ModifyTime, utils.FormatDate)
-			rowModifyCell.SetValue(updateTimeStr)
-			tradeCodeList = append(tradeCodeList, v.IndexCode)
-
-			var dataList []*data_manage.BaseFromFenweiData
-			dataList, err = data_manage.GetBaseFromFenWeiDataByIndexCode(v.IndexCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.ErrMsg = "GetBaseFromFenWeiDataByIndexCode,Err:" + err.Error()
-				br.Msg = "获取数据失败"
-				return
-			}
-			for _, item := range dataList {
-				if dataMap[item.IndexCode] == nil {
-					dataMap[item.IndexCode] = make(map[string]*data_manage.BaseFromFenweiData)
-				}
-				dataMap[item.IndexCode][item.DataTime] = item
-			}
-		}
-
-		tradeCodeStr := strings.Join(tradeCodeList, "','")
-		tradeCodeStr = "'" + tradeCodeStr + "'"
-		dataTimeList, err := data_manage.GetFenWeiDataListByIndexCodes(tradeCodeStr)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-		for _, dataTime := range dataTimeList {
-			rowData := sheet.AddRow()
-			celDate := rowData.AddCell()
-			celDate.SetValue(dataTime)
-
-			for _, m := range fenWeiIndices {
-				celData := rowData.AddCell()
-				if dataMap[m.IndexCode][dataTime] != nil {
-					celData.SetValue(dataMap[m.IndexCode][dataTime].Value)
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadFilePath)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}
-
-// GetFenWeiIndexInfo
-// @Title 添加指标-根据条件获取指标信息
-// @Description 添加指标-根据条件获取指标信息
-// @Param   KeyWord   query   string  false       "关键字"
-// @Param   ClassifyIds   query   string  false       "分类id"
-// @Param   Frequencies   query   string  false       "频率"
-// @Param   PageSize   query   int  false       "每页数据条数"
-// @Param   CurrentIndex   query   int  false       "当前页页码,从1开始"
-// @Success 200 {object} data_manage.BaseFromFenWeiIndexPage
-// @router /fenwei/get/index/info [get]
-func (this *EdbInfoController) GetFenWeiIndexInfo() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	/*pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}*/
-
-	keyWord := this.GetString("KeyWord")
-	classifyIds := this.GetString("ClassifyIds")
-	frequencies := this.GetString("Frequencies")
-
-	var classifyIdList []string
-	var frequencyList []string
-	if classifyIds != "" {
-		classifyIdList = strings.Split(classifyIds, ",")
-	}
-	if frequencies != "" {
-		frequencyList = strings.Split(frequencies, ",")
-	}
-	indexInfoList, err := data.GetFenWeiIndexInfo(keyWord, classifyIdList, frequencyList)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = indexInfoList
-}

+ 0 - 172
controllers/data_manage/jiayue_edb_source.go

@@ -1,172 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/controllers"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-// JiaYueEdbSourceController 嘉悦数据源
-type JiaYueEdbSourceController struct {
-	controllers.BaseAuthController
-}
-
-// List
-// @Title 数据源列表
-// @Description 数据源列表
-// @Success 200 string "获取成功"
-// @router /edb_source/jiayue/list [get]
-func (this *JiaYueEdbSourceController) List() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		return
-	}
-
-	cond := ` AND is_base = 1 AND from_bridge = 1`
-	pars := make([]interface{}, 0)
-	sources, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标来源失败, Err: "
-		return
-	}
-	br.Data = sources
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// FrequencyList
-// @Title 指标频度列表
-// @Description 指标频度列表
-// @Success 200 string "获取成功"
-// @router /edb_source/jiayue/frequency_list [get]
-func (this *JiaYueEdbSourceController) FrequencyList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		return
-	}
-
-	frequencies, e := data.GetJiaYueFrequencyListFromBridge()
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "桥接服务获取指标频度失败, Err: " + e.Error()
-		return
-	}
-	br.Data = frequencies
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// IndexPageList
-// @Title 指标列表-分页
-// @Description 指标列表-分页
-// @Param   PageSize  query  int  false  "每页数据条数"
-// @Param   CurrentIndex  query  int  false  "当前页码"
-// @Param   Source  query  int  true  "数据来源"
-// @Param   Frequency  query  string  false  "频度"
-// @Param   Keyword  query  string  false  "关键词: 指标ID/指标名称"
-// @Param   SortField  query  int  false  "排序字段: 1-指标开始时间; 2-指标最新时间; 3-更新时间"
-// @Param   SortRule  query  int  false  "排序方式: 1-正序; 2-倒序"
-// @Success 200 string "获取成功"
-// @router /edb_source/jiayue/index_page_list [get]
-func (this *JiaYueEdbSourceController) IndexPageList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		return
-	}
-	source, _ := this.GetInt("Source")
-	frequency := this.GetString("Frequency")
-	keyword := this.GetString("Keyword")
-	sortField, _ := this.GetInt("SortField")
-	sortRule, _ := this.GetInt("SortRule")
-
-	if source <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, Source: %d", source)
-		return
-	}
-	cond := ` AND edb_source_id = ?`
-	pars := make([]interface{}, 0)
-	pars = append(pars, source)
-	sourceItem, e := data_manage.GetEdbSourceItemByCondition(cond, pars)
-	if e != nil {
-		br.Msg = "数据源有误"
-		br.ErrMsg = "获取数据源失败, Err: " + e.Error()
-		return
-	}
-
-	// 分页
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	var params data_manage.BridgeJiaYuePageIndexReq
-	params.PageIndex = currentIndex
-	params.PageSize = pageSize
-	params.Keyword = keyword
-	params.Frequency = frequency
-	params.SourceExtend = sourceItem.SourceExtend
-	params.SortField = sortField
-	params.SortRule = sortRule
-	total, list, e := data.GetJiaYueIndexPageListFromBridge(params)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标分页列表失败, Err: " + e.Error()
-		return
-	}
-	items := make([]*data_manage.DictIndexItem, 0)
-	for _, v := range list {
-		t := data_manage.FormatDictIndex2Item(v)
-		items = append(items, t)
-	}
-
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(data_manage.JiaYueIndexPageListResp)
-	resp.Paging = page
-	resp.List = items
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}

+ 0 - 474
controllers/data_manage/national_statistics.go

@@ -1,474 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/controllers"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// BaseFromNationalStatisticsController 数据源-国家统计局
-type BaseFromNationalStatisticsController struct {
-	controllers.BaseAuthController
-}
-
-// DbList
-// @Title 数据库列表
-// @Description 数据库列表
-// @Success 200 Ret=200 获取成功
-// @router /base_from_national_statistics/db_list [get]
-func (this *BaseFromNationalStatisticsController) DbList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录, SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	type DbInfo struct {
-		Dbcode   string   `description:"数据库编码"`
-		Dbname   string   `description:"数据库名称"`
-		Sort     int      `description:"排序"`
-		Children []DbInfo `description:"数据库列表"`
-	}
-	// 基本不会变动
-	data := `[{"dbcode":"hgyd","dbname":"月度数据","sort":1,"children":null},{"dbcode":"hgjd","dbname":"季度数据","sort":2,"children":null},{"dbcode":"hgnd","dbname":"年度数据","sort":3,"children":null},{"dbcode":"","dbname":"地区数据","sort":4,"children":[{"dbcode":"fsyd","dbname":"分省月度数据","sort":1,"children":null},{"dbcode":"fsjd","dbname":"分省季度数据","sort":2,"children":null},{"dbcode":"fsnd","dbname":"分省年度数据","sort":3,"children":null},{"dbcode":"csyd","dbname":"主要城市月度价格","sort":4,"children":null},{"dbcode":"csnd","dbname":"主要城市年度数据","sort":5,"children":null},{"dbcode":"gatyd","dbname":"港澳台月度数据","sort":6,"children":null},{"dbcode":"gatnd","dbname":"港澳台年度数据","sort":7,"children":null}]},{"dbcode":"","dbname":"国际数据","sort":5,"children":[{"dbcode":"gjyd","dbname":"主要国家(地区)月度数据","sort":1,"children":null},{"dbcode":"gjydsdj","dbname":"三大经济体月度数据","sort":2,"children":null},{"dbcode":"gjydsc","dbname":"国际市场月度商品价格","sort":3,"children":null},{"dbcode":"gjnd","dbname":"主要国家(地区)年度数据","sort":4,"children":null}]}]`
-	var list []DbInfo
-	if e := json.Unmarshal([]byte(data), &list); e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "解析数据库列表信息失败, Err: " + e.Error()
-		return
-	}
-
-	br.Data = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// ClassifyList
-// @Title 指标分类列表
-// @Description 指标分类列表
-// @Param   Dbcode  query  string  true  "数据库编码"
-// @Success 200 Ret=200 获取成功
-// @router /base_from_national_statistics/classify_list [get]
-func (this *BaseFromNationalStatisticsController) ClassifyList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录, SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	dbcode := this.GetString("Dbcode", "")
-	if dbcode == "" {
-		br.Msg = "参数有误"
-		return
-	}
-
-	classifyOB := new(data_manage.BaseFromNationalStatisticsClassify)
-	classifyCond := ` AND dbcode = ? AND wdcode = ? `
-	classifyPars := make([]interface{}, 0)
-	classifyPars = append(classifyPars, dbcode, "zb")
-	classifies, e := classifyOB.GetItemsByCondition(classifyCond, classifyPars, []string{}, "base_from_national_statistics_classify_id ASC")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取统计局指标分类列表失败, Err: " + e.Error()
-		return
-	}
-	classifyMap := make(map[string]*data_manage.BaseFromNationalStatisticsClassify)
-	for _, c := range classifies {
-		classifyMap[c.Id] = c
-	}
-	topClassify := make([]*data_manage.BaseFromNationalStatisticsClassify, 0)
-	childMap := make(map[string][]*data_manage.BaseFromNationalStatisticsClassify)
-	//parentMap := make(map[string]*data_manage.BaseFromNationalStatisticsClassify)
-	for _, c := range classifies {
-		if c.Pid != "" {
-			if childMap[c.Pid] == nil {
-				childMap[c.Pid] = make([]*data_manage.BaseFromNationalStatisticsClassify, 0)
-			}
-			childMap[c.Pid] = append(childMap[c.Pid], c)
-			//parentMap[c.Id] = classifyMap[c.Pid]
-			continue
-		}
-		topClassify = append(topClassify, c)
-	}
-
-	list := make([]*data_manage.BaseFromNationalStatisticsClassifyItem, 0)
-	for _, t := range topClassify {
-		v := new(data_manage.BaseFromNationalStatisticsClassifyItem)
-		v.ClassifyId = t.BaseFromNationalStatisticsClassifyId
-		v.ClassifyName = t.ClassifyName
-		v.Dbcode = dbcode
-		v.IsParent = t.IsParent
-		// 二级分类
-		v.Children = make([]*data_manage.BaseFromNationalStatisticsClassifyItem, 0)
-		children := childMap[t.Id]
-		if children != nil && len(children) > 0 {
-			for _, l2 := range children {
-				v2 := new(data_manage.BaseFromNationalStatisticsClassifyItem)
-				v2.ClassifyId = l2.BaseFromNationalStatisticsClassifyId
-				v2.ClassifyName = l2.ClassifyName
-				v2.Dbcode = dbcode
-				v2.IsParent = l2.IsParent
-				v2.ParentId = t.BaseFromNationalStatisticsClassifyId
-				v2.ParentIds = append(v2.ParentIds, t.BaseFromNationalStatisticsClassifyId)
-				v2.Children = make([]*data_manage.BaseFromNationalStatisticsClassifyItem, 0)
-				// 三级分类
-				childLevel3 := childMap[l2.Id]
-				if childLevel3 != nil && len(childLevel3) > 0 {
-					for _, l3 := range childLevel3 {
-						v3 := new(data_manage.BaseFromNationalStatisticsClassifyItem)
-						v3.ClassifyId = l3.BaseFromNationalStatisticsClassifyId
-						v3.ClassifyName = l3.ClassifyName
-						v3.Dbcode = dbcode
-						v3.IsParent = l3.IsParent
-						v3.ParentId = l2.BaseFromNationalStatisticsClassifyId
-						v3.ParentIds = append(v3.ParentIds, t.BaseFromNationalStatisticsClassifyId, l2.BaseFromNationalStatisticsClassifyId)
-						v3.Children = make([]*data_manage.BaseFromNationalStatisticsClassifyItem, 0)
-						// 目前应该最多就三级了, 以防万一多写一层
-						childLevel4 := childMap[l3.Id]
-						if childLevel4 != nil && len(childLevel4) > 0 {
-							for _, l4 := range childLevel4 {
-								v4 := new(data_manage.BaseFromNationalStatisticsClassifyItem)
-								v4.ClassifyId = l4.BaseFromNationalStatisticsClassifyId
-								v4.ClassifyName = l4.ClassifyName
-								v4.Dbcode = dbcode
-								v4.IsParent = l4.IsParent
-								v4.ParentId = l3.BaseFromNationalStatisticsClassifyId
-								v4.ParentIds = append(v4.ParentIds, t.BaseFromNationalStatisticsClassifyId, l2.BaseFromNationalStatisticsClassifyId, l3.BaseFromNationalStatisticsClassifyId)
-								v4.Children = make([]*data_manage.BaseFromNationalStatisticsClassifyItem, 0)
-								v3.Children = append(v3.Children, v4)
-							}
-						}
-						v2.Children = append(v2.Children, v3)
-					}
-				}
-				v.Children = append(v.Children, v2)
-			}
-		}
-		list = append(list, v)
-	}
-
-	br.Data = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// IndexList
-// @Title 指标列表
-// @Description 指标列表
-// @Param   Dbcode  query  string  true  "数据库编码"
-// @Param   ClassifyId  query  int  false  "指标分类ID"
-// @Param   Keywords  query  string  false  "关键词-指标名称/指标ID"
-// @Success 200 Ret=200 获取成功
-// @router /base_from_national_statistics/index_list [get]
-func (this *BaseFromNationalStatisticsController) IndexList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录, SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	dbcode := this.GetString("Dbcode", "")
-	if dbcode == "" {
-		br.Msg = "请选择指标库"
-		return
-	}
-	classifyId, _ := this.GetInt("ClassifyId", 0)
-	keywords := this.GetString("Keywords", "")
-
-	indexOB := new(data_manage.BaseFromNationalStatisticsIndex)
-	indexCond := ` AND dbcode = ?`
-	indexPars := make([]interface{}, 0)
-	indexPars = append(indexPars, dbcode)
-	limitNum := 0
-	if keywords != "" {
-		k := fmt.Sprint("%", keywords, "%")
-		indexCond += ` AND (index_code LIKE ? OR CONCAT(reg, index_name) LIKE ?)`
-		indexPars = append(indexPars, k, k)
-		limitNum = 100 // 有关键词时限制100条不然前端数据量可能会很大
-	}
-	if classifyId > 0 {
-		indexCond += ` AND base_from_national_statistics_classify_id = ?`
-		indexPars = append(indexPars, classifyId)
-	}
-	indexes, e := indexOB.GetItemsByCondition(indexCond, indexPars, []string{}, "base_from_national_statistics_index_id ASC", limitNum)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取统计局指标列表失败, Err: " + e.Error()
-		return
-	}
-
-	resp := new(data_manage.BaseFromNationalStatisticsIndexListResp)
-	resp.List = make([]*data_manage.BaseFromNationalStatisticsIndexItem, 0)
-	repeatMap := make(map[string]int)
-	indexMap := make(map[int]*data_manage.BaseFromNationalStatisticsIndexItem)
-	for _, v := range indexes {
-		item := data_manage.FormatBaseFromNationalStatisticsIndex2Item(v)
-		// 因为存在第三维度-地区, 在分类大于0时, 根据indexName分组
-		if classifyId > 0 && v.Reg != "" {
-			// 取出地区信息作为详情接口的参数
-			if !utils.InArrayByStr(resp.RegList, v.Reg) {
-				resp.RegList = append(resp.RegList, v.Reg)
-			}
-			if indexMap[repeatMap[v.IndexName]] != nil {
-				indexMap[repeatMap[v.IndexName]].ChildrenIndexIds = append(indexMap[repeatMap[v.IndexName]].ChildrenIndexIds, v.BaseFromNationalStatisticsIndexId)
-			}
-			if repeatMap[v.IndexName] > 0 {
-				continue
-			}
-			repeatMap[v.IndexName] = v.BaseFromNationalStatisticsIndexId
-			indexMap[v.BaseFromNationalStatisticsIndexId] = item
-		}
-		// 非分类下的查询时, 指标全名为地区+指标名
-		if classifyId == 0 && v.Reg != "" {
-			item.IndexName = fmt.Sprintf("%s%s", item.Reg, item.IndexName)
-		}
-		resp.List = append(resp.List, item)
-	}
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// IndexDetail
-// @Title 指标详情
-// @Description 指标详情
-// @Param   ClassifyId  query  int  false  "指标分类ID"
-// @Param   IndexId  query  int  false  "指标ID"
-// @Param   Reg  query  string  false  "地区"
-// @Param   IsExport  query  bool  false  "是否导出"
-// @Success 200 Ret=200 获取成功
-// @router /base_from_national_statistics/index_detail [get]
-func (this *BaseFromNationalStatisticsController) IndexDetail() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录, SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	classifyId, _ := this.GetInt("ClassifyId", 0)
-	indexId, _ := this.GetInt("IndexId", 0)
-	reg := this.GetString("Reg", "")
-	isExport, _ := this.GetBool("IsExport", false)
-
-	indexOB := new(data_manage.BaseFromNationalStatisticsIndex)
-	indexCond := ``
-	indexPars := make([]interface{}, 0)
-	if reg != "" {
-		indexCond += ` AND reg = ?`
-		indexPars = append(indexPars, reg)
-	}
-	// 针对此种情况-数据库含地区维度, 选择指标时
-	if indexId > 0 && reg != "" {
-		index := new(data_manage.BaseFromNationalStatisticsIndex)
-		if e := index.GetItemById(indexId); e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取指标失败, Err: " + e.Error()
-			return
-		}
-		classifyId = index.BaseFromNationalStatisticsClassifyId
-		indexCond += ` AND index_name = ?`
-		indexPars = append(indexPars, index.IndexName)
-	}
-	if classifyId > 0 {
-		indexCond += ` AND base_from_national_statistics_classify_id = ?`
-		indexPars = append(indexPars, classifyId)
-	}
-	if indexId > 0 && reg == "" {
-		indexCond += ` AND base_from_national_statistics_index_id = ?`
-		indexPars = append(indexPars, indexId)
-	}
-	indexes, e := indexOB.GetItemsByCondition(indexCond, indexPars, []string{}, "base_from_national_statistics_index_id ASC", 0)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标列表失败, Err: " + e.Error()
-		return
-	}
-	if len(indexes) == 0 {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-	indexIds := make([]int, 0)
-	dbCode := ``
-	for _, i := range indexes {
-		if dbCode == `` {
-			dbCode = i.Dbcode
-		}
-		indexIds = append(indexIds, i.BaseFromNationalStatisticsIndexId)
-	}
-	dbNameMap := map[string]string{
-		"hgyd":    "月度数据",
-		"hgjd":    "季度数据",
-		"hgnd":    "年度数据",
-		"fsyd":    "分省月度数据",
-		"fsjd":    "分省季度数据",
-		"fsnd":    "分省年度数据",
-		"csyd":    "主要城市月度价格",
-		"csnd":    "主要城市年度数据",
-		"gatyd":   "港澳台月度数据",
-		"gatnd":   "港澳台年度数据",
-		"gjyd":    "主要国家(地区)月度数据",
-		"gjydsdj": "三大经济体月度数据",
-		"gjydsc":  "国际市场月度商品价格",
-		"gjnd":    "主要国家(地区)年度数据",
-	}
-
-	// 获取指标数据
-	dataOB := new(data_manage.BaseFromNationalStatisticsData)
-	dataCond := fmt.Sprintf(` AND base_from_national_statistics_index_id IN (%s)`, utils.GetOrmInReplace(len(indexIds)))
-	dataPars := make([]interface{}, 0)
-	dataPars = append(dataPars, indexIds)
-	dataItems, e := dataOB.GetItemsByCondition(dataCond, dataPars, []string{"base_from_national_statistics_data_id", "base_from_national_statistics_index_id", "data_time", "value"}, "base_from_national_statistics_index_id ASC, data_time DESC")
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取统计局指标数据失败, Err: " + e.Error()
-		return
-	}
-	indexDataMap := make(map[int][]*data_manage.BaseFromNationalStatisticsIndexDetailData)
-	for _, d := range dataItems {
-		if indexDataMap[d.BaseFromNationalStatisticsIndexId] == nil {
-			indexDataMap[d.BaseFromNationalStatisticsIndexId] = make([]*data_manage.BaseFromNationalStatisticsIndexDetailData, 0)
-		}
-		indexDataMap[d.BaseFromNationalStatisticsIndexId] = append(indexDataMap[d.BaseFromNationalStatisticsIndexId], &data_manage.BaseFromNationalStatisticsIndexDetailData{
-			DataTime: d.DataTime.Format(utils.FormatDate),
-			Value:    d.Value,
-		})
-	}
-	resp := make([]*data_manage.BaseFromNationalStatisticsIndexDetailItem, 0)
-	for _, i := range indexes {
-		v := new(data_manage.BaseFromNationalStatisticsIndexDetailItem)
-		item := data_manage.FormatBaseFromNationalStatisticsIndex2Item(i)
-		item.IndexName = fmt.Sprintf("%s%s", item.Reg, item.IndexName)
-		v.BaseFromNationalStatisticsIndexItem = *item
-		v.DataList = indexDataMap[i.BaseFromNationalStatisticsIndexId]
-		resp = append(resp, v)
-	}
-
-	// 导出
-	if isExport {
-		NationalStatisticsExport(this, br, resp, dbNameMap[dbCode])
-		return
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// NationalStatisticsExport 导出Excel
-func NationalStatisticsExport(this *BaseFromNationalStatisticsController, br *models.BaseResponse, list []*data_manage.BaseFromNationalStatisticsIndexDetailItem, dbName string) {
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downloadPath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-	sheet, e := xlsxFile.AddSheet("数据报表")
-	if e != nil {
-		br.Msg = "新增Sheet失败"
-		br.ErrMsg = "新增Sheet失败, Err: " + e.Error()
-		return
-	}
-
-	nameRow := sheet.AddRow()
-	codeRow := sheet.AddRow()
-	frequencyRow := sheet.AddRow()
-	unitRow := sheet.AddRow()
-	updateTimeRow := sheet.AddRow()
-	setRowIndex := 6 // 数据行开始
-	for _, index := range list {
-		nameRow.AddCell().SetString("指标名称")
-		nameRow.AddCell().SetString(index.IndexName)
-		nameRow.AddCell().SetString("")
-
-		codeRow.AddCell().SetString("指标ID")
-		codeRow.AddCell().SetString(index.IndexCode)
-		codeRow.AddCell().SetString("")
-
-		frequencyRow.AddCell().SetString("频率")
-		frequencyRow.AddCell().SetString(index.Frequency)
-		frequencyRow.AddCell().SetString("")
-
-		unitRow.AddCell().SetString("单位")
-		unitRow.AddCell().SetString(index.Unit)
-		unitRow.AddCell().SetString("")
-
-		updateTimeRow.AddCell().SetString("更新时间")
-		updateTimeRow.AddCell().SetString(index.ModifyTime)
-		updateTimeRow.AddCell().SetString("")
-
-		for k, v := range index.DataList {
-			row := sheet.Row(setRowIndex + k)
-			row.AddCell().SetString(v.DataTime)
-			row.AddCell().SetString(fmt.Sprint(v.Value))
-			row.AddCell().SetString("")
-		}
-	}
-
-	if e = xlsxFile.Save(downloadPath); e != nil {
-		br.Msg = "导出失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := fmt.Sprint("国家统计局", dbName, time.Now().Format("2006.01.02"), ".xlsx")
-	this.Ctx.Output.Download(downloadPath, fileName)
-	defer func() {
-		_ = os.Remove(downloadPath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}

+ 0 - 1106
controllers/data_manage/sci_data.go

@@ -1,1106 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_manage/request"
-	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// @Title 卓创(红桃3)数据分类
-// @Description 卓创(红桃3)数据分类接口
-// @Success 200 {object} data_manage.SciClassify
-// @router /sci/classify [get]
-func (this *EdbInfoController) SciClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	rootList, err := data_manage.GetBaseFromSciClassifyByParentId(0)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	classifyAll, err := data_manage.GetAllBaseFromSciClassify()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	baseFromSciIndexMap := make(map[int][]*data_manage.BaseFromSciClassifyItems)
-
-	allBaseFromSciIndex, err := data_manage.GetSciIndexAll()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	for _, v := range allBaseFromSciIndex {
-		baseFromSciIndexMap[v.ClassifyId] = append(baseFromSciIndexMap[v.ClassifyId], v)
-	}
-
-	rootChildMap := make(map[int][]*data_manage.BaseFromSciClassifyItems)
-	for _, v := range classifyAll {
-		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		if existItems, ok := baseFromSciIndexMap[v.ClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromSciClassifyItems, 0)
-			v.Children = items
-		}
-	}
-	var ret data_manage.BaseFromSciClassifyResp
-	nodeAll := make([]*data_manage.BaseFromSciClassifyItems, 0)
-	for _, v := range rootList {
-		if existItems, ok := rootChildMap[v.ClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromSciClassifyItems, 0)
-			v.Children = items
-		}
-		nodeAll = append(nodeAll, v)
-	}
-
-	//查询未分类的指标列表
-	initClassify := &data_manage.BaseFromSciClassifyItems{
-		ClassifyId:         0,
-		BaseFromSciIndexId: 0,
-		ClassifyName:       "未分类",
-		ClassifyNameEn:     "Unclassified",
-		ParentId:           0,
-		Level:              1,
-		Sort:               0,
-		Children:           nil,
-	}
-	initIndexList, err := data_manage.GetBaseFromSciIndexByClassifyId(initClassify.ClassifyId)
-	if err != nil {
-		br.Msg = "获取未分类指标失败"
-		br.ErrMsg = "获取未分类指标失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range initIndexList {
-		tmp := &data_manage.BaseFromSciClassifyItems{
-			ClassifyId:           v.ClassifyId,
-			BaseFromSciIndexId:   v.BaseFromSciIndexId,
-			BaseFromSciIndexCode: v.IndexCode,
-			ClassifyName:         v.IndexName,
-			ParentId:             0,
-			Level:                0,
-			Sort:                 0,
-			Children:             nil,
-		}
-		initClassify.Children = append(initClassify.Children, tmp)
-	}
-	finalList := make([]*data_manage.BaseFromSciClassifyItems, 0)
-	finalList = append(finalList, initClassify)
-	finalList = append(finalList, nodeAll...)
-	ret.List = finalList
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// SciClassifyName
-// @Title 卓创(红桃3)数据分类名称查询
-// @Description 卓创(红桃3)数据分类名称查询接口
-// @Success 200 {object} data_manage.SciClassify
-// @router /sci/classify/name [get]
-func (this *EdbInfoController) SciClassifyName() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	rootList, err := data_manage.GetBaseFromSciClassifyByParentId(0)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	classifyAll, err := data_manage.GetAllBaseFromSciClassify()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	rootChildMap := make(map[int][]*data_manage.BaseFromSciClassifyNameItems)
-	for _, v := range classifyAll {
-		tmp := &data_manage.BaseFromSciClassifyNameItems{
-			ClassifyId:   v.ClassifyId,
-			ClassifyName: v.ClassifyName,
-			ParentId:     v.ParentId,
-			Children:     nil,
-		}
-		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], tmp)
-	}
-	var ret data_manage.BaseFromSciClassifyNameResp
-	nodeAll := make([]*data_manage.BaseFromSciClassifyNameItems, 0)
-	for _, v := range rootList {
-		tmp := &data_manage.BaseFromSciClassifyNameItems{
-			ClassifyId:   v.ClassifyId,
-			ClassifyName: v.ClassifyName,
-			ParentId:     v.ParentId,
-			Children:     nil,
-		}
-		if existItems, ok := rootChildMap[v.ClassifyId]; ok {
-			tmp.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromSciClassifyNameItems, 0)
-			tmp.Children = items
-		}
-		nodeAll = append(nodeAll, tmp)
-	}
-
-	ret.List = nodeAll
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// AddSciClassify
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddBaseFromSciClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /sci/classify/add [post]
-func (this *EdbInfoController) AddSciClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromSciClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		br.IsSendEmail = false
-		return
-	}
-	req.ClassifyName = utils.TrimStr(req.ClassifyName)
-	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
-
-	//添加指标
-	sciClassifyInfo, err, errMsg := data.AddSciClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	// 如果是添加一级分类,那么默认加上 价格、供应、需求、库存 四个二级分类
-	if sciClassifyInfo.ParentId == 0 {
-		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
-		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddSciClassify(v, sciClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
-			if tmpErrMsg != `` {
-				go alarm_msg.SendAlarmMsg("SCI原始数据-添加一级分类时,默认添加二级分类失败,一级分类名称:"+req.ClassifyName+",二级分类名称:"+v+", Err:"+tmpErrMsg, 3)
-				return
-			}
-		}
-	}
-	resp := data_manage.AddSciClassifyResp{
-		ClassifyId: sciClassifyInfo.ClassifyId,
-		//UniqueCode:                        fmt.Sprint(SciClassifyInfo.BaseFromSciClassifyId),
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// EditSciClassify
-// @Title 修改分类
-// @Description 修改分类接口
-// @Param	request	body data_manage.EditBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
-// @router /sci/classify/edit [post]
-func (this *EdbInfoController) EditSciClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromSciClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.EditSciClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// @Title 卓创(红桃3)数据频度
-// @Description 卓创(红桃3)数据频度接口
-// @Param   ClassifyId   query   string  true       "分类Id"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /sci/frequency [get]
-func (this *EdbInfoController) SciFrequency() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	frequencyList, err := data_manage.GetSciFrequencyByClassifyId(classifyId)
-	if err != nil {
-		br.Msg = "获取频度失败"
-		br.ErrMsg = "获取频度失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// MoveSciClassify
-// @Title 分类移动接口
-// @Description 分类移动接口
-// @Success 200 {object} data_manage.MoveBaseFromMysteelChemicalClassifyReq
-// @router /sci/classify/move [post]
-func (this *EdbInfoController) MoveSciClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.MoveBaseFromSciClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveSciClassify(req.ClassifyId, req.ParentId, req.PrevClassifyId, req.NextClassifyId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// DeleteSciClassify
-// @Title 删除分类
-// @Description 删除分类接口
-// @Param	request	body data_manage.DelBaseFromSciClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /sci/classify/del [post]
-func (this *EdbInfoController) DeleteSciClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromSciClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelSciClassify(req.ClassifyId, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// MoveSciData
-// @Title SCI指标移动接口
-// @Description SCI指标移动接口
-// @Success 200 {object} data_manage.MoveBaseFromSciReq
-// @router /sci/move [post]
-func (this *EdbInfoController) MoveSciData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.MoveBaseFromSciReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciIndexId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "指标id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveSciData2(req.BaseFromSciIndexId, req.ClassifyId, req.PrevBaseFromSciIndexId, req.NextBaseFromSciIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// EditSci
-// @Title 编辑卓创(红桃3)指标
-// @Description 编辑卓创(红桃3)指标接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /sci/edit [post]
-func (this *EdbInfoController) EditSci() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromSciReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.BaseFromSciIndexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	//编辑指标
-	sciIndexInfo, err, errMsg := data.EditSciIndex(req.BaseFromSciIndexId, req.ClassifyId, this.SysUser)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	resp := data_manage.EditSciIndexInfoResp{
-		BaseFromSciIndexId: sciIndexInfo.BaseFromSciIndexId,
-		IndexCode:          sciIndexInfo.IndexCode,
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// @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 /sci/data [get]
-func (this *EdbInfoController) SciData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	classifyId, _ := this.GetInt("ClassifyId")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-	frequency := this.GetString("Frequency")
-	if frequency == "" {
-		br.Msg = "请选择频度"
-		br.ErrMsg = "请选择频度"
-		return
-	}
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, classifyId)
-	}
-
-	if frequency != "" {
-		condition += ` AND frequency=? `
-		pars = append(pars, frequency)
-	}
-
-	sciList, err := data_manage.GetSciIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_manage.SciIndexList, 0)
-	for _, v := range sciList {
-		product := new(data_manage.SciIndexList)
-		product.BaseFromSciIndexId = v.BaseFromSciIndexId
-		product.Unit = v.Unit
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.ModifyTime = v.ModifyTime
-
-		total, err := data_manage.GetSciIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, err := data_manage.GetSciIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.SciIndexData, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// SciSearchList
-// @Title SCI模糊搜索
-// @Description SCI模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /sci/search_list [get]
-func (this *EdbInfoController) SciSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	//关键字
-	keyword := this.GetString("Keyword")
-
-	list, err := data_manage.GetSciItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// SciSingleData
-// @Title 获取Sci数据
-// @Description 获取sci单条数据接口
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /sci/single_data [get]
-func (this *EdbInfoController) SciSingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	indexCode := this.GetString("IndexCode")
-	indexInfo, err := data_manage.GetBaseFromSciIndexByIndexCode(indexCode)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	dataList, err := data_manage.GetSciIndexDataByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	var ret data_manage.SciSingleDataResp
-	ret.ClassifyId = indexInfo.ClassifyId
-	ret.BaseFromSciIndexId = indexInfo.BaseFromSciIndexId
-	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
-	ret.Data = dataList
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// DeleteSciData
-// @Title 删除指标
-// @Description 删除指标接口
-// @Param	request	body data_manage.DelBaseFromSciReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /sci/del [post]
-func (this *EdbInfoController) DeleteSciData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromSciReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelSciData(req.BaseFromSciIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ResetSciData
-// @Title 指标数据清除分类
-// @Description 指标数据清除分类
-// @Param	request	body data_manage.DelBaseFromSciReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /sci/reset [post]
-func (this *EdbInfoController) ResetSciData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromSciReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.ResetSciData(req.BaseFromSciIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "操作成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ExportSciList
-// @Title 导出Sci数据
-// @Description 导出Sci数据
-// @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/sciList [get]
-func (this *EdbInfoController) ExportSciList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	//typeName := this.GetString("TypeName") //分类
-	//frequency := this.GetString("Frequency")
-
-	indexCode := this.GetString("IndexCode") //指标唯一编码
-	classifyId, _ := this.GetInt("ClassifyId")
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	if classifyId >= 0 && indexCode == "" {
-
-		frequencies, err := data_manage.GetSciFrequency(classifyId)
-		if err != nil {
-			fmt.Println("GetSciFrequency err:", err.Error())
-			utils.FileLog.Info("GetSciFrequency err:" + err.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.GetSciIndex(condition, pars)
-			if err != nil {
-				fmt.Println("获取数据失败,Err:" + err.Error())
-				return
-			}
-			if len(secNameList) <= 0 {
-				fmt.Println("secNameList长度为0")
-				return
-			}
-			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.GetSciDataMaxCount(classifyId)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			fmt.Println("dataMax:", dataMax)
-			setRowIndex := 6
-			for k, sv := range secNameList {
-				//获取数据
-				dataList, err := data_manage.GetSciIndexDataByCode(sv.IndexCode)
-				if err != nil {
-					br.Msg = "获取数据失败"
-					br.ErrMsg = "获取数据失败,Err:" + err.Error()
-					return
-				}
-				if len(dataList) > 0 {
-					windRow.AddCell().SetValue("Sci")
-					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.GetSciFrequencyByCode(indexCode)
-		if err != nil {
-			fmt.Println("GetSciFrequencyByCode err:", err.Error())
-			utils.FileLog.Info("GetSciFrequencyByCode err:" + err.Error())
-			return
-		}
-		for _, frequency := range frequencies {
-			//获取数据
-			dataList, err := data_manage.GetSciIndexDataByCode(indexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			if len(dataList) > 0 {
-				name := this.GetString("IndexName")
-				unit := this.GetString("UnitName")
-				modifyTime := this.GetString("ModifyTime")
-
-				sheet, err := xlsxFile.AddSheet(*frequency)
-				if err != nil {
-					br.Msg = "新增Sheet失败"
-					br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-					return
-				}
-				//获取指标数据
-				windRow := sheet.AddRow()
-				windRow.AddCell().SetValue("Sci")
-				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.GetSciIndexDataCount(indexCode)
-				if len(dataList) <= 0 {
-					for n := 0; n < dataMax; n++ {
-						rowIndex := 6 + n
-						row := sheet.Row(rowIndex)
-						row.AddCell()
-						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)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `Sci数据`
-	if len(secNameList) > 0 {
-		fileName = secNameList[0].ClassifyName
-	}
-	fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}

+ 0 - 1549
controllers/data_manage/sci_hq_data.go

@@ -1,1549 +0,0 @@
-package data_manage
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/controllers"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_manage/request"
-	"eta_gn/eta_api/models/data_manage/response"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/services/data_stat"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-)
-
-type SciHqDataController struct {
-	controllers.BaseAuthController
-}
-
-// @Title 卓创红期数据分类
-// @Description 卓创红期数据分类接口
-// @Success 200 {object} data_manage.SciClassify
-// @router /sci_hq/classify [get]
-func (this *SciHqDataController) Classify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	classifyList, err := data_manage.GetSciHqClassifyAll()
-	if err != nil {
-		br.Msg = "查询失败"
-		br.ErrMsg = "查询失败, Err:" + err.Error()
-		return
-	}
-
-	initClassify := &data_manage.BaseFromSciHqClassifyItem{
-		ClassifyId:     0,
-		ClassifyName:   "未分类",
-		ClassifyNameEn: "Unclassified",
-		UniqueCode:     "0",
-		ParentId:       0,
-		Level:          1,
-		Sort:           0,
-		Children:       nil,
-	}
-	finalList := make([]*data_manage.BaseFromSciHqClassifyItem, 0)
-	classifyTree := getSciHqClassifyTree(classifyList, 0)
-	finalList = append(finalList, initClassify)
-	finalList = append(finalList, classifyTree...)
-
-	br.Msg = "查询成功"
-	br.Data = finalList
-	br.Success = true
-	br.Ret = 200
-}
-
-// AddSciClassify
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddBaseFromSciClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /sci_hq/classify/add [post]
-func (this *SciHqDataController) AddClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromSciHqClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		return
-	}
-	if req.ParentId < 0 {
-		br.Msg = "操作异常"
-		return
-	}
-	ok, msg, err := data.AddSciHqClassify(req.ClassifyName, this.Lang, req.ParentId)
-	if err != nil {
-		br.Msg = "添加失败"
-		br.ErrMsg = "添加失败,Err:" + err.Error()
-		return
-	}
-	if !ok {
-		if msg != "" {
-			br.Msg = msg
-			return
-		}
-		br.Msg = "添加失败"
-		return
-	}
-	br.Msg = "添加成功"
-	br.Success = true
-	br.Ret = 200
-}
-
-// DelClassify
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddBaseFromSciClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /sci_hq/classify/del [post]
-func (this *SciHqDataController) DelClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromSciHqClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err = data.DelSciHqClassify(req.ClassifyId)
-	if err != nil {
-		br.Msg = "删除失败"
-		br.ErrMsg = "删除失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// EditClassify
-// @Title 修改分类
-// @Description 修改分类接口
-// @Param	request	body data_manage.EditBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
-// @router /sci_hq/classify/edit [post]
-func (this *SciHqDataController) EditClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromSciHqClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		return
-	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		return
-	}
-	classify, err := data_manage.GetSciHqClassifyById(req.ClassifyId)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			br.Msg = "分类不存在"
-			return
-		}
-		br.Msg = "编辑失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	switch this.Lang {
-	case utils.EnLangVersion:
-		if classify.ClassifyNameEn != req.ClassifyName {
-			count, err := data_manage.GetSciHqClassifyCountByName(req.ClassifyName, this.Lang)
-			if err != nil {
-				br.Msg = "编辑失败"
-				br.ErrMsg = "获取分类失败,Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				br.Msg = "分类名称已存在"
-				return
-			}
-			classify.ClassifyNameEn = req.ClassifyName
-			classify.ModifyTime = time.Now()
-			err = classify.Update([]string{"classify_name_en", "modify_time"})
-			if err != nil {
-				br.Msg = "编辑失败"
-				br.ErrMsg = "编辑失败,Err:" + err.Error()
-				return
-			}
-		}
-	default:
-		if classify.ClassifyName != req.ClassifyName {
-			count, err := data_manage.GetSciHqClassifyCountByName(req.ClassifyName, this.Lang)
-			if err != nil {
-				br.Msg = "编辑失败"
-				br.ErrMsg = "获取分类失败,Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				br.Msg = "分类名称已存在"
-				return
-			}
-			classify.ClassifyName = req.ClassifyName
-			classify.ModifyTime = time.Now()
-			err = classify.Update([]string{"classify_name", "modify_time"})
-			if err != nil {
-				br.Msg = "编辑失败"
-				br.ErrMsg = "编辑失败,Err:" + err.Error()
-				return
-			}
-		}
-	}
-
-	br.Msg = "编辑成功"
-	br.Success = true
-	br.Ret = 200
-	br.IsAddLog = true
-}
-
-// MoveClassify
-// @Title 分类移动接口
-// @Description 分类移动接口
-// @Success 200 {object} data_manage.MoveBaseFromMysteelChemicalClassifyReq
-// @router /sci_hq/classify/move [post]
-func (this *SciHqDataController) MoveClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	var req request.MoveBaseFromSciHqClassifyReq
-	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveSciHqClassify(req.ClassifyId, req.ParentId, req.PrevClassifyId, req.NextClassifyId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// IndexList
-// @Title 卓创红期指标列表
-// @Description 卓创红期数据指标列表接口
-// @Param   ClassifyId   query   int  true       "分类id"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
-// @router /sci_hq/index/list [get]
-func (this *SciHqDataController) IndexList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	classifyId, _ := this.GetInt("ClassifyId", 0)
-	indexList, err := data_manage.GetSciHqIndexBaseInfoByClassifyId(classifyId)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = indexList
-}
-
-// BatchIndexList
-// @Title 卓创红期批量操作指标列表
-// @Description 卓创红期批量操作指标列表
-// @Param   request	body   request.SciHqDataBatchListReq true "type json string"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
-// @router /sci_hq/index/batch_list [post]
-func (this *SciHqDataController) BatchIndexList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.SciHqDataBatchListReq
-	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	var condition string
-	var pars []interface{}
-	if req.KeyWord != "" {
-		condition += `AND (index_code=? OR index_name=?)`
-		pars = utils.GetLikeKeywordPars(pars, req.KeyWord, 2)
-	}
-	if req.IsSelectAll {
-		if len(req.SelectedId) > 0 {
-			condition += ` AND base_from_sci_hq_index_id NOT IN (` + utils.GetOrmInReplace(len(req.SelectedId)) + `)`
-			pars = append(pars, req.SelectedId)
-		}
-	} else {
-		if len(req.SelectedId) > 0 {
-			condition += ` AND base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(req.SelectedId)) + `)`
-			pars = append(pars, req.SelectedId)
-		}
-	}
-	if req.ClassifyId < 0 {
-		br.Msg = "分类选择错误"
-		return
-	}
-	if req.ClassifyId > 0 {
-		childClassify, err := data_manage.GetChildSciHqClassifyListById(req.ClassifyId)
-		if err != nil {
-			br.Msg = "下载失败"
-			br.ErrMsg = "获取分类失败,Err:" + err.Error()
-			return
-		}
-		if len(childClassify) > 0 {
-			condition += `AND classify_id IN (` + utils.GetOrmInReplace(len(childClassify)) + `)`
-			for _, child := range childClassify {
-				pars = append(pars, child.ClassifyId)
-			}
-		} else {
-			condition += ` AND classify_id=?`
-			pars = append(pars, req.ClassifyId)
-		}
-	} else {
-		condition += ` AND classify_id=?`
-		pars = append(pars, req.ClassifyId)
-	}
-
-	count, err := data_manage.GetSciHqIndexCountByCondition(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	MaxLen := 30
-	if count > MaxLen {
-		br.Msg = "批量操作数量不能超过" + strconv.Itoa(MaxLen)
-		return
-	}
-	indexList, err := data_manage.GetSciHqIndexByCondition(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = indexList
-}
-
-// IndexPageList
-// @Title 卓创红期指标列表
-// @Description 卓创红期数据指标列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Param   ClassifyId   query   int  true       "分类id"
-// @Param   IsListAll   query   int  true       "是否展示全部"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
-// @router /sci_hq/index/page/list [get]
-func (this *SciHqDataController) IndexPageList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	classifyId, _ := this.GetInt("ClassifyId", 0)
-	pageSize, _ := this.GetInt("PageSize")
-	currrentIndex, _ := this.GetInt("CurrentIndex")
-	isListAll, _ := this.GetBool("IsListAll")
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currrentIndex <= 0 {
-		currrentIndex = 1
-	}
-	startSize = utils.StartIndex(currrentIndex, pageSize)
-	var total int
-	var indexList []*data_manage.BaseFromSciHqIndexView
-	if isListAll {
-		tmpTotal, err := data_manage.GetSciHqIndexCount()
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-			return
-		}
-		total = tmpTotal
-		tmpIndexList, err := data_manage.GetSciHqIndexByPage(startSize, pageSize)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-			return
-		}
-		indexList = tmpIndexList
-	} else {
-		var classifyIds []int
-		if classifyId > 0 {
-			tmpClassifyIds, err := data_manage.GetSciHqChildClassifyIdsById(classifyId)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
-				return
-			}
-			if len(tmpClassifyIds) > 0 {
-				classifyIds = append(classifyIds, tmpClassifyIds...)
-			}
-		}
-		classifyIds = append(classifyIds, classifyId)
-		tmpTotal, err := data_manage.GetSciHqIndexCountByClassifyId(classifyIds)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-			return
-		}
-		total = tmpTotal
-		tmpIndexList, err := data_manage.GetSciHqIndexByClassifyId(classifyIds, startSize, pageSize)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-			return
-		}
-		indexList = tmpIndexList
-	}
-
-	page := paging.GetPaging(currrentIndex, pageSize, total)
-	resp := new(response.SciHqIndexPageListResp)
-	resp.List = indexList
-	resp.Paging = page
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// SearchList
-// @Title 卓创红期模糊搜索
-// @Description 卓创红期模糊搜索
-// @Param   Keyword   query   string  true       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /sci_hq/search_list [get]
-func (this *SciHqDataController) SearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	//关键字
-	keyword := this.GetString("Keyword")
-	var condition string
-	var pars []interface{}
-	if keyword != "" {
-		condition += ` AND (index_code LIKE ? OR index_name LIKE ?)`
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	} else {
-		br.Msg = "请输入指标ID/指标名称"
-		return
-	}
-
-	list, err := data_manage.GetSciHqIndexBaseInfoByCondition(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// SingleData
-// @Title 获取卓创红期据
-// @Description 获取卓创红期单条数据接口
-// @Param   BaseFromSciHqIndexId   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /sci_hq/single_data [get]
-func (this *SciHqDataController) SingleData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	baseFromSciHqIndexId, _ := this.GetInt("BaseFromSciHqIndexId")
-	indexInfo, err := data_manage.GetSciHqIndexByIndexId(baseFromSciHqIndexId)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, indexInfo.IndexCode)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取指标数据失败"
-		br.ErrMsg = "获取指标库数据失败,Err:" + err.Error()
-		return
-	}
-	var edbInfoId int
-	if edbInfo != nil {
-		edbInfoId = edbInfo.EdbInfoId
-	}
-	dataList, err := data_manage.GetSciHqDataByIndexId(baseFromSciHqIndexId)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	var ret response.SciHqSingleDataResp
-	ret.ClassifyId = indexInfo.ClassifyId
-	ret.BaseFromSciHqIndexId = indexInfo.BaseFromSciHqIndexId
-	ret.IndexCode = indexInfo.IndexCode
-	ret.EdbInfoId = edbInfoId
-	ret.IndexName = indexInfo.IndexName
-	ret.Frequency = indexInfo.Frequency
-	ret.CreateTime = indexInfo.CreateTime.Format(utils.FormatDateTime)
-	ret.ModifyTime = indexInfo.ModifyTime.Format(utils.FormatDateTime)
-	ret.Unit = indexInfo.Unit
-	ret.Data = dataList
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// MoveSciHqData
-// @Title 卓创红期指标移动接口
-// @Description 卓创红期指标移动接口
-// @Success 200 {object} request.MoveBaseFromSciHqReq
-// @router /sci_hq/move [post]
-func (this *SciHqDataController) MoveSciHqData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.MoveBaseFromSciHqReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciHqIndexId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "指标id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveSciHqData(req.BaseFromSciHqIndexId, req.ClassifyId, req.PrevBaseFromSciHqIndexId, req.NextBaseFromSciHqIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-	br.Msg = "移动成功"
-}
-
-// ResetSciHqIndex
-// @Title 指标数据清除分类
-// @Description 指标数据清除分类
-// @Param	request	body data_manage.DelBaseFromSciReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /sci_hq/reset [post]
-func (this *SciHqDataController) ResetSciHqIndex() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.ResetBaseFromSciHqReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciHqIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err = data.ResetSciHqIndex(req.BaseFromSciHqIndexId)
-	if err != nil {
-		br.Msg = "移动失败"
-		br.ErrMsg = "移动失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "操作成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// AddEdbInfo
-// @Title 新增指标接口
-// @Description 新增指标接口
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success Ret=200 保存成功
-// @router /sci_hq/edb_info/add [post]
-func (this *SciHqDataController) AddEdbInfo() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	deleteCache := true
-	cacheKey := "CACHE_EDB_INFO_ADD_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中,请稍后重试!"
-		br.ErrMsg = "系统处理中,请稍后重试!" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-	var req data_manage.AddEdbInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	req.EdbName = strings.Trim(req.EdbName, " ")
-	req.EdbCode = strings.Trim(req.EdbCode, " ")
-
-	if req.EdbCode == "" {
-		br.Msg = "指标ID不能为空"
-		return
-	}
-
-	if req.EdbName == "" {
-		br.Msg = "指标名称不能为空"
-		return
-	}
-
-	if req.Frequency == "" {
-		br.Msg = "频率不能为空"
-		return
-	}
-
-	if req.Unit == "" {
-		br.Msg = "单位不能为空"
-		return
-	}
-
-	if req.ClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		return
-	}
-
-	_, err = data_manage.GetSciHqIndexByIndexCode(req.EdbCode)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			br.Msg = "指标不存在"
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-	source := utils.DATA_SOURCE_SCI_HQ
-	// 指标入库
-	edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, req.StartDate, req.EndDate, sysUser.AdminId, sysUser.RealName, this.Lang)
-	if err != nil {
-		br.Msg = "保存失败"
-		if errMsg != `` {
-			br.Msg = errMsg
-		}
-		br.ErrMsg = err.Error()
-		br.IsSendEmail = isSendEmail
-		return
-	}
-
-	//新增操作日志
-	{
-		// 添加钢联指标更新日志
-		if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-			go data_stat.AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 1, "", sysUser, 2)
-		}
-
-		edbLog := new(data_manage.EdbInfoLog)
-		edbLog.EdbInfoId = edbInfo.EdbInfoId
-		edbLog.SourceName = edbInfo.SourceName
-		edbLog.Source = edbInfo.Source
-		edbLog.EdbCode = edbInfo.EdbCode
-		edbLog.EdbName = edbInfo.EdbName
-		edbLog.ClassifyId = edbInfo.ClassifyId
-		edbLog.SysUserId = sysUser.AdminId
-		edbLog.SysUserRealName = sysUser.RealName
-		edbLog.CreateTime = time.Now()
-		edbLog.Content = string(this.Ctx.Input.RequestBody)
-		edbLog.Status = "新增指标"
-		edbLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddEdbInfoLog(edbLog)
-	}
-
-	// 更新es
-	go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
-	resp := new(data_manage.AddEdbInfoResp)
-	resp.EdbInfoId = edbInfo.EdbInfoId
-	resp.UniqueCode = edbInfo.UniqueCode
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.Data = resp
-	br.IsAddLog = true
-}
-
-// AddCheck
-// @Title 新增校验
-// @Description 新增校验
-// @Param	request	body request.BusinessDataBatchAddCheckReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /sci_hq/edb_info/add_check [post]
-func (this *SciHqDataController) AddCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req *request.SciHqDataBatchAddCheckReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	codeMax := 30
-	codeLen := len(req.IndexCodes)
-	if len(req.IndexCodes) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-
-	if codeLen > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-	// 获取指标库已有指标
-	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_SCI_HQ)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取自有数据已添加的指标失败, Err: " + e.Error()
-		return
-	}
-	existMap := make(map[string]*data_manage.EdbInfo)
-	for _, v := range existsEdb {
-		existMap[v.EdbCode] = v
-	}
-
-	// 查询选中的指标
-	cond := fmt.Sprintf(` AND index_code IN (%s)`, utils.GetOrmInReplace(codeLen))
-	pars := make([]interface{}, 0)
-	pars = append(pars, req.IndexCodes)
-	list, err := data_manage.GetSciHqIndexAndEdbInfoByCondition(cond, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取卓创红期原始指标列表失败, Err: " + err.Error()
-		return
-	}
-
-	resp := make([]*data_manage.BaseFromSciHqIndexView, 0)
-	for _, v := range list {
-		if v.EdbInfoId > 0 {
-			v.EdbExist = 1
-		}
-		resp = append(resp, v)
-	}
-
-	br.Data = resp
-	br.Msg = "校验成功"
-	br.Ret = 200
-	br.Success = true
-}
-
-// NameCheck
-// @Title 重名校验
-// @Description 批量新增
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /sci_hq/edb_info/name_check [post]
-func (c *SciHqDataController) NameCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		c.Data["json"] = br
-		c.ServeJSON()
-	}()
-	sysUser := c.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req []*data_manage.NameCheckEdbInfoReq
-	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	codeMax := 30
-	codeLen := len(req)
-	if codeLen > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-
-	type NameCheckResult struct {
-		EdbCode string
-		EdbName string
-		Exist   bool
-	}
-	indexNames := make([]string, 0)
-	resp := make([]*NameCheckResult, 0)
-	for _, v := range req {
-		v.EdbCode = strings.TrimSpace(v.EdbCode)
-		if v.EdbCode == "" {
-			br.Msg = "指标ID不可为空"
-			return
-		}
-		v.EdbName = strings.TrimSpace(v.EdbName)
-		if v.EdbName == "" {
-			br.Msg = "请输入指标名称"
-			return
-		}
-		indexNames = append(indexNames, v.EdbName)
-		resp = append(resp, &NameCheckResult{
-			EdbCode: v.EdbCode,
-			EdbName: v.EdbName,
-		})
-		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_SCI_HQ, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取卓创红期已存在信息失败,Err:" + err.Error()
-			return
-		}
-		if len(dataItems) <= 0 {
-			respItem, err := data.AddEdbData(utils.DATA_SOURCE_SCI_HQ, v.EdbCode, v.Frequency)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				return
-			}
-			if respItem.Ret != 200 {
-				br.Msg = "未搜索到该指标"
-				br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + v.EdbCode
-				return
-			}
-		}
-	}
-
-	// 重名校验
-	edbList, e := data_manage.GetEdbInfoByNameArr(indexNames, utils.EDB_INFO_TYPE)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取重名指标失败, Err: " + e.Error()
-		return
-	}
-	nameExists := make(map[string]bool)
-	for _, v := range edbList {
-		nameExists[v.EdbName] = true
-	}
-	if len(nameExists) > 0 {
-		for _, v := range resp {
-			v.Exist = nameExists[v.EdbName]
-		}
-	}
-
-	br.Data = resp
-	br.Msg = "校验成功"
-	br.Ret = 200
-	br.Success = true
-}
-
-// BatchAdd
-// @Title 批量新增
-// @Description 批量新增
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /sci_hq/edb_info/batch_add [post]
-func (this *SciHqDataController) BatchAdd() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	deleteCache := true
-	cacheKey := "CACHE_EDB_INFO_BATCH_ADD_SCI_HQ_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			_ = utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中,请稍后重试!"
-		br.ErrMsg = "系统处理中,请稍后重试!" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-	var req []*data_manage.AddEdbInfoReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	if len(req) > 30 {
-		br.Msg = "批量添加指标数量不得超过30个"
-		return
-	}
-	for _, v := range req {
-		v.EdbCode = strings.TrimSpace(v.EdbCode)
-		if v.EdbCode == "" {
-			br.Msg = "指标ID不可为空"
-			return
-		}
-		v.EdbName = strings.TrimSpace(v.EdbName)
-		if v.EdbName == "" {
-			br.Msg = "请输入指标名称"
-			return
-		}
-		v.Frequency = strings.TrimSpace(v.Frequency)
-		if v.Frequency == "" {
-			br.Msg = "请选择频度"
-			return
-		}
-		v.Unit = strings.TrimSpace(v.Unit)
-		if v.Unit == "" {
-			br.Msg = "请输入单位"
-			return
-		}
-		if v.ClassifyId <= 0 {
-			br.Msg = "请选择分类"
-			return
-		}
-	}
-
-	// 限定同一时间最多批量新增30个指标
-	for _, v := range req {
-		var r data.SciHqIndexSource2EdbReq
-		r.EdbCode = v.EdbCode
-		r.EdbName = v.EdbName
-		r.Frequency = v.Frequency
-		r.Unit = v.Unit
-		r.ClassifyId = v.ClassifyId
-		r.AdminId = sysUser.AdminId
-		r.AdminRealName = sysUser.RealName
-
-		edbInfo, errMsg, skip, e := data.SciHqIndexSource2Edb(r, this.Lang)
-		if e != nil {
-			br.Msg = "操作失败"
-			if errMsg != "" {
-				br.Msg = errMsg
-			}
-			br.ErrMsg = e.Error()
-			return
-		}
-		if skip {
-			continue
-		}
-
-		// 新增操作日志
-		{
-			edbLog := new(data_manage.EdbInfoLog)
-			edbLog.EdbInfoId = edbInfo.EdbInfoId
-			edbLog.SourceName = edbInfo.SourceName
-			edbLog.Source = edbInfo.Source
-			edbLog.EdbCode = edbInfo.EdbCode
-			edbLog.EdbName = edbInfo.EdbName
-			edbLog.ClassifyId = edbInfo.ClassifyId
-			edbLog.SysUserId = sysUser.AdminId
-			edbLog.SysUserRealName = sysUser.RealName
-			edbLog.CreateTime = time.Now()
-			edbLog.Content = string(this.Ctx.Input.RequestBody)
-			edbLog.Status = "新增指标"
-			edbLog.Method = this.Ctx.Input.URI()
-			go data_manage.AddEdbInfoLog(edbLog)
-		}
-	}
-
-	br.Msg = "操作成功"
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// BatchDelete
-// @Title 批量删除
-// @Description 批量删除
-// @Param	request	body []*request.DelBaseFromSciHqReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /sci_hq/edb_info/batch_delete [post]
-func (this *SciHqDataController) BatchDelete() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req []*request.DelBaseFromSciHqReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	if len(req) > 30 {
-		br.Msg = "批量添加指标数量不得超过30个"
-		return
-	}
-	var deleteIds []int
-	for _, v := range req {
-		if v.BaseFromSciHqIndexId <= 0 {
-			continue
-		}
-		deleteIds = append(deleteIds, v.BaseFromSciHqIndexId)
-	}
-	existList, err := data.BatchDelSciHqData(deleteIds)
-	if err != nil {
-		br.Msg = "删除失败"
-		br.ErrMsg = "删除失败,Err:" + err.Error()
-		return
-	}
-
-	br.Data = existList
-	br.Msg = "操作成功"
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// BatchEdit
-// @Title 批量编辑
-// @Description 批量编辑
-// @Param	request	body []*request.DelBaseFromSciHqReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /sci_hq/edb_info/batch_edit [post]
-func (this *SciHqDataController) BatchEdit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req []*request.EditBaseFromSciHqReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-
-	indexIds := make([]int, 0)
-	classifyIds := make([]int, 0)
-	indexIdToclassifyId := make(map[int]int)
-	for _, v := range req {
-		if v.BaseFromSciHqIndexId <= 0 {
-			continue
-		}
-		if v.ClassifyId <= 0 {
-			continue
-		}
-		indexIds = append(indexIds, v.BaseFromSciHqIndexId)
-		classifyIds = append(classifyIds, v.ClassifyId)
-		indexIdToclassifyId[v.BaseFromSciHqIndexId] = v.ClassifyId
-	}
-	if len(indexIds) == 0 {
-		br.Msg = "请选择指标或指定正确的分类"
-		return
-	}
-	indexList, err := data_manage.GetSciHqIndexListByIndexIds(indexIds)
-	if err != nil {
-		br.Msg = "编辑失败"
-		br.ErrMsg = "获取指标失败,Err:" + err.Error()
-		return
-	}
-	classifySort, err := data_manage.GetSciHqClassifyMaxSortByClassifyIds(classifyIds)
-	if err != nil {
-		br.Msg = "编辑失败"
-		br.ErrMsg = "获取分类最大排序失败,Err:" + err.Error()
-		return
-	}
-	classifySortMap := make(map[int]int)
-	for _, v := range classifySort {
-		classifySortMap[v.ClassifyId] = v.MaxSort
-	}
-	classifyList, err := data_manage.GetSciHqClassifyListByIds(classifyIds)
-	if err != nil {
-		br.Msg = "编辑失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	existClassifyList := make(map[int]struct{})
-	for _, v := range classifyList {
-		existClassifyList[v.ClassifyId] = struct{}{}
-	}
-	//编辑指标
-	updateIndexList := make([]*data_manage.BaseFromSciHqIndex, 0)
-	for _, v := range indexList {
-		tmpClassifyId := indexIdToclassifyId[v.BaseFromSciHqIndexId]
-		if _, ok := existClassifyList[tmpClassifyId]; ok {
-			v.ClassifyId = tmpClassifyId
-			v.Sort = classifySortMap[tmpClassifyId] + 1
-			classifySortMap[tmpClassifyId] += 1
-			updateIndexList = append(updateIndexList, v)
-		}
-	}
-	err = data_manage.BatchModifySciHqIndexClassify(updateIndexList)
-	if err != nil {
-		br.Msg = "编辑失败"
-		br.ErrMsg = "编辑指标失败,Err:" + err.Error()
-		return
-	}
-
-	br.Msg = "操作成功"
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-
-}
-
-// EditSciHq
-// @Title 编辑卓创红期指标
-// @Description 编辑卓创红期指标接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /sci_hq/edit [post]
-func (this *SciHqDataController) EditSciHq() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromSciHqReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.BaseFromSciHqIndexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	//编辑指标
-	sciIndexInfo, errMsg, err := data.EditSciHqIndex(req.BaseFromSciHqIndexId, req.ClassifyId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		return
-	}
-	if err != nil {
-		br.Msg = "编辑失败"
-		br.ErrMsg = "编辑指标失败,Err:" + err.Error()
-		return
-	}
-
-	resp := response.EditSciHqIndexInfoResp{
-		BaseFromSciHqIndexId: sciIndexInfo.BaseFromSciHqIndexId,
-		IndexCode:            sciIndexInfo.IndexCode,
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// DeleteSciHqData
-// @Title 删除指标
-// @Description 删除指标接口
-// @Param	request	body data_manage.DelBaseFromSciReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /sci_hq/del [post]
-func (this *SciHqDataController) DeleteSciHqData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromSciHqReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromSciHqIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelSciHqData(req.BaseFromSciHqIndexId)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
-		}
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "删除成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ExportSciHqList
-// @Title 导出Sci数据
-// @Description 导出Sci数据
-// @Param   ClassifyId   query   int  true       "关键字搜索"
-// @Param   IndexCode   query   string  true       "指标编码"
-// @Success 200  导出成功
-// @router /export/sciHqList [get]
-func (this *SciHqDataController) ExportSciHqList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	classifyId, _ := this.GetInt("ClassifyId")
-	indexCode := this.GetString("IndexCode")
-	if classifyId < 0 {
-		br.Msg = "请选择分类"
-		return
-	}
-	secNameList := make([]*data_manage.BaseFromSciHqIndex, 0)
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	var condition string
-	var pars []interface{}
-	if classifyId > 0 {
-		childClassify, err := data_manage.GetChildSciHqClassifyListById(classifyId)
-		if err != nil {
-			br.Msg = "下载失败"
-			br.ErrMsg = "获取分类失败,Err:" + err.Error()
-			return
-		}
-		if len(childClassify) > 0 {
-			condition += `AND classify_id IN (` + utils.GetOrmInReplace(len(childClassify)) + `)`
-			for _, child := range childClassify {
-				pars = append(pars, child.ClassifyId)
-			}
-		} else {
-			condition += ` AND classify_id=?`
-			pars = append(pars, classifyId)
-		}
-	} else {
-		condition += ` AND classify_id=?`
-		pars = append(pars, classifyId)
-	}
-	if indexCode != "" {
-		condition += ` AND index_code=? `
-		pars = append(pars, indexCode)
-	}
-	frequencies, err := data_manage.GetSciHqFrequencyByCondition(condition, pars)
-	if err != nil {
-		fmt.Println("GetSciFrequency err:", err.Error())
-		utils.FileLog.Info("GetSciFrequency err:" + err.Error())
-		return
-	}
-	for _, frequency := range frequencies {
-		//获取指标
-		secNameList, err = data_manage.GetSciHqIndexByConditionAndFrequency(condition, *frequency, pars)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-		if len(secNameList) <= 0 {
-			fmt.Println("secNameList长度为0")
-			return
-		}
-		sheetNew, err := xlsxFile.AddSheet(*frequency)
-		if err != nil {
-			fmt.Println("新增Sheet失败", err.Error())
-			return
-		}
-		secNameRow := sheetNew.AddRow()
-		frequencyRow := sheetNew.AddRow()
-		unitRow := sheetNew.AddRow()
-		lastModifyDateRow := sheetNew.AddRow()
-
-		var indexIdList []int
-		for _, sv := range secNameList {
-			indexIdList = append(indexIdList, sv.BaseFromSciHqIndexId)
-		}
-		dataTimeList, err := data_manage.GetSciHqDataDataTimeByIndexId(indexIdList)
-		if err != nil {
-			fmt.Println("获取数据时间失败", err.Error())
-			return
-		}
-
-		// 添加excel左侧指标日期
-		setRowIndex := 4
-		for rk, dv := range dataTimeList {
-			rowIndex := setRowIndex + rk
-			row := sheetNew.Row(rowIndex)
-			displayDate, _ := time.Parse(utils.FormatDate, dv)
-			displayDateCell := row.AddCell()
-			style := new(xlsx.Style)
-			style.ApplyAlignment = true
-			style.Alignment.WrapText = true
-			displayDateCell.SetStyle(style)
-			displayDateCell.SetDate(displayDate)
-
-		}
-		for k, sv := range secNameList {
-			//获取数据
-			dataList, err := data_manage.GetSciHqIndexDataByCode(sv.IndexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			if k == 0 {
-				secNameRow.AddCell().SetValue("指标名称")
-				frequencyRow.AddCell().SetValue("频率")
-				unitRow.AddCell().SetValue("单位")
-				lastModifyDateRow.AddCell().SetValue("更新时间")
-				min := k * 3
-				sheetNew.SetColWidth(min, min, 15)
-			}
-			if len(dataList) == 0 {
-				continue
-			}
-			secNameRow.AddCell().SetValue(sv.IndexName)
-			frequencyRow.AddCell().SetValue(sv.Frequency)
-			unitRow.AddCell().SetValue(sv.Unit)
-
-			lastModifyDateRow.AddCell().SetValue(sv.ModifyTime.Format(utils.FormatDate))
-			dataInfoMap := make(map[string]*data_manage.BaseFromSciHqData)
-			for _, v := range dataList {
-				dataInfoMap[v.DataTime] = v
-			}
-
-			for rk, dtv := range dataTimeList {
-				rowIndex := setRowIndex + rk
-				row := sheetNew.Row(rowIndex)
-				displayDateCell := row.AddCell()
-				tmpData, ok := dataInfoMap[dtv]
-				if ok {
-					displayDateCell.SetValue(tmpData.Value)
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadnFilePath)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `卓创红期`
-	if indexCode != "" && len(secNameList) == 1 {
-		fileName = secNameList[0].IndexName
-	}
-	fileName += time.Now().Format("2006.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}
-
-// getSciHqClassifyTree 返回卓创红旗的树形结构
-func getSciHqClassifyTree(items []*data_manage.BaseFromSciHqClassifyItem, parentId int) []*data_manage.BaseFromSciHqClassifyItem {
-	res := make([]*data_manage.BaseFromSciHqClassifyItem, 0)
-	for _, item := range items {
-		if item.ParentId == parentId {
-			t := new(data_manage.BaseFromSciHqClassifyItem)
-			t.ClassifyId = item.ClassifyId
-			t.ClassifyName = item.ClassifyName
-			t.ParentId = item.ParentId
-			t.Level = item.Level
-			t.Sort = item.Sort
-			t.ModifyTime = item.ModifyTime
-			t.CreateTime = item.CreateTime
-			t.ClassifyNameEn = item.ClassifyNameEn
-			if item.UniqueCode == "" {
-				t.UniqueCode = strconv.Itoa(item.ClassifyId)
-			}
-			t.Children = getSciHqClassifyTree(items, item.ClassifyId)
-			res = append(res, t)
-		}
-	}
-	return res
-}

+ 0 - 790
controllers/oilchem_data.go

@@ -1,790 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// OilchemClassify
-// @title	获取隆众资讯分类列表
-// @Description	获取隆众资讯分类列表
-// @Success 200 {object} models.
-// @router /data/oilchem/classify [get]
-func (this *TradeCommonController) OilchemClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	classifies, e := data_manage.GetOilchemClassifyList()
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取隆众资讯分类数据分类失败, Err: " + e.Error()
-		return
-	}
-
-	br.Data = classifies
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// OilchemIndexList
-// @title	获取隆众资讯指标列表
-// @Description	获取隆众资讯指标列表
-// @Success 200 {object} models.
-// @router /data/oilchem/indexList [get]
-func (this *TradeCommonController) OilchemIndexList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	classifyId, _ := this.GetInt("ClassifyId")
-
-	var condition string
-	var pars []interface{}
-
-	if classifyId > 0 {
-		condition += ` AND b.classify_id=? `
-		pars = append(pars, classifyId)
-	}
-
-	//keyword := this.GetString("KeyWord")
-	//if keyword != "" {
-	//	condition += ` AND (index_code =? OR index_name LIKE ?)  `
-	//	pars = append(pars, keyword)
-	//	pars = append(pars, "%"+keyword+"%")
-	//}
-
-	indexList, e := data_manage.GetOilchemIndexViewList(condition, pars, startSize, pageSize)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取隆众资讯分类数据分类失败, Err: " + e.Error()
-		return
-	}
-	indexIdList := make([]int, 0)
-	for _, v := range indexList {
-		indexIdList = append(indexIdList, v.BaseFromOilchemIndexId)
-	}
-	dataList, err := data_manage.GetOilchemDataViewList(indexIdList)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取隆众资讯分类数据分类失败, Err: " + err.Error()
-		return
-	}
-	for i, v := range indexList {
-		for _, v1 := range dataList {
-			if v.BaseFromOilchemIndexId == v1.BaseFromOilchemIndexId {
-				indexList[i].DataTime = v1.DataTime
-				indexList[i].Value = v1.Value
-			}
-		}
-	}
-
-	total, err := data_manage.GetOilchemIndexViewListCount(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取隆众资讯分类数据分类失败, Err: " + err.Error()
-		return
-	}
-
-	page := paging.GetPaging(currentIndex, pageSize, total)
-
-	resp := data_manage.BaseFromOilchemIndexListResp{}
-	resp.List = indexList
-	resp.Paging = page
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// OilchemMineData
-// @title	获取隆众资讯详细数据列表
-// @Description	获取隆众资讯详细数据接口
-// @Param	ClassifyId query int true	"数据id"
-// @Param	GroupName query string true	"分组名"
-// @Param	Frequency query string true	"频度"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Success 200 {object} []data_manage.CoalmineDataResp
-// @router /data/oilchem/data [get]
-func (this *TradeCommonController) OilchemData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	var startSize int
-
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	indexCode := this.GetString("IndexCode")
-	if indexCode == "" {
-		br.Msg = "请选择指标"
-		br.ErrMsg = "请选择指标"
-		return
-	}
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	condition += ` AND index_code =? `
-	pars = append(pars, indexCode)
-
-	index, err := data_manage.GetOilchemIndexByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	dataList, err := data_manage.GetOilchemIndexData(condition, pars, startSize, pageSize)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	resp := data_manage.BaseFromOilchemIndexList{}
-
-	resp.BaseFromOilchemIndexId = index.BaseFromOilchemIndexId
-	resp.ClassifyId = index.ClassifyId
-	resp.IndexCode = index.IndexCode
-	resp.IndexName = index.IndexName
-	resp.Frequency = index.Frequency
-	resp.Unit = index.Unit
-	resp.EdbExist = index.EdbExist
-
-	total, err := data_manage.GetOilchemDataListCount(condition, pars)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-
-	if len(dataList) > 0 {
-		resp.ModifyTime = dataList[0].ModifyTime
-	}
-
-	resp.Paging = page
-	resp.DataList = dataList
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// CoalSearchList
-// @Title 隆众资讯模糊搜索
-// @Description 隆众资讯模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /data/oilchem/search [get]
-func (this *TradeCommonController) OilchemSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	//关键字
-	keyword := this.GetString("Keyword")
-
-	list, err := data_manage.GetOilchemItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// BatchIndexList
-// @Title 隆众资讯批量操作指标列表
-// @Description 隆众资讯批量操作指标列表
-// @Param   request	body   request.SciHqDataBatchListReq true "type json string"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
-// @router /data/oilchem/batch_list [post]
-func (this *TradeCommonController) BatchIndexList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req data_manage.OilchemDataBatchListReq
-	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	var condition string
-	var pars []interface{}
-	if req.KeyWord != "" {
-		condition += `AND (index_code=? OR index_name=?)`
-		pars = utils.GetLikeKeywordPars(pars, req.KeyWord, 2)
-	}
-	if req.IsSelectAll {
-		if len(req.SelectedId) > 0 {
-			condition += ` AND base_from_oilchem_index_id NOT IN (` + utils.GetOrmInReplace(len(req.SelectedId)) + `)`
-			pars = append(pars, req.SelectedId)
-		}
-	} else {
-		if len(req.SelectedId) > 0 {
-			condition += ` AND base_from_oilchem_index_id IN (` + utils.GetOrmInReplace(len(req.SelectedId)) + `)`
-			pars = append(pars, req.SelectedId)
-		}
-	}
-	if req.ClassifyId >= 0 {
-		condition += ` AND classify_id=?`
-		pars = append(pars, req.ClassifyId)
-	}
-
-	count, err := data_manage.GetOilchemIndexListCount(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	MaxLen := 30
-	if count > MaxLen {
-		br.Msg = "批量操作数量不能超过" + strconv.Itoa(MaxLen)
-		return
-	}
-	indexList, err := data_manage.GetOilchemIndexByCondition(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = indexList
-}
-
-// AddCheck
-// @Title 新增校验
-// @Description 新增校验
-// @Param	request	body request.BusinessDataBatchAddCheckReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /data/oilchem/add_check [post]
-func (this *TradeCommonController) AddCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req *data_manage.OilchemDataBatchAddCheckReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	codeMax := 30
-	codeLen := len(req.IndexCodes)
-	if len(req.IndexCodes) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-
-	if codeLen > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-	// 获取指标库已有指标
-	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_OILCHEM)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取自有数据已添加的指标失败, Err: " + e.Error()
-		return
-	}
-	existMap := make(map[string]*data_manage.EdbInfo)
-	for _, v := range existsEdb {
-		existMap[v.EdbCode] = v
-	}
-
-	// 查询选中的指标
-	cond := fmt.Sprintf(` AND index_code IN (%s)`, utils.GetOrmInReplace(codeLen))
-	pars := make([]interface{}, 0)
-	pars = append(pars, req.IndexCodes)
-	list, err := data_manage.GetOilchemIndexAndEdbInfoByCondition(cond, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取卓创红期原始指标列表失败, Err: " + err.Error()
-		return
-	}
-
-	resp := make([]*data_manage.BaseFromOilchemIndexView, 0)
-	for _, v := range list {
-		if v.EdbInfoId > 0 {
-			v.EdbExist = 1
-		}
-		resp = append(resp, v)
-	}
-
-	br.Data = resp
-	br.Msg = "校验成功"
-	br.Ret = 200
-	br.Success = true
-}
-
-// NameCheck
-// @Title 重名校验
-// @Description 批量新增
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /data/oilchem/name_check [post]
-func (c *TradeCommonController) NameCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		c.Data["json"] = br
-		c.ServeJSON()
-	}()
-	sysUser := c.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req []*data_manage.NameCheckEdbInfoReq
-	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	codeMax := 30
-	codeLen := len(req)
-	if codeLen > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-
-	type NameCheckResult struct {
-		EdbCode string
-		EdbName string
-		Exist   bool
-	}
-	indexNames := make([]string, 0)
-	resp := make([]*NameCheckResult, 0)
-	for _, v := range req {
-		v.EdbCode = strings.TrimSpace(v.EdbCode)
-		if v.EdbCode == "" {
-			br.Msg = "指标ID不可为空"
-			return
-		}
-		v.EdbName = strings.TrimSpace(v.EdbName)
-		if v.EdbName == "" {
-			br.Msg = "请输入指标名称"
-			return
-		}
-		indexNames = append(indexNames, v.EdbName)
-		resp = append(resp, &NameCheckResult{
-			EdbCode: v.EdbCode,
-			EdbName: v.EdbName,
-		})
-		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_OILCHEM, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取隆众资讯已存在信息失败,Err:" + err.Error()
-			return
-		}
-		if len(dataItems) <= 0 {
-			respItem, err := data.AddEdbData(utils.DATA_SOURCE_OILCHEM, v.EdbCode, v.Frequency)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				return
-			}
-			if respItem.Ret != 200 {
-				br.Msg = "未搜索到该指标"
-				br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + v.EdbCode
-				return
-			}
-		}
-	}
-
-	// 重名校验
-	edbList, e := data_manage.GetEdbInfoByNameArr(indexNames, utils.EDB_INFO_TYPE)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取重名指标失败, Err: " + e.Error()
-		return
-	}
-	nameExists := make(map[string]bool)
-	for _, v := range edbList {
-		nameExists[v.EdbName] = true
-	}
-	if len(nameExists) > 0 {
-		for _, v := range resp {
-			v.Exist = nameExists[v.EdbName]
-		}
-	}
-
-	br.Data = resp
-	br.Msg = "校验成功"
-	br.Ret = 200
-	br.Success = true
-}
-
-// BatchAdd
-// @Title 批量新增
-// @Description 批量新增
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /data/oilchem/batch_add [post]
-func (this *TradeCommonController) BatchAdd() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	deleteCache := true
-	cacheKey := "CACHE_EDB_INFO_BATCH_ADD_OILCHEM_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			_ = utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中,请稍后重试!"
-		br.ErrMsg = "系统处理中,请稍后重试!" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-	var req []*data_manage.AddEdbInfoReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if len(req) == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	if len(req) > 30 {
-		br.Msg = "批量添加指标数量不得超过30个"
-		return
-	}
-	for _, v := range req {
-		v.EdbCode = strings.TrimSpace(v.EdbCode)
-		if v.EdbCode == "" {
-			br.Msg = "指标ID不可为空"
-			return
-		}
-		v.EdbName = strings.TrimSpace(v.EdbName)
-		if v.EdbName == "" {
-			br.Msg = "请输入指标名称"
-			return
-		}
-		v.Frequency = strings.TrimSpace(v.Frequency)
-		if v.Frequency == "" {
-			br.Msg = "请选择频度"
-			return
-		}
-		v.Unit = strings.TrimSpace(v.Unit)
-		if v.Unit == "" {
-			br.Msg = "请输入单位"
-			return
-		}
-		if v.ClassifyId <= 0 {
-			br.Msg = "请选择分类"
-			return
-		}
-	}
-
-	// 限定同一时间最多批量新增30个指标
-	for _, v := range req {
-		var r data.OilchemIndexSource2EdbReq
-		r.EdbCode = v.EdbCode
-		r.EdbName = v.EdbName
-		r.Frequency = v.Frequency
-		r.Unit = v.Unit
-		r.ClassifyId = v.ClassifyId
-		r.AdminId = sysUser.AdminId
-		r.AdminRealName = sysUser.RealName
-
-		edbInfo, errMsg, skip, e := data.OilchemIndexSource2Edb(r, this.Lang)
-		if e != nil {
-			br.Msg = "操作失败"
-			if errMsg != "" {
-				br.Msg = errMsg
-			}
-			br.ErrMsg = e.Error()
-			return
-		}
-		if skip {
-			continue
-		}
-
-		// 新增操作日志
-		{
-			edbLog := new(data_manage.EdbInfoLog)
-			edbLog.EdbInfoId = edbInfo.EdbInfoId
-			edbLog.SourceName = edbInfo.SourceName
-			edbLog.Source = edbInfo.Source
-			edbLog.EdbCode = edbInfo.EdbCode
-			edbLog.EdbName = edbInfo.EdbName
-			edbLog.ClassifyId = edbInfo.ClassifyId
-			edbLog.SysUserId = sysUser.AdminId
-			edbLog.SysUserRealName = sysUser.RealName
-			edbLog.CreateTime = time.Now()
-			edbLog.Content = string(this.Ctx.Input.RequestBody)
-			edbLog.Status = "新增指标"
-			edbLog.Method = this.Ctx.Input.URI()
-			go data_manage.AddEdbInfoLog(edbLog)
-		}
-	}
-
-	br.Msg = "操作成功"
-	br.Ret = 200
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// ExportoilchemList
-// @Title 导出隆众资讯数据
-// @Description 导出隆众资讯数据
-// @Param   request	body request.ExportOilchemExcelReq true "type json string"
-// @Success 200  导出成功
-// @router /data/export/oilchemList [post]
-func (this *TradeCommonController) ExportoilchemList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	var req data_manage.ExportOilchemExcelReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	secNameList := make([]*data_manage.BaseFromOilchemIndex, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	var condition string
-	var pars []interface{}
-	if req.KeyWord != "" {
-		condition += `AND (index_code=? OR index_name=?)`
-		pars = utils.GetLikeKeywordPars(pars, req.KeyWord, 2)
-	}
-	if req.IsSelectedAll {
-		if len(req.IndexCode) > 0 {
-			condition += ` AND index_code NOT IN (` + utils.GetOrmInReplace(len(req.IndexCode)) + `)`
-			pars = append(pars, req.IndexCode)
-		}
-	} else {
-		if len(req.IndexCode) > 0 {
-			condition += ` AND index_code IN (` + utils.GetOrmInReplace(len(req.IndexCode)) + `)`
-			pars = append(pars, req.IndexCode)
-		}
-	}
-	if req.ClassifyId > 0 {
-		condition += ` AND classify_id=?`
-		pars = append(pars, req.ClassifyId)
-	}
-	frequencies, err := data_manage.GetOilchemFrequencyByCondition(condition, pars)
-	if err != nil {
-		fmt.Println("GetSciFrequency err:", err.Error())
-		utils.FileLog.Info("GetSciFrequency err:" + err.Error())
-		return
-	}
-	for _, frequency := range frequencies {
-		//获取指标
-		secNameList, err = data_manage.GetOilchemIndexByConditionAndFrequency(condition, *frequency, pars)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-		if len(secNameList) <= 0 {
-			fmt.Println("secNameList长度为0")
-			return
-		}
-
-		sheetNew, err := xlsxFile.AddSheet(*frequency)
-		if err != nil {
-			fmt.Println("新增Sheet失败", err.Error())
-			return
-		}
-
-		secNameRow := sheetNew.AddRow()
-		frequencyRow := sheetNew.AddRow()
-		unitRow := sheetNew.AddRow()
-		lastModifyDateRow := sheetNew.AddRow()
-
-		var indexIdList []int
-		for _, sv := range secNameList {
-			indexIdList = append(indexIdList, sv.BaseFromOilchemIndexId)
-		}
-		dataTimeList, err := data_manage.GetOilchemDataDataTimeByIndexId(indexIdList)
-		if err != nil {
-			fmt.Println("获取数据时间失败", err.Error())
-			return
-		}
-
-		// 添加excel左侧指标日期
-		setRowIndex := 4
-		for rk, dv := range dataTimeList {
-			rowIndex := setRowIndex + rk
-			row := sheetNew.Row(rowIndex)
-			displayDate, _ := time.Parse(utils.FormatDate, dv)
-			displayDateCell := row.AddCell()
-			style := new(xlsx.Style)
-			style.ApplyAlignment = true
-			style.Alignment.WrapText = true
-			displayDateCell.SetStyle(style)
-			displayDateCell.SetDate(displayDate)
-
-		}
-		for k, sv := range secNameList {
-			//获取数据
-			dataList, err := data_manage.GetOilchemIndexDataByCode(sv.IndexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			if k == 0 {
-				secNameRow.AddCell().SetValue("指标名称/Metric Name")
-				frequencyRow.AddCell().SetValue("频度/Frequency")
-				unitRow.AddCell().SetValue("单位/Unit")
-				lastModifyDateRow.AddCell().SetValue("更新时间/Update Time")
-				min := k * 3
-				sheetNew.SetColWidth(min, min, 15)
-			}
-			if len(dataList) == 0 {
-				continue
-			}
-			secNameRow.AddCell().SetValue(sv.IndexName)
-			frequencyRow.AddCell().SetValue(sv.Frequency)
-			unitRow.AddCell().SetValue(sv.Unit)
-
-			lastModifyDateRow.AddCell().SetValue(sv.ModifyTime)
-			dataInfoMap := make(map[string]*data_manage.BaseFromOilchemData)
-			for _, v := range dataList {
-				dataInfoMap[v.DataTime] = v
-			}
-
-			for rk, dtv := range dataTimeList {
-				rowIndex := setRowIndex + rk
-				row := sheetNew.Row(rowIndex)
-				displayDateCell := row.AddCell()
-				tmpData, ok := dataInfoMap[dtv]
-				if ok {
-					displayDateCell.SetValue(tmpData.Value)
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadnFilePath)
-	if err != nil {
-		//有指标无数据时先导出一遍空表
-		sheet, err := xlsxFile.AddSheet("无数据")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("")
-		err = xlsxFile.Save(downLoadnFilePath)
-		if err != nil {
-			br.Msg = "保存文件失败"
-			br.ErrMsg = "保存文件失败"
-			return
-		}
-	}
-	fileName := `隆众资讯`
-	if len(secNameList) > 0 {
-		fileName = secNameList[0].IndexName
-	}
-	fileName += time.Now().Format("2006.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}

+ 0 - 167
models/data_manage/baiinfo_data.go

@@ -1,167 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type BaiinfoClassify struct {
-	TypeName string `orm:"column(type_name)" description:"分类名称"`
-	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
-}
-
-type BaiinfoFrequency struct {
-	Frequency string `description:"频度"`
-}
-
-func GetBaiinfoFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err error) {
-	sql := ` SELECT frequency FROM base_from_baiinfo_index WHERE classify_id = ? `
-	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-type BaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
-	Interface              string
-	Name                   string
-	IndexCode              string
-	IndexName              string
-	Type1                  string `orm:"column(type_1)"`
-	Type2                  string `orm:"column(type_2)"`
-	Type3                  string `orm:"column(type_3)"`
-	Frequency              string
-	Unit                   string
-	ApiStartTime           string
-	ApiUpdateTime          string
-	StartTime              string
-	FinishTime             string
-	CreateTime             string
-	ModifyTime             string
-}
-
-func GetBaiinfoIndex(condition string, pars []interface{}) (items []*BaiinfoIndex, err error) {
-	sql := ` SELECT * FROM base_from_baiinfo_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY sort ASC, base_from_baiinfo_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type BaiinfoExportIndex struct {
-	TypeName   string
-	IndexCode  string
-	IndexName  string
-	Type1      string `orm:"column(type_1)"`
-	Type2      string `orm:"column(type_2)"`
-	Type3      string `orm:"column(type_3)"`
-	Frequency  string
-	Unit       string
-	ModifyTime string
-}
-
-func GetExportBaiinfoIndex(typeCodes []string) (items []*BaiinfoExportIndex, err error) {
-	if len(typeCodes) == 0 {
-		return
-	}
-	sql := ` SELECT *,CONCAT(type_2, "#", type_3) AS type_name FROM base_from_baiinfo_index WHERE CONCAT(type_2, "#", type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `) ORDER BY frequency ASC,index_code ASC`
-	err = global.DmSQL["data"].Raw(sql, typeCodes).Scan(&items).Error
-
-	return
-}
-
-func GetBaiinfoFrequency(classifyId int) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_baiinfo_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-func GetBaiinfoFrequencyByCode(code string) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_baiinfo_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	err = global.DmSQL["data"].Raw(sql, code).Scan(&items).Error
-
-	return
-}
-
-type BaiinfoIndexList struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
-	Interface              string
-	Name                   string
-	IndexCode              string
-	IndexName              string
-	Type1                  string `orm:"column(type_1)"`
-	Type2                  string `orm:"column(type_2)"`
-	Type3                  string `orm:"column(type_3)"`
-	Frequency              string
-	Unit                   string
-	ApiStartTime           string
-	ApiUpdateTime          string
-	StartTime              string
-	FinishTime             string
-	ModifyTime             string
-	DataList               []*BaiinfoIndexData
-	Paging                 *paging.PagingItem `description:"分页数据"`
-}
-
-type BaiinfoIndexData struct {
-	Value    string `orm:"column(value)" description:"日期"`
-	DataTime string `orm:"column(data_time)" description:"值"`
-}
-
-func GetBaiinfoIndexData(indexCode string, startSize, pageSize int) (items []*BaiinfoIndexData, err error) {
-	sql := ` SELECT *  FROM base_from_baiinfo_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-func GetBaiinfoIndexDataCount(indexCode string) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_baiinfo_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-
-	return
-}
-
-// GetBaiinfoItemList 模糊查询Baiinfo数据库指标列表
-func GetBaiinfoItemList(keyword string) (items []*BaiinfoIndex, err error) {
-	sql := "SELECT * FROM base_from_baiinfo_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
-
-	return
-}
-
-func GetBaiinfoIndexDataByCode(indexCode string) (items []*BaiinfoIndexData, err error) {
-	sql := ` SELECT *  FROM base_from_baiinfo_data WHERE index_code=? ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-func GetBaiinfoDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_baiinfo_index AS a
-				INNER JOIN base_from_baiinfo_data AS b ON a.index_code=b.index_code
-				WHERE a.classify_id=?
-				GROUP BY a.base_from_baiinfo_index_id
-			)AS t `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
-
-	return
-}
-
-type ExportBaiinfoDataMaxCount struct {
-	TypeName string
-	Count    int
-}
-
-type ExportBaiinfoIndexData struct {
-	Value     string `orm:"column(value)" description:"日期"`
-	DataTime  string `orm:"column(data_time)" description:"值"`
-	IndexCode string `orm:"column(index_code)" description:"指标编码"`
-}

+ 0 - 247
models/data_manage/base_from_baiinfo.go

@@ -1,247 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-type BaseFromBaiinfo struct {
-	BaseFromBaiinfoId int `orm:"column(base_from_baiinfo_id);pk" gorm:"primaryKey" `
-	Aid               int
-	Name              string
-	Interface         string
-	ApiUpdate         int
-	ApiUpdateType     string
-	ApiType           int
-	ApiTypeAll        string
-	Type1             string `orm:"column(type_1)"`
-	Type2             string `orm:"column(type_2)"`
-	Type3             string `orm:"column(type_3)"`
-	ApiStartTime      string
-	ApiUpdateTime     string
-	StartTime         string
-	FinishTime        string
-	AuthModule        string
-	AuthLang          string
-	ApiLabel          string
-	Enable            string
-	EditPerson        string
-	EditTime          string
-	AuthDur           int
-	AuthDurType       string
-}
-
-type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
-	ClassifyId             int
-	Interface              string
-	IndexCode              string
-	IndexName              string
-	Frequency              string
-	Unit                   string
-	Sort                   int
-	CreateTime             time.Time
-	ModifyTime             time.Time
-}
-
-type BaseFromBaiinfoData struct {
-	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk" gorm:"primaryKey" `
-	BaseFromBaiinfoIndexId int
-	IndexCode              string
-	DataTime               string
-	Value                  string
-	CreateTime             time.Time
-	ModifyTime             time.Time
-	DataTimestamp          int64
-}
-
-func GetBaseFromBaiinfoIndexByIndexCode(indexCode string) (item *BaseFromBaiinfoIndex, err error) {
-	sql := ` SELECT * FROM base_from_baiinfo_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoIndexCountByClassifyIds 获取分类下指标的个数
-func GetBaseFromBaiinfoIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	num := len(classifyIds)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, classifyIds).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoIndexByClassifyId 获取根据分类查询指标
-func GetBaseFromBaiinfoIndexByClassifyId(classifyId int) (list []*BaseFromBaiinfoIndex, err error) {
-	sql := `SELECT * FROM base_from_baiinfo_index WHERE classify_id =? ORDER BY sort ASC, base_from_baiinfo_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&list).Error
-
-	return
-}
-
-// GetBaiinfoIndexAll 用于分类展示
-func GetBaiinfoIndexAll() (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT base_from_baiinfo_index_id, classify_id, index_name as classify_name, index_code as base_from_baiinfo_index_code
-            FROM base_from_baiinfo_index ORDER BY sort ASC, base_from_baiinfo_index_id ASC `
-	err = o.Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoIndexByIndexId 根据指标id获取指标信息
-func GetBaseFromBaiinfoIndexByIndexId(indexId int) (item *BaseFromBaiinfoIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_baiinfo_index WHERE base_from_baiinfo_index_id=? `
-	err = o.Raw(sql, indexId).First(&item).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoIndexMaxSortByClassifyId 根据指标id获取指标信息
-func GetBaseFromBaiinfoIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT  COALESCE(MAX(sort), 0) as sort FROM base_from_baiinfo_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoIndexMinSortByClassifyId 获取最小不等于0的排序
-func GetBaseFromBaiinfoIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COALESCE(MIN(sort), 0) as sort FROM base_from_baiinfo_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-type BaseFromBaiinfoIndexType struct {
-	Type2 string `orm:"column(type_2)"`
-	Type3 string `orm:"column(type_3)"`
-}
-
-// GetBaseFromBaiinfoIndexType 获取历史指标信息类型
-func GetBaseFromBaiinfoIndexType() (list []BaseFromBaiinfoIndexType, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT type_2, type_3 from base_from_baiinfo_index where type_2 <> "" GROUP BY type_2, type_3`
-	err = o.Raw(sql).Scan(&list).Error
-
-	return
-}
-
-// MoveBaseFromBaiinfoIndex 移动指标分类
-func MoveBaseFromBaiinfoIndex(chartInfoId, classifyId int) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` UPDATE base_from_baiinfo_index
-			SET
-			  classify_id = ?, modify_time=NOW() 
-			WHERE base_from_baiinfo_index_id = ?`
-	err = o.Exec(sql, classifyId, chartInfoId).Error
-
-	return
-}
-
-// UpdateBaseFromBaiinfoIndexByClassifyId 根据指标id更新排序
-func UpdateBaseFromBaiinfoIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` update base_from_baiinfo_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
-	if prevIndexInfoId > 0 {
-		sql += ` ( sort > ? or (base_from_baiinfo_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	}
-	err = o.Exec(sql, classifyId, nowSort).Error
-
-	return
-}
-
-// MoveUpBaiinfoIndexBySort 往上移动
-func MoveUpBaiinfoIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_baiinfo_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	err = o.Exec(sql, classifyId, nextSort, currentSort).Error
-
-	return
-}
-
-// MoveDownBaiinfoIndexBySort 往下移动
-func MoveDownBaiinfoIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_baiinfo_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	err = o.Exec(sql, classifyId, prevSort, currentSort).Error
-
-	return
-}
-
-// GetFirstBaseFromBaiinfoIndexByClassifyId 获取当前分类下,且排序数相同 的排序第一条的数据
-func GetFirstBaseFromBaiinfoIndexByClassifyId(classifyId int) (item *BaseFromBaiinfoIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_baiinfo_index WHERE classify_id=? order by sort asc,base_from_baiinfo_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).First(&item).Error
-
-	return
-}
-
-// Update 更新Baiinfo指标基础信息
-func (item *BaseFromBaiinfoIndex) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(item).Error
-
-	return
-}
-
-// DeleteBaseFromBaiinfoIndexById 根据指标id删除对应的指标、指标数据
-func DeleteBaseFromBaiinfoIndexById(baiinfoIndexId int) (err error) {
-	o := global.DmSQL["data"]
-	to := o.Begin()
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	//删除指标
-	sql := `DELETE FROM base_from_baiinfo_index WHERE base_from_baiinfo_index_id = ? `
-	err = to.Exec(sql, baiinfoIndexId).Error
-	if err != nil {
-		return
-	}
-
-	//删除指标数据
-	sql = `DELETE FROM base_from_baiinfo_data WHERE base_from_baiinfo_index_id = ? `
-	err = to.Exec(sql, baiinfoIndexId).Error
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// EditBaiinfoIndexInfoResp 新增指标的返回
-type EditBaiinfoIndexInfoResp struct {
-	BaseFromBaiinfoIndexId int    `description:"指标ID"`
-	IndexCode              string `description:"指标code"`
-}
-
-type BaiinfoSingleDataResp struct {
-	BaseFromBaiinfoIndexId int
-	ClassifyId             int
-	Interface              string
-	Name                   string
-	IndexCode              string
-	IndexName              string
-	Frequency              string
-	Unit                   string
-	ApiStartTime           string
-	ApiUpdateTime          string
-	StartTime              string
-	FinishTime             string
-	CreateTime             string
-	ModifyTime             string
-	Data                   []*BaiinfoIndexData
-}

+ 0 - 258
models/data_manage/base_from_baiinfo_classify.go

@@ -1,258 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// BaseFromBaiinfoClassify SMM原始数据分类表
-type BaseFromBaiinfoClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
-	ClassifyName    string    `description:"分类名称"`
-	ParentId        int       `description:"父级id"`
-	SysUserId       int       `description:"创建人id"`
-	SysUserRealName string    `description:"创建人姓名"`
-	Level           int       `description:"层级"`
-	Sort            int       `description:"排序字段,越小越靠前,默认值:10"`
-	ModifyTime      time.Time `description:"修改时间"`
-	CreateTime      time.Time `description:"创建时间"`
-	ClassifyNameEn  string    `description:"英文分类名称"`
-}
-
-// AddBaseFromBaiinfoClassify 添加SMM原始数据分类
-func AddBaseFromBaiinfoClassify(item *BaseFromBaiinfoClassify) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.ClassifyId)
-
-	return
-}
-
-// GetBaseFromBaiinfoClassifyCount 获取分类名称的个数
-func GetBaseFromBaiinfoClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoClassifyEnCount
-// @Description: 获取英文分类名称的个数
-// @author: Roc
-// @datetime 2024-04-16 16:54:05
-// @param classifyNameEn string
-// @param parentId int
-// @return count int
-// @return err error
-func GetBaseFromBaiinfoClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_classify WHERE classify_name_en = ? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromBaiinfoClassifyById 通过分类id的获取分类信息
-func GetBaseFromBaiinfoClassifyById(classifyId int) (item *BaseFromBaiinfoClassify, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_baiinfo_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).First(&item).Error
-
-	return
-}
-
-// EditBaseFromBaiinfoClassify 修改SMM原始数据分类
-func EditBaseFromBaiinfoClassify(classifyId int, classifyName string) (err error) {
-	o := global.DmSQL["data"]
-	sql := `UPDATE base_from_baiinfo_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	err = o.Exec(sql, classifyName, classifyId).Error
-
-	return
-}
-
-// EditBaseFromBaiinfoClassifyEn
-// @Description: 修改SMM原始数据英文分类
-// @author: Roc
-// @datetime 2024-04-16 16:54:39
-// @param classifyId int
-// @param classifyNameEn string
-// @return err error
-func EditBaseFromBaiinfoClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	o := global.DmSQL["data"]
-	sql := `UPDATE base_from_baiinfo_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
-	err = o.Exec(sql, classifyNameEn, classifyId).Error
-
-	return
-}
-
-// UpdateBaseFromBaiinfoClassifySort 修改SMM原始数据分类的排序
-func UpdateBaseFromBaiinfoClassifySort(classifyId int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `UPDATE base_from_baiinfo_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	err = o.Exec(sql, classifyId).Error
-
-	return
-}
-
-type BaseFromBaiinfoClassifyItems struct {
-	ClassifyId               int    `description:"分类ID"`
-	BaseFromBaiinfoIndexId   int    `description:"指标类型ID"`
-	BaseFromBaiinfoIndexCode string `description:"指标唯一编码"`
-	ClassifyName             string `description:"分类名称"`
-	ClassifyNameEn           string `description:"英文分类名称"`
-	ParentId                 int    `description:"父级id"`
-	Level                    int    `description:"层级"`
-	Sort                     int    `description:"排序字段,越小越靠前,默认值:10"`
-	//UniqueCode         string                         `description:"唯一编码"`
-	//ModifyTime         time.Time                      `description:"修改时间"`
-	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromBaiinfoClassifyItems `gorm:"-" description:"下级"`
-}
-
-type BaseFromBaiinfoClassifyNameItems struct {
-	ClassifyId   int                                 `description:"分类ID"`
-	ClassifyName string                              `description:"分类名称"`
-	ParentId     int                                 `description:"父级id"`
-	Children     []*BaseFromBaiinfoClassifyNameItems `gorm:"-" description:"下级"`
-}
-
-type BaseFromBaiinfoClassifyResp struct {
-	List []*BaseFromBaiinfoClassifyItems
-}
-
-type BaseFromBaiinfoClassifyNameResp struct {
-	List []*BaseFromBaiinfoClassifyNameItems
-}
-
-type BaseFromBaiinfoClassifyItemsButton struct {
-	AddButton    bool `description:"是否可添加"`
-	OpButton     bool `description:"是否可编辑"`
-	DeleteButton bool `description:"是否可删除"`
-	MoveButton   bool `description:"是否可移动"`
-}
-
-// GetBaseFromBaiinfoClassifyByParentId 根据上级id获取当下的分类列表数据
-func GetBaseFromBaiinfoClassifyByParentId(parentId int) (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_baiinfo_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	err = o.Raw(sql, parentId).Scan(&items).Error
-
-	return
-}
-
-// GetAllBaseFromBaiinfoClassify 获取所有的分类列表数据
-func GetAllBaseFromBaiinfoClassify() (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_baiinfo_classify WHERE parent_id <> 0 order by sort asc,classify_id asc`
-	err = o.Raw(sql).Scan(&items).Error
-
-	return
-}
-
-type DeleteBaseFromBaiinfoClassifyReq struct {
-	ClassifyId int `description:"分类id"`
-	EdbInfoId  int `description:"指标id"`
-}
-
-type BaseFromBaiinfoClassifyListResp struct {
-	AllNodes      []*BaseFromBaiinfoClassifyItems
-	CanOpClassify bool `description:"是否允许操作分类"`
-}
-
-type BaseFromBaiinfoClassifySimplify struct {
-	ClassifyId   int    `description:"分类id"`
-	ClassifyName string `description:"分类名称"`
-	ParentId     int
-}
-
-// MoveUpBaiinfoIndexClassifyBySort 往上移动
-func MoveUpBaiinfoIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_baiinfo_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	err = o.Exec(sql, parentId, nextSort, currentSort).Error
-
-	return
-}
-
-// MoveDownBaiinfoIndexClassifyBySort 往下移动
-func MoveDownBaiinfoIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_baiinfo_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	err = o.Exec(sql, parentId, prevSort, currentSort).Error
-
-	return
-}
-
-// GetBaiinfoIndexClassifyMinSort 获取最小不等于0的排序
-func GetBaiinfoIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `select COALESCE(MIN(sort), 0) as sort from base_from_baiinfo_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).Scan(&sort).Error
-
-	return
-}
-
-// Update 更新分类基础信息
-func (BaseFromBaiinfoClassify *BaseFromBaiinfoClassify) Update(cols []string) (err error) {
-	o := global.DmSQL["data"]
-	err = o.Select(cols).Updates(BaseFromBaiinfoClassify).Error
-
-	return
-}
-
-type AddBaiinfoClassifyResp struct {
-	ClassifyId int
-}
-
-// DeleteBaiinfoClassifyByClassifyId 根据分类id删除对应的指标分类
-func DeleteBaiinfoClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := global.DmSQL["data"]
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-	//删除分类
-	sql := `DELETE FROM base_from_baiinfo_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Exec(sql, classifyIdList).Error
-
-	return
-}
-
-// AddBaiinfoClassifyMulti 批量新增SMM类别
-func AddBaiinfoClassifyMulti(list []*BaseFromBaiinfoClassify) (err error) {
-	o := global.DmSQL["data"]
-	err = o.CreateInBatches(list, utils.MultiAddNum).Error
-
-	return
-}
-
-// InitBaiinfoClassifySort 初始化sort值
-func InitBaiinfoClassifySort() (err error) {
-	o := global.DmSQL["data"]
-	sql := `UPDATE base_from_baiinfo_classify SET modify_time=NOW(), sort = classify_id`
-	err = o.Exec(sql).Error
-
-	return
-}
-
-// InitBaiinfoIndexClassifyId 历史数据的classifyId值
-func InitBaiinfoIndexClassifyId() (err error) {
-	o := global.DmSQL["data"]
-	sql := `UPDATE base_from_baiinfo_index s
-LEFT JOIN (
-SELECT
-	c1.classify_id,
-	CONCAT( c2.classify_name, c1.classify_name ) AS type_name 
-FROM
-	base_from_baiinfo_classify c1
-	LEFT JOIN base_from_baiinfo_classify c2 ON c1.parent_id = c2.classify_id 
-	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
-	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	err = o.Exec(sql).Error
-
-	return
-}

+ 0 - 137
models/data_manage/base_from_ccf.go

@@ -1,137 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromCCFIndex struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
-	ClassifyId         int
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	Sort               int
-	CreateTime         time.Time
-	ModifyTime         time.Time
-}
-
-type BaseFromCCFIndexList struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
-	ClassifyId         int
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	Sort               int
-	CreateTime         string
-	ModifyTime         string
-	DataList           []*BaseFromCCFData
-	Paging             *paging.PagingItem `description:"分页数据"`
-}
-
-type CCFSingleDataResp struct {
-	BaseFromCcfIndexId int
-	ClassifyId         int
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	CreateTime         string
-	ModifyTime         string
-	Data               []*CCFSingleData
-}
-
-type CCFSingleData struct {
-	Value    string `orm:"column(value)" description:"日期"`
-	DataTime string `orm:"column(data_time)" description:"值"`
-}
-
-func GetCCFIndex(condition string, pars []interface{}) (items []*BaseFromCCFIndexList, err error) {
-	sql := ` SELECT * FROM base_from_ccf_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC, base_from_ccf_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type CCFIndexDataCountGroup struct {
-	IndexCode string
-	Count     int
-}
-
-func GetCCFIndexDataCountGroup(indexCodes []string) (items []*CCFIndexDataCountGroup, err error) {
-	if len(indexCodes) <= 0 {
-		return
-	}
-	sql := ` SELECT COUNT(1) AS count, index_code FROM base_from_ccf_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) GROUP BY index_code`
-	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
-
-	return
-}
-
-func GetCCFIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromCCFData, err error) {
-	sql := ` SELECT *  FROM base_from_ccf_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-func GetCCFIndexDataByCodes(indexCode []string) (items []*BaseFromCCFData, err error) {
-	if len(indexCode) <= 0 {
-		return
-	}
-	sql := ` SELECT *  FROM base_from_ccf_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-type BaseFromCCFData struct {
-	BaseFromCcfDataId  int `orm:"column(base_from_ccf_data_id);pk" gorm:"primaryKey" `
-	BaseFromCcfIndexId int
-	IndexCode          string
-	DataTime           string
-	Value              string
-	CreateTime         string
-	ModifyTime         string
-	DataTimestamp      int64
-}
-
-type BaseFromCCFIndexSearchItem struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
-	ClassifyId         int
-	IndexCode          string
-	IndexName          string
-}
-
-// GetCCFItemList 模糊查询CCF数据库指标列表
-func GetCCFItemList(condition string) (items []*BaseFromCCFIndexSearchItem, err error) {
-	sql := "SELECT * FROM base_from_ccf_index WHERE 1=1"
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-func GetCCFIndexDataByCode(indexCode string) (list []*BaseFromCCFData, err error) {
-	sql := `SELECT * FROM base_from_ccf_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
-
-	return
-}
-
-func GetBaseFromCCFIndexByIndexCode(indexCode string) (list *BaseFromCCFIndex, err error) {
-	sql := ` SELECT * FROM base_from_ccf_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
-
-	return
-}

+ 0 - 55
models/data_manage/base_from_ccf_classify.go

@@ -1,55 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// BaseFromCCFClassify CCF原始数据分类表
-type BaseFromCCFClassify struct {
-	BaseFromCcfClassifyId int       `orm:"column(base_from_ccf_classify_id);pk" gorm:"primaryKey" `
-	ClassifyName          string    `description:"分类名称"`
-	ParentId              int       `description:"父级id"`
-	SysUserId             int       `description:"创建人id"`
-	SysUserRealName       string    `description:"创建人姓名"`
-	Level                 int       `description:"层级"`
-	Sort                  int       `description:"排序字段,越小越靠前,默认值:10"`
-	ModifyTime            time.Time `description:"修改时间"`
-	CreateTime            time.Time `description:"创建时间"`
-}
-
-// GetBaseFromCCFClassify 获取所有分类
-func GetBaseFromCCFClassify() (items []*BaseFromCCFClassify, err error) {
-	sql := ` SELECT * FROM base_from_ccf_classify ORDER BY parent_id ASC, sort ASC, base_from_ccf_classify_id ASC`
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// BaseFromCCFClassifyItem CCF数据分类信息
-type BaseFromCCFClassifyItem struct {
-	ClassifyId   int                        `description:"分类ID"`
-	ClassifyName string                     `description:"分类名称"`
-	ParentId     int                        `description:"父级id"`
-	Level        int                        `description:"层级"`
-	Sort         int                        `description:"排序字段"`
-	CreateTime   string                     `description:"创建时间"`
-	ModifyTime   string                     `description:"修改时间"`
-	Child        []*BaseFromCCFClassifyItem `gorm:"-" description:"子分类"`
-}
-
-func (y *BaseFromCCFClassify) Format2Item(origin *BaseFromCCFClassify) (item *BaseFromCCFClassifyItem) {
-	if origin == nil {
-		return
-	}
-	item = new(BaseFromCCFClassifyItem)
-	item.ClassifyId = origin.BaseFromCcfClassifyId
-	item.ClassifyName = origin.ClassifyName
-	item.ParentId = origin.ParentId
-	item.Level = origin.Level
-	item.Sort = origin.Sort
-	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
-	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
-	return
-}

+ 0 - 38
models/data_manage/base_from_changes_visitors_covid.go

@@ -1,38 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-)
-
-func GetVisitorsCovidLastDate() (last_date string, err error) {
-	sql := ` SELECT max(a.day) AS last_date FROM base_from_changes_visitors_covid AS a `
-	err = global.DmSQL["data"].Raw(sql).Scan(&last_date).Error
-
-	return
-}
-
-type BaseFromChangesVisitorsCovid struct {
-	Id                  int
-	Entity              string `description:"国家"`
-	Code                string `description:"国家编码"`
-	EdbCode             string `description:"指标ID"`
-	Day                 string `description:"统计的日期"`
-	RetailAndRecreation string `description:"零售和娱乐场所"`
-	GroceryAndPharmacy  string `description:"杂货店和药房"`
-	Residential         string `description:"居家"`
-	TransitStations     string `description:"公共交通车站"`
-	Parks               string `description:"公园"`
-	Workplaces          string `description:"工作场所"`
-	Total               string `description:"总计"`
-	CreateTime          string `description:"创建时间"`
-	ModifyTime          string `description:"修改时间"`
-}
-
-func GetVisitorsCovidList(day string) (list []*BaseFromChangesVisitorsCovid, err error) {
-	sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE day=? `
-
-	sql += ` ORDER BY entity ASC `
-	err = global.DmSQL["data"].Raw(sql, day).Scan(&list).Error
-
-	return
-}

+ 0 - 160
models/data_manage/base_from_eia_stero.go

@@ -1,160 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-// BaseFromEiaSteoIndex EiaSteo指标
-type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
-	BaseFromEiaSteoClassifyId int       `description:"指标分类id"`
-	IndexCode                 string    `description:"指标编码"`
-	IndexName                 string    `description:"指标名称(中文名称)"`
-	IndexNameOriginal         string    `description:"指标名称(原始名称)"`
-	Frequency                 string    `description:"频度"`
-	Level                     int       `description:"指标层级(原始层级)"`
-	Unit                      string    `description:"单位"`
-	Super                     string    `description:"我也不知道是个啥,反正先存起来,万一用到了呢"`
-	Precision                 int       `description:"精度,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	LastHistorical            string    `description:"最近的历史记录,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	Description               string    `description:"备注信息,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	IsMappable                int       `description:"是否可映射,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	StartDate                 time.Time `description:"开始日期"`
-	EndDate                   time.Time `description:"结束日期"`
-	ModifyTime                time.Time `description:"最新更新时间"`
-	CreateTime                time.Time `description:"创建时间"`
-}
-
-// BaseFromEiaSteoIndexItem EiaSteo指标
-type BaseFromEiaSteoIndexItem struct {
-	BaseFromEiaSteoIndexId    int    `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
-	BaseFromEiaSteoClassifyId int    `description:"指标分类id"`
-	IndexCode                 string `description:"指标编码"`
-	IndexName                 string `description:"指标名称(中文名称)"`
-	IndexNameOriginal         string `description:"指标名称(原始名称)"`
-	Frequency                 string `description:"频度"`
-	Level                     int    `description:"指标层级(原始层级)"`
-	Unit                      string `description:"单位"`
-	Super                     string `description:"我也不知道是个啥,反正先存起来,万一用到了呢"`
-	Precision                 int    `description:"精度,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	LastHistorical            string `description:"最近的历史记录,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	Description               string `description:"备注信息,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	IsMappable                int    `description:"是否可映射,我也不知道会不会用到,反正先存起来,万一用到了呢"`
-	StartDate                 string `description:"开始日期"`
-	EndDate                   string `description:"结束日期"`
-	ModifyTime                string `description:"最新更新时间"`
-	CreateTime                string `description:"创建时间"`
-}
-
-// BaseFromEiaSteoClassify EiaSteo分类
-type BaseFromEiaSteoClassify struct {
-	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk" gorm:"primaryKey" `
-	ClassifyName              string    `description:"分类名称(中文名称)"`
-	ClassifyNameOriginal      string    `description:"分类名称(原始名称)"`
-	ModifyTime                time.Time `description:"最新更新时间"`
-	CreateTime                time.Time `description:"创建时间"`
-}
-
-// BaseFromEiaSteoData EiaSteo数据表
-type BaseFromEiaSteoData struct {
-	BaseFromEiaSteoDataId  int       `orm:"column(base_from_eia_steo_data_id);pk" gorm:"primaryKey" `
-	BaseFromEiaSteoIndexId int       `description:"指标id"`
-	IndexCode              string    `description:"指标编码"`
-	DataTime               time.Time `description:"数据日期"`
-	Value                  float64   `description:"数据值"`
-	ModifyTime             time.Time `description:"最新更新时间"`
-	CreateTime             time.Time `description:"创建时间"`
-}
-
-// BaseFromEiaSteoDataItem EiaSteo数据
-type BaseFromEiaSteoDataItem struct {
-	BaseFromEiaSteoDataId  int     `orm:"column(base_from_eia_steo_data_id);pk" gorm:"primaryKey" `
-	BaseFromEiaSteoIndexId int     `description:"指标id"`
-	IndexCode              string  `description:"指标编码"`
-	DataTime               string  `description:"数据日期"`
-	Value                  float64 `description:"数据值"`
-	ModifyTime             string  `description:"最新更新时间"`
-	CreateTime             string  `description:"创建时间"`
-}
-
-// GetEiaSteoClassifyList 获取分类列表
-func GetEiaSteoClassifyList() (items []*BaseFromEiaSteoClassify, err error) {
-	sql := ` SELECT * FROM base_from_eia_steo_classify  ORDER BY base_from_eia_steo_classify_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-type EiaSteoIndexListResp struct {
-	BaseFromEiaSteoIndexId    int                `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
-	BaseFromEiaSteoClassifyId int                `description:"指标分类id"`
-	IndexCode                 string             `description:"指标编码"`
-	IndexName                 string             `description:"指标名称(中文名称)"`
-	Unit                      string             `description:"单位"`
-	Frequency                 string             `description:"频度"`
-	StartDate                 string             `description:"开始日期"`
-	EndDate                   string             `description:"结束日期"`
-	ModifyTime                string             `description:"最新更新时间"`
-	CreateTime                string             `description:"创建时间"`
-	Paging                    *paging.PagingItem `description:"分页数据"`
-	DataList                  []*BaseFromEiaSteoDataItem
-}
-
-// GetEiaSteoIndexList 获取指标列表
-func GetEiaSteoIndexList(condition string, pars []interface{}) (items []*BaseFromEiaSteoIndex, err error) {
-	sql := ` SELECT *  FROM base_from_eia_steo_index WHERE 1=1  `
-	sql += condition
-	sql += ` ORDER BY base_from_eia_steo_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// GetEiaSteoIndexDataCount 获取指标数据总数
-func GetEiaSteoIndexDataCount(indexCode string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM base_from_eia_steo_data where index_code = ? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-
-	return
-}
-
-// GetEiaSteoIndexDataList 获取指标数据总数列表
-func GetEiaSteoIndexDataList(indexCode string, startSize, pageSize int) (items []*BaseFromEiaSteoDataItem, err error) {
-	//sql := ` SELECT *  FROM mb_index_main_data WHERE INDEX_CODE=? ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC LIMIT ?,?`
-	sql := ` SELECT * FROM base_from_eia_steo_data AS a WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-// GetEiaSteoItemList 模糊查询EiaSteo数据库指标列表
-func GetEiaSteoItemList(keyword string) (items []*BaseFromEiaSteoIndexItem, err error) {
-	sql := "SELECT * FROM base_from_eia_steo_index WHERE index_name LIKE ?  OR index_code like ?"
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).Scan(&items).Error
-
-	return
-}
-
-// GetEiaSteoDateList 根据指标code获取日期数据
-func GetEiaSteoDateList(indexCodeList []string) (items []*BaseFromEiaSteoDataItem, err error) {
-	num := len(indexCodeList)
-	if num <= 0 {
-		return
-	}
-
-	sql := ` SELECT data_time FROM base_from_eia_steo_data WHERE index_code IN(` + utils.GetOrmInReplace(num) + `)  GROUP BY data_time ORDER BY data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, indexCodeList).Scan(&items).Error
-
-	return
-}
-
-// GetBaseFromEiaSteoIndexByCode 根据指标code获取指标信息
-func GetBaseFromEiaSteoIndexByCode(indexCode string) (item *BaseFromEiaSteoIndex, err error) {
-	sql := `SELECT * FROM base_from_eia_steo_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
-
-	return
-}

+ 0 - 265
models/data_manage/base_from_fenwei.go

@@ -1,265 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromFenweiIndex struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
-	ClassifyId    int
-	IndexCode     string
-	IndexName     string
-	Frequency     string
-	Unit          string
-	Sort          int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-}
-
-type BaseFromFenweiIndexList struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
-	ClassifyId    int
-	IndexCode     string
-	IndexName     string
-	Frequency     string
-	Unit          string
-	Sort          int
-	CreateTime    string
-	ModifyTime    string
-	DataList      []*BaseFromFenweiData
-	Paging        *paging.PagingItem `description:"分页数据"`
-	EdbInfoId     int                `description:"指标库主键id"`
-}
-
-type FenweiSingleDataResp struct {
-	FenweiIndexId int
-	ClassifyId    int
-	IndexCode     string
-	IndexName     string
-	Frequency     string
-	Unit          string
-	CreateTime    string
-	ModifyTime    string
-	Data          []*FenweiSingleData
-	EdbInfoId     int `description:"指标库主键id"`
-}
-
-type FenweiSingleData struct {
-	Value    string `orm:"column(value)" description:"日期"`
-	DataTime string `orm:"column(data_time)" description:"值"`
-}
-
-// BaseFromFenWeiIndexBatchAddCheckReq 校验编码是否存在请求参数
-type BaseFromFenWeiIndexBatchAddCheckReq struct {
-	IndexCodes []string `form:"IndexCodes" description:"指标编码列表"`
-}
-
-// IndexCheckData 校验编码是否存在
-type FenWeiIndexCheckData struct {
-	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:"单位"`
-	EdbInfoId  int    `json:"edb_info_id" description:"指标库主键id"`
-	UniqueCode string `json:"unique_code" description:"指标库唯一编码"`
-	ClassifyId int    `json:"classify_id" description:"分类id"`
-}
-
-// NameCheckResult 校验名称是否存在
-type FenWeiNameCheckResult struct {
-	IndexCode string `from:"EdbCode" description:"edb编码"`
-	IndexName string `from:"EdbName" description:"edb名称"`
-	Exist     bool
-}
-
-// FenWeiIndexAddReq 指标添加vo
-type FenWeiIndexAddReq struct {
-	EdbCode       string `description:"指标编码"`
-	EdbName       string `description:"指标名称"`
-	Frequency     string `description:"频度"`
-	Unit          string `description:"单位"`
-	ClassifyId    int    `description:"分类ID"`
-	AdminId       int    `description:"管理员ID"`
-	AdminRealName string `description:"管理员名称"`
-}
-
-type BaseFromFenWeiIndexPage struct {
-	List   []*BaseFromFenweiIndex `description:"指标列表"`
-	Paging *paging.PagingItem     `description:"分页数据"`
-}
-
-func GetFenweiIndex(condition string, pars []interface{}) (items []*BaseFromFenweiIndexList, err error) {
-	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC, fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type FenweiIndexDataCountGroup struct {
-	IndexCode string
-	Count     int
-}
-
-func GetFenweiIndexDataCountGroup(indexCodes []string) (items []*FenweiIndexDataCountGroup, err error) {
-	if len(indexCodes) <= 0 {
-		return
-	}
-	sql := ` SELECT COUNT(1) AS count, index_code FROM base_from_fenwei_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) GROUP BY index_code`
-	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
-
-	return
-}
-
-func GetFenweiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromFenweiData, err error) {
-	sql := ` SELECT *  FROM base_from_fenwei_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-func GetFenweiIndexDataByCodes(indexCode []string) (items []*BaseFromFenweiData, err error) {
-	if len(indexCode) <= 0 {
-		return
-	}
-	sql := ` SELECT *  FROM base_from_fenwei_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-type BaseFromFenweiData struct {
-	FenweiDataId  int `orm:"column(fenwei_data_id);pk" gorm:"primaryKey" `
-	FenweiIndexId int
-	IndexCode     string
-	DataTime      string
-	Value         string
-	CreateTime    string
-	ModifyTime    string
-	DataTimestamp int64
-}
-
-type BaseFromFenweiIndexSearchItem struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
-	ClassifyId    int
-	IndexCode     string
-	IndexName     string
-}
-
-// GetFenweiItemList 模糊查询汾渭数据库指标列表
-func GetFenweiItemList(condition string) (items []*BaseFromFenweiIndexSearchItem, err error) {
-	sql := "SELECT * FROM base_from_fenwei_index WHERE 1=1"
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-func GetFenweiIndexDataByCode(indexCode string) (list []*BaseFromFenweiData, err error) {
-	sql := `SELECT * FROM base_from_fenwei_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
-
-	return
-}
-
-func GetBaseFromFenweiIndexByIndexCode(indexCode string) (list *BaseFromFenweiIndex, err error) {
-	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
-
-	return
-}
-
-// GetFenWeiIndexFrequency 获取指标频度
-func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency 
-        FROM base_from_fenwei_index 
-        WHERE frequency is not null`
-
-	// 如果 classifyId > 0,则添加该条件
-	if classifyId > 0 {
-		sql += ` AND classify_id = ?`
-	}
-
-	sql += ` ORDER BY FIELD(frequency, '日度', '周度', '月度', '季度', '半年度', '年度')`
-
-	if classifyId > 0 {
-		err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
-	} else {
-		err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-	}
-
-	return items, err
-}
-
-// GetFenWeiIndexByCodeAndClassify 根据指标编码和分类查询 indexCode非必传
-func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency *string) (items []*BaseFromFenweiIndex, err error) {
-
-	// SQL 查询语句
-	sql := `SELECT a.index_code, a.index_name, a.frequency, a.unit, MAX(b.modify_time) AS modify_time
-			FROM base_from_fenwei_index AS a
-			INNER JOIN base_from_fenwei_data AS b ON a.fenwei_index_id = b.fenwei_index_id
-			WHERE 1=1`
-
-	var params []interface{}
-
-	if classifyId != 0 {
-		sql += ` AND a.classify_id = ?`
-		params = append(params, classifyId)
-	}
-
-	// 如果 indexCode 不为空,增加过滤条件
-	if indexCode != "" {
-		sql += ` AND a.index_code = ?`
-		params = append(params, indexCode)
-	}
-
-	if frequency != nil {
-		sql += ` AND a.frequency = ?`
-		params = append(params, *frequency)
-	}
-
-	sql += ` GROUP BY a.index_code, a.index_name, a.frequency, a.unit`
-
-	err = global.DmSQL["data"].Raw(sql, params...).Scan(&items).Error
-	if err != nil {
-		return nil, err
-	}
-	return
-}
-
-// GetBaseFromFenWeiDataByIndexCode 根据指标编码查询
-func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenweiData, err error) {
-	sql := `SELECT * FROM base_from_fenwei_data WHERE index_code=? ORDER BY data_time desc`
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-// 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 `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// GetFenWeiIndexInfoPage 分页查询指标信息
-func GetFenWeiIndexInfoPage(condition string, pars []interface{}) (items []*BaseFromFenweiIndex, err error) {
-	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-
-}

+ 0 - 68
models/data_manage/base_from_fenwei_classify.go

@@ -1,68 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// BaseFromFenweiClassify 汾渭原始数据分类表
-type BaseFromFenweiClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
-	ClassifyName    string    `description:"分类名称"`
-	ParentId        int       `description:"父级id"`
-	SysUserId       int       `description:"创建人id"`
-	SysUserRealName string    `description:"创建人姓名"`
-	Level           int       `description:"层级"`
-	Sort            int       `description:"排序字段,越小越靠前,默认值:10"`
-	ModifyTime      time.Time `description:"修改时间"`
-	CreateTime      time.Time `description:"创建时间"`
-}
-
-// GetBaseFromFenweiClassify 获取所有分类
-func GetBaseFromFenweiClassify() (items []*BaseFromFenweiClassify, err error) {
-	sql := ` SELECT * FROM base_from_fenwei_classify ORDER BY parent_id ASC, sort ASC, classify_id ASC`
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// BaseFromFenweiClassifyItem 汾渭数据分类信息
-type BaseFromFenweiClassifyItem struct {
-	ClassifyId   int                           `description:"分类ID"`
-	ClassifyName string                        `description:"分类名称"`
-	ParentId     int                           `description:"父级id"`
-	Level        int                           `description:"层级"`
-	Sort         int                           `description:"排序字段"`
-	CreateTime   string                        `description:"创建时间"`
-	ModifyTime   string                        `description:"修改时间"`
-	Child        []*BaseFromFenweiClassifyItem `description:"子分类"`
-}
-
-func (y *BaseFromFenweiClassify) Format2Item(origin *BaseFromFenweiClassify) (item *BaseFromFenweiClassifyItem) {
-	if origin == nil {
-		return
-	}
-	item = new(BaseFromFenweiClassifyItem)
-	item.ClassifyId = origin.ClassifyId
-	item.ClassifyName = origin.ClassifyName
-	item.ParentId = origin.ParentId
-	item.Level = origin.Level
-	item.Sort = origin.Sort
-	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
-	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
-	return
-}
-
-// GetFenweiClassifyItemByClassifyId 根据分类id查询分类信息
-func GetFenweiClassifyItemByClassifyId(classifyId int) (item *BaseFromFenweiClassifyItem, err error) {
-	sql := ` SELECT * FROM base_from_fenwei_classify WHERE classify_id = ?`
-	var origin BaseFromFenweiClassify
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&origin).Error
-	if err != nil {
-		return
-	}
-	item = origin.Format2Item(&origin)
-
-	return
-}

+ 0 - 189
models/data_manage/base_from_mtjh.go

@@ -1,189 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int       `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
-	IndexName             string    `description:"持买单量指标名称"`
-	IndexCode             string    `description:"持买单量指标编码"`
-	CreateTime            time.Time `description:"时间"`
-	Area                  string    `description:"区域"`
-	Port                  string    `description:"港口或码头"`
-	Variety               string    `description:"品种"`
-	Unit                  string    `description:"单位"`
-	Frequency             string    `description:"频率"`
-}
-
-type BaseFromMtjhIndex struct {
-	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk" gorm:"primaryKey" `
-	IndexName           string    `description:"持买单量指标名称"`
-	IndexCode           string    `description:"持买单量指标编码"`
-	DealValue           string    `description:"成交量"`
-	DataTime            string    `description:"数据日期"`
-	Area                string    `description:"区域"`
-	Port                string    `description:"港口或码头"`
-	Unit                string    `description:"单位"`
-	Frequency           string    `description:"频率"`
-	Variety             string    `description:"品种"`
-	CreateTime          time.Time `description:"插入时间"`
-	ModifyTime          time.Time `description:"修改时间"`
-}
-
-type BaseFromMtjhIndexItem struct {
-	BaseFromMtjhIndexId int    `orm:"column(base_from_mtjh_index_id);pk" gorm:"primaryKey" `
-	IndexName           string `description:"持买单量指标名称"`
-	IndexCode           string `description:"持买单量指标编码"`
-	DealValue           string `description:"成交量"`
-	DataTime            string `description:"数据日期"`
-	Area                string `description:"区域"`
-	Port                string `description:"港口或码头"`
-	Unit                string `description:"单位"`
-	Frequency           string `description:"频率"`
-	Variety             string `description:"品种"`
-	CreateTime          string `description:"插入时间"`
-	ModifyTime          string `description:"修改时间"`
-}
-
-func GetMtjhClassifyList() (list []*BaseFromMtjhMapping, err error) {
-	sql := "SELECT * FROM base_from_mtjh_mapping group by area"
-	err = global.DmSQL["data"].Raw(sql).Scan(&list).Error
-
-	return
-}
-
-type BaseFromMtjhMappingItem struct {
-	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
-	IndexName             string `description:"持买单量指标名称"`
-	IndexCode             string `description:"持买单量指标编码"`
-	CreateTime            string `description:"时间"`
-	Area                  string `description:"区域"`
-	Port                  string `description:"港口或码头"`
-	Variety               string `description:"品种"`
-	Unit                  string `description:"单位"`
-	Frequency             string `description:"频率"`
-}
-
-func GetMtjhMapping(condition string, pars []interface{}) (items []*BaseFromMtjhMappingItem, err error) {
-	sql := ` SELECT * FROM base_from_mtjh_mapping WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY base_from_mtjh_mapping_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type BaseFromMtjhIndexList struct {
-	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
-	IndexName             string `description:"持买单量指标名称"`
-	IndexCode             string `description:"持买单量指标编码"`
-	Area                  string `description:"区域"`
-	Port                  string `description:"港口或码头"`
-	Unit                  string `description:"单位"`
-	Frequency             string `description:"频率"`
-	CreateTime            string `description:"插入时间"`
-	ModifyTime            string `description:"修改时间"`
-	Variety               string `description:"品种"`
-	DataList              []*BaseFromMtjhIndexItem
-	Paging                *paging.PagingItem `description:"分页数据"`
-}
-
-func GetMtjhIndexDataCount(indexCode string) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_mtjh_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-
-	return
-}
-
-func GetMtjhIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromMtjhIndexItem, err error) {
-	sql := ` SELECT *  FROM base_from_mtjh_index WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-// GetMtjhItemList 模糊查询煤炭江湖数据库指标列表
-func GetMtjhItemList(keyword string) (items []*BaseFromMtjhMappingItem, err error) {
-	sql := "SELECT * FROM base_from_mtjh_mapping WHERE CONCAT(index_name,index_code) LIKE ? "
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
-
-	return
-}
-
-// 查询数据
-func GetBaseFromMtjhIndexByCode(indexCode string) (items []*BaseFromMtjhIndexItem, err error) {
-	sql := `SELECT * FROM base_from_mtjh_index WHERE index_code=? ORDER BY data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-// GetMtjhMappingItemByCode
-func GetMtjhMappingItemByCode(indexCode string) (item *BaseFromMtjhMappingItem, err error) {
-	o := global.DmSQL["data"]
-	sql := "SELECT * FROM base_from_mtjh_mapping WHERE index_code=? "
-	err = o.Raw(sql, indexCode).First(&item).Error
-
-	return
-}
-
-// GetMtjhFrequencyByArea
-func GetMtjhFrequencyByArea(area string) (items []*string, err error) {
-	sql := "SELECT frequency FROM base_from_mtjh_index WHERE area=?  group by area "
-	err = global.DmSQL["data"].Raw(sql, area).Scan(&items).Error
-
-	return
-}
-
-func GetClassifyMtjhByArea(area string) (items []*string, err error) {
-	sql := `SELECT DISTINCT index_code FROM base_from_mtjh_index WHERE area=? `
-	err = global.DmSQL["data"].Raw(sql, area).Scan(&items).Error
-
-	return
-}
-
-func GetCoalMtjhMaxCount(area string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT
-	COALESCE(MAX(t.num), 0) AS count 
-FROM
-	(
-	SELECT
-		COUNT( 1 ) AS num 
-	FROM
-		base_from_mtjh_index 
-	WHERE
-		area =? 
-GROUP BY
-	index_name ) AS t `
-	err = o.Raw(sql, area).Scan(&count).Error
-
-	return
-}
-
-func GetMtjhCount(indexCode string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT
-		COUNT( 1 ) AS num 
-	FROM
-		base_from_mtjh_index
-	WHERE
-		index_code =? `
-	err = o.Raw(sql, indexCode).Scan(&count).Error
-
-	return
-}
-
-func GetMtjhIndexLatestDate(indexCode string) (ModifyTime string, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT modify_time FROM base_from_mtjh_index WHERE index_code=? ORDER BY modify_time DESC limit 1 `
-	err = o.Raw(sql, indexCode).Scan(&ModifyTime).Error
-
-	return
-}

+ 0 - 102
models/data_manage/base_from_national_statistics_classify.go

@@ -1,102 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// BaseFromNationalStatisticsClassify 国统局-指标分类
-type BaseFromNationalStatisticsClassify struct {
-	BaseFromNationalStatisticsClassifyId int       `orm:"column(base_from_national_statistics_classify_id);pk" gorm:"primaryKey" `
-	ClassifyName                         string    `description:"分类名称"`
-	Id                                   string    `description:"分类ID(字符串)"`
-	Dbcode                               string    `description:"dbcode"`
-	Wdcode                               string    `description:"wdcode"`
-	Pid                                  string    `description:"父级分类ID"`
-	IsParent                             int       `description:"是否存在子分类: 0-否; 1-是"`
-	CreateTime                           time.Time `description:"创建时间"`
-	ModifyTime                           time.Time `description:"更新时间"`
-}
-
-func (m *BaseFromNationalStatisticsClassify) TableName() string {
-	return "base_from_national_statistics_classify"
-}
-
-func (m *BaseFromNationalStatisticsClassify) Create() (err error) {
-	err = global.DmSQL["data"].Create(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) CreateMulti(items []*BaseFromNationalStatisticsClassify) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) Del() (err error) {
-	sql := `DELETE FROM base_from_national_statistics_classify WHERE base_from_national_statistics_classify_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsClassifyId).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) GetItemById(id int) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_classify WHERE base_from_national_statistics_classify_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_classify WHERE 1=1 `
-	sql += condition
-	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromNationalStatisticsClassify, err error) {
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type BaseFromNationalStatisticsClassifyItem struct {
-	ClassifyId   int                                       `description:"分类ID"`
-	ClassifyName string                                    `description:"分类名称"`
-	ParentId     int                                       `description:"父级分类ID"`
-	ParentIds    []int                                     `description:"父级分类ID集合-用于前端的定位"`
-	Dbcode       string                                    `description:"数据库编码"`
-	IsParent     int                                       `description:"是否存在子分类: 0-否; 1-是"`
-	Children     []*BaseFromNationalStatisticsClassifyItem `gorm:"-" description:"子分类"`
-}

+ 0 - 90
models/data_manage/base_from_national_statistics_data.go

@@ -1,90 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// BaseFromNationalStatisticsData 国统局-指标
-type BaseFromNationalStatisticsData struct {
-	BaseFromNationalStatisticsDataId  int       `orm:"column(base_from_national_statistics_data_id);pk" gorm:"primaryKey" `
-	BaseFromNationalStatisticsIndexId int       `description:"指标ID"`
-	IndexCode                         string    `description:"指标编码"`
-	DataTime                          time.Time `description:"数据日期"`
-	Value                             float64   `description:"数据值"`
-	CreateTime                        time.Time `description:"创建时间"`
-	ModifyTime                        time.Time `description:"更新时间"`
-}
-
-func (m *BaseFromNationalStatisticsData) TableName() string {
-	return "base_from_national_statistics_data"
-}
-
-func (m *BaseFromNationalStatisticsData) Create() (err error) {
-	err = global.DmSQL["data"].Create(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) CreateMulti(items []*BaseFromNationalStatisticsData) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) Del() (err error) {
-	sql := `DELETE FROM base_from_national_statistics_data WHERE base_from_national_statistics_data_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsDataId).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) GetItemById(id int) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_data WHERE base_from_national_statistics_data_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_data WHERE 1=1 `
-	sql += condition
-	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromNationalStatisticsData, err error) {
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}

+ 0 - 161
models/data_manage/base_from_national_statistics_index.go

@@ -1,161 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// BaseFromNationalStatisticsIndex 国统局-指标
-type BaseFromNationalStatisticsIndex struct {
-	BaseFromNationalStatisticsIndexId    int       `orm:"column(base_from_national_statistics_index_id);pk" gorm:"primaryKey" `
-	BaseFromNationalStatisticsClassifyId int       `description:"指标分类ID"`
-	Dbcode                               string    `description:"dbcode"`
-	IndexCode                            string    `description:"指标编码"`
-	IndexName                            string    `description:"指标名称"`
-	Unit                                 string    `description:"单位"`
-	Frequency                            string    `description:"频度"`
-	Reg                                  string    `description:"地区"`
-	StartDate                            time.Time `description:"开始日期"`
-	EndDate                              time.Time `description:"结束日期"`
-	CreateTime                           time.Time `description:"创建时间"`
-	ModifyTime                           time.Time `description:"更新时间"`
-}
-
-func (m *BaseFromNationalStatisticsIndex) TableName() string {
-	return "base_from_national_statistics_index"
-}
-
-func (m *BaseFromNationalStatisticsIndex) Create() (err error) {
-	err = global.DmSQL["data"].Create(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) CreateMulti(items []*BaseFromNationalStatisticsIndex) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) Del() (err error) {
-	sql := `DELETE FROM base_from_national_statistics_index WHERE base_from_national_statistics_index_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsIndexId).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) GetItemById(id int) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_index WHERE base_from_national_statistics_index_id = ? LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	sql := `SELECT * FROM base_from_national_statistics_index WHERE 1=1 `
-	sql += condition
-	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func (m *BaseFromNationalStatisticsIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, limitNum int) (items []*BaseFromNationalStatisticsIndex, err error) {
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	limit := ``
-	if limitNum > 0 {
-		limit += fmt.Sprintf(` LIMIT %d`, limitNum)
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s %s`, fields, m.TableName(), condition, order, limit)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// SaveNationalStatisticsIndexAndDataReq 保存指标和数据请求体
-type SaveNationalStatisticsIndexAndDataReq struct {
-	Index      *BaseFromNationalStatisticsIndex  `description:"指标信息"`
-	IndexExist bool                              `description:"指标是否存在"`
-	DataList   []*BaseFromNationalStatisticsData `description:"新增的指标数据"`
-}
-
-type BaseFromNationalStatisticsIndexItem struct {
-	IndexId          int    `description:"指标ID"`
-	ClassifyId       int    `description:"指标分类ID"`
-	Dbcode           string `description:"dbcode"`
-	IndexCode        string `description:"指标编码"`
-	IndexName        string `description:"指标名称"`
-	Unit             string `description:"单位"`
-	Frequency        string `description:"频度"`
-	Reg              string `description:"地区"`
-	StartDate        string `description:"开始日期"`
-	EndDate          string `description:"结束日期"`
-	CreateTime       string `description:"创建时间"`
-	ModifyTime       string `description:"更新时间"`
-	ChildrenIndexIds []int  `gorm:"-" description:"有地区维度的指标-子指标ID集合-用于前端定位"`
-}
-
-type BaseFromNationalStatisticsIndexListResp struct {
-	List    []*BaseFromNationalStatisticsIndexItem `description:"指标列表"`
-	RegList []string                               `description:"地区列表"`
-}
-
-func FormatBaseFromNationalStatisticsIndex2Item(v *BaseFromNationalStatisticsIndex) (item *BaseFromNationalStatisticsIndexItem) {
-	item = new(BaseFromNationalStatisticsIndexItem)
-	item.IndexId = v.BaseFromNationalStatisticsIndexId
-	item.ClassifyId = v.BaseFromNationalStatisticsClassifyId
-	item.Dbcode = v.Dbcode
-	item.IndexCode = v.IndexCode
-	item.IndexName = v.IndexName
-	item.Unit = v.Unit
-	item.Frequency = v.Frequency
-	item.Reg = v.Reg
-	item.StartDate = v.StartDate.Format(utils.FormatDate)
-	item.EndDate = v.EndDate.Format(utils.FormatDate)
-	item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
-	item.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
-	return
-}
-
-type BaseFromNationalStatisticsIndexDetailItem struct {
-	BaseFromNationalStatisticsIndexItem
-	DataList []*BaseFromNationalStatisticsIndexDetailData `description:"数据列表"`
-}
-
-type BaseFromNationalStatisticsIndexDetailData struct {
-	DataTime string  `description:"数据日期"`
-	Value    float64 `description:"数据值"`
-}
-
-func GetBaseFromNationalStatisticsIndexByIndexCode(indexCode string) (item *BaseFromNationalStatisticsIndex, err error) {
-	sql := `SELECT * FROM base_from_national_statistics_index WHERE index_code = ? LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
-
-	return
-}

+ 0 - 273
models/data_manage/base_from_oilchem.go

@@ -1,273 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type BaseFromOilchemClassify struct {
-	BaseFromOilchemClassifyId int    // 分类ID
-	ClassifyName              string // 分类名称
-	ParentID                  int    // 上级ID
-	Level                     int    // 层级
-	Sort                      int    // 排序
-	CreateTime                string // 创建时间
-	ModifyTime                string // 修改时间
-}
-
-type BaseFromOilchemIndex struct {
-	BaseFromOilchemIndexId int    // 主键ID
-	IndexCode              string // 指标编码
-	IndexName              string // 指标名称
-	ClassifyId             uint   // 分类ID
-	Unit                   string // 单位
-	Frequency              string // 频度
-	Describe               string // 指标描述
-	Sort                   int    // 排序
-	CreateTime             string // 创建时间
-	ModifyTime             string // 修改时间
-}
-
-type BaseFromOilchemData struct {
-	BaseFromOilchemDataId  int    // 数据表ID
-	BaseFromOilchemIndexId int    // 指标ID
-	IndexCode              string // 指标编码
-	DataTime               string
-	Value                  string
-	CreateTime             string
-	ModifyTime             string
-}
-
-func GetOilchemClassifyList() (list []*BaseFromOilchemClassify, err error) {
-	sql := "SELECT * FROM base_from_oilchem_classify ORDER BY sort ASC"
-	err = global.DmSQL["data"].Raw(sql).Scan(&list).Error
-
-	return
-}
-
-type BaseFromOilchemIndexList struct {
-	BaseFromOilchemIndexId int    // 主键ID
-	IndexCode              string // 指标编码
-	IndexName              string // 指标名称
-	ClassifyId             int    // 分类ID
-	Unit                   string // 单位
-	Frequency              string // 频度
-	Describe               string // 指标描述
-	Sort                   int    // 排序
-	CreateTime             string // 创建时间
-	ModifyTime             string // 修改时间
-	EdbExist               int    `description:"edb是否存在"`
-	DataList               []*BaseFromOilchemData
-	Paging                 *paging.PagingItem `description:"分页数据"`
-}
-
-type BaseFromOilchemIndexListResp struct {
-	List   []*BaseFromOilchemIndexView
-	Paging *paging.PagingItem `description:"分页数据"`
-}
-
-func GetOilchemIndexByCode(indexCode string) (item *BaseFromOilchemIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT a.*,CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
-	FROM base_from_oilchem_index as a 
-LEFT JOIN edb_info AS e ON a.index_code=e.edb_code AND e.source=89 
-	WHERE 1=1 and a.index_code = ? `
-	sql += `ORDER BY a.base_from_oilchem_index_id ASC `
-	err = o.Raw(sql, indexCode).Scan(&item).Error
-
-	return
-}
-
-func GetOilchemIndexListCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func GetOilchemDataListCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_data WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func GetOilchemIndexData(condition string, pars interface{}, startSize, pageSize int) (items []*BaseFromOilchemData, err error) {
-	sql := ` SELECT * FROM base_from_oilchem_data WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-
-	sql += ` order by data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-// GetOilchemItemList 模糊查询隆众资讯数据库指标列表
-func GetOilchemItemList(keyword string) (items []*BaseFromOilchemIndex, err error) {
-	sql := "SELECT * FROM base_from_oilchem_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
-
-	return
-}
-
-// OilchemDataBatchListReq 隆众资讯指标批量列表
-type OilchemDataBatchListReq struct {
-	ClassifyId  int    `description:"分类id"`
-	KeyWord     string `description:"关键字"`
-	SelectedId  []int  `description:"已选指标id, 为true时表示反选"`
-	IsSelectAll bool   `description:"是否查询全部, 默认false, true:全选, false:查询已选"`
-}
-
-// GetOilchemIndexByCondition 根据条件获取隆众资讯指标列表
-func GetOilchemIndexByCondition(condition string, pars []interface{}) (items []*BaseFromOilchemIndex, err error) {
-	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// OilchemDataBatchAddCheckReq 隆众资讯指标批量添加校验
-type OilchemDataBatchAddCheckReq struct {
-	IndexCodes []string `description:"指标编码"`
-}
-
-// GetOilchemIndexAndEdbInfoByCondition 根据条件获取隆众资讯index和指标库的信息
-func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromOilchemIndexView, err error) {
-	sql := ` SELECT b.*, e.edb_info_id, e.unique_code, e.classify_id AS edb_classify_id FROM base_from_oilchem_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_OILCHEM)...).Scan(&items).Error
-
-	return
-}
-
-type BaseFromOilchemIndexView struct {
-	BaseFromOilchemIndexId int    `orm:"pk" gorm:"primaryKey" `
-	EdbInfoId              int    `description:"指标库id"`
-	ClassifyId             int    `description:"指标分类id"`
-	IndexCode              string `description:"指标编码"`
-	IndexName              string `description:"指标名称"`
-	UniqueCode             string `description:"唯一code"`
-	Frequency              string `description:"频度"`
-	Unit                   string `description:"单位"`
-	StartDate              string `description:"开始日期"`
-	EndDate                string `description:"结束日期"`
-	Sort                   int    `description:"排序"`
-	EdbExist               int    `description:"edb是否存在"`
-	EdbClassifyId          int    `description:"edb分类id"`
-	ModifyTime             string
-	DataTime               string `description:"数据时间"`
-	Value                  string `description:"值"`
-}
-
-// ExportOilchemExcelReq 导出隆众资讯excel指标
-type ExportOilchemExcelReq struct {
-	KeyWord       string   `description:"关键字, 指标编码或指标ID"`
-	IndexCode     []string `description:"指标编码,全选时,表示反选"`
-	IsSelectedAll bool     `description:"是否全选:true:全选|false: 无"`
-	ClassifyId    int      `description:"指标id"`
-}
-
-// GetOilchemIndexByConditionAndFrequency 根据条件获取隆众资讯指标列表
-func GetOilchemIndexByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromOilchemIndex, err error) {
-	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` AND frequency=?`
-	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars, frequency).Scan(&items).Error
-
-	return
-}
-
-func GetOilchemIndexDataByCode(indexCode string) (items []*BaseFromOilchemData, err error) {
-	sql := ` SELECT *  FROM base_from_oilchem_data WHERE index_code=? ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
-
-	return
-}
-
-func GetOilchemFrequencyByCondition(condition string, pars []interface{}) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_oilchem_index WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// GetOilchemIndexViewList 根据分类id获取隆众资讯指标列表
-func GetOilchemIndexViewList(condition string, pars []interface{}, startSize, pageSize int) (items []*BaseFromOilchemIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT b.*, e.edb_info_id,
-	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
-	FROM base_from_oilchem_index AS b
-	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=89
-	WHERE 1=1   `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY b.modify_time ASC LIMIT ?,? `
-
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// GetOilchemIndexViewListCount 根据分类id获取隆众资讯指标列表
-func GetOilchemIndexViewListCount(condition string, pars []interface{}) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(1) AS count
-	FROM base_from_oilchem_index AS b
-	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=89
-	WHERE 1=1   `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY b.modify_time ASC `
-	err = o.Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-// GetOilchemDataViewList 根据指标id获取隆众资讯指标列表
-func GetOilchemDataViewList(indexIds []int) (items []*BaseFromOilchemData, err error) {
-	sql := ` SELECT * FROM base_from_oilchem_data WHERE base_from_oilchem_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `)ORDER BY data_time desc  `
-	err = global.DmSQL["data"].Raw(sql, indexIds).Scan(&items).Error
-
-	return
-}
-
-// GetOilchemDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
-func GetOilchemDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
-	if len(indexIdList) == 0 {
-		return
-	}
-	sql := ` SELECT DISTINCT data_time FROM base_from_oilchem_data WHERE base_from_oilchem_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
-	err = global.DmSQL["data"].Raw(sql, indexIdList).Scan(&items).Error
-
-	return
-}

+ 0 - 242
models/data_manage/base_from_sci.go

@@ -1,242 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-type BaseFromSci struct {
-	BaseFromSciId int `orm:"column(base_from_sci_id);pk" gorm:"primaryKey" `
-	Aid           int
-	Name          string
-	Interface     string
-	ApiUpdate     int
-	ApiUpdateType string
-	ApiType       int
-	ApiTypeAll    string
-	Type1         string `orm:"column(type_1)"`
-	Type2         string `orm:"column(type_2)"`
-	Type3         string `orm:"column(type_3)"`
-	ApiStartTime  string
-	ApiUpdateTime string
-	StartTime     string
-	FinishTime    string
-	AuthModule    string
-	AuthLang      string
-	ApiLabel      string
-	Enable        string
-	EditPerson    string
-	EditTime      string
-	AuthDur       int
-	AuthDurType   string
-}
-
-type BaseFromSciIndex struct {
-	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey" `
-	ClassifyId         int
-	Interface          string
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	Sort               int
-	CreateTime         time.Time
-	ModifyTime         time.Time
-}
-
-type BaseFromSciData struct {
-	SciDataId          int `orm:"column(sci_data_id);pk" gorm:"primaryKey" `
-	BaseFromSciIndexId int
-	IndexCode          string
-	DataTime           string
-	Value              string
-	CreateTime         time.Time
-	ModifyTime         time.Time
-	DataTimestamp      int64
-}
-
-func GetBaseFromSciIndexByIndexCode(indexCode string) (list *BaseFromSciIndex, err error) {
-	sql := ` SELECT * FROM base_from_sci_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
-
-	return
-}
-
-// GetBaseFromSciIndexCountByClassifyIds 获取分类下指标的个数
-func GetBaseFromSciIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	num := len(classifyIds)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, classifyIds).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromSciIndexByClassifyId 获取根据分类查询指标
-func GetBaseFromSciIndexByClassifyId(classifyId int) (list []*BaseFromSciIndex, err error) {
-	sql := `SELECT * FROM base_from_sci_index WHERE classify_id =? ORDER BY sort ASC, base_from_sci_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&list).Error
-
-	return
-}
-
-// GetSciIndexAll 用于分类展示
-func GetSciIndexAll() (items []*BaseFromSciClassifyItems, err error) {
-	sql := ` SELECT base_from_sci_index_id, classify_id, index_name as classify_name, index_code as base_from_sci_index_code
-            FROM base_from_sci_index ORDER BY sort ASC, base_from_sci_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// GetBaseFromSciIndexByIndexId 根据指标id获取指标信息
-func GetBaseFromSciIndexByIndexId(indexId int) (item *BaseFromSciIndex, err error) {
-	sql := `SELECT * FROM base_from_sci_index WHERE base_from_sci_index_id=? `
-	err = global.DmSQL["data"].Raw(sql, indexId).First(&item).Error
-
-	return
-}
-
-// GetBaseFromSciIndexMaxSortByClassifyId 根据指标id获取指标信息
-func GetBaseFromSciIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	sql := `SELECT max(sort) FROM base_from_sci_index WHERE classify_id=? `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-// GetBaseFromSciIndexMinSortByClassifyId 获取最小不等于0的排序
-func GetBaseFromSciIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	sql := `SELECT COALESCE(MIN(sort), 0) as sort FROM base_from_sci_index WHERE classify_id=? and sort <> 0 `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-type BaseFromSciIndexType struct {
-	Type2 string `orm:"column(type_2)"`
-	Type3 string `orm:"column(type_3)"`
-}
-
-// GetBaseFromSciIndexType 获取历史指标信息类型
-func GetBaseFromSciIndexType() (list []BaseFromSciIndexType, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT type_2, type_3 from base_from_sci_index where type_2 <> "" GROUP BY type_2, type_3`
-	err = o.Raw(sql).Scan(&list).Error
-
-	return
-}
-
-// MoveBaseFromSciIndex 移动指标分类
-func MoveBaseFromSciIndex(chartInfoId, classifyId int) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` UPDATE base_from_sci_index
-			SET
-			  classify_id = ?, modify_time=NOW() 
-			WHERE base_from_sci_index_id = ?`
-	err = o.Exec(sql, classifyId, chartInfoId).Error
-
-	return
-}
-
-// UpdateBaseFromSciIndexByClassifyId 根据指标id更新排序
-func UpdateBaseFromSciIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` update base_from_sci_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
-	if prevIndexInfoId > 0 {
-		sql += ` ( sort > ? or (base_from_sci_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	}
-	err = o.Exec(sql, classifyId, nowSort).Error
-
-	return
-}
-
-// MoveUpSciIndexBySort 往上移动
-func MoveUpSciIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_sci_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	err = o.Exec(sql, classifyId, nextSort, currentSort).Error
-
-	return
-}
-
-// MoveDownSciIndexBySort 往下移动
-func MoveDownSciIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_sci_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	err = o.Exec(sql, classifyId, prevSort, currentSort).Error
-
-	return
-}
-
-// GetFirstBaseFromSciIndexByClassifyId 获取当前分类下,且排序数相同 的排序第一条的数据
-func GetFirstBaseFromSciIndexByClassifyId(classifyId int) (item *BaseFromSciIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_index WHERE classify_id=? order by sort asc,base_from_sci_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).First(&item).Error
-
-	return
-}
-
-// Update 更新Sci指标基础信息
-func (item *BaseFromSciIndex) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(item).Error
-
-	return
-}
-
-// DeleteBaseFromSciIndexById 根据指标id删除对应的指标、指标数据
-func DeleteBaseFromSciIndexById(sciIndexId int) (err error) {
-	to := global.DmSQL["data"].Begin()
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	//删除指标
-	sql := `DELETE FROM base_from_sci_index WHERE base_from_sci_index_id = ? `
-	err = to.Exec(sql, sciIndexId).Error
-	if err != nil {
-		return
-	}
-
-	//删除指标数据
-	sql = `DELETE FROM base_from_sci_data WHERE base_from_sci_index_id = ? `
-	err = to.Exec(sql, sciIndexId).Error
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// EditSciIndexInfoResp 新增指标的返回
-type EditSciIndexInfoResp struct {
-	BaseFromSciIndexId int    `description:"指标ID"`
-	IndexCode          string `description:"指标code"`
-}
-
-type SciSingleDataResp struct {
-	BaseFromSciIndexId int
-	ClassifyId         int
-	Interface          string
-	Name               string
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	ApiStartTime       string
-	ApiUpdateTime      string
-	StartTime          string
-	FinishTime         string
-	CreateTime         string
-	ModifyTime         string
-	Data               []*SciIndexData
-}

+ 0 - 246
models/data_manage/base_from_sci_classify.go

@@ -1,246 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// BaseFromSciClassify SMM原始数据分类表
-type BaseFromSciClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
-	ClassifyName    string    `description:"分类名称"`
-	ParentId        int       `description:"父级id"`
-	SysUserId       int       `description:"创建人id"`
-	SysUserRealName string    `description:"创建人姓名"`
-	Level           int       `description:"层级"`
-	Sort            int       `description:"排序字段,越小越靠前,默认值:10"`
-	ModifyTime      time.Time `description:"修改时间"`
-	CreateTime      time.Time `description:"创建时间"`
-	ClassifyNameEn  string    `description:"英文分类名称"`
-}
-
-// AddBaseFromSciClassify 添加SMM原始数据分类
-func AddBaseFromSciClassify(item *BaseFromSciClassify) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.ClassifyId)
-
-	return
-}
-
-// GetBaseFromSciClassifyCount 获取分类名称的个数
-func GetBaseFromSciClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromSciClassifyEnCount
-// @Description: 获取英文分类名称的个数
-// @author: Roc
-// @datetime 2024-04-16 16:56:14
-// @param classifyNameEn string
-// @param parentId int
-// @return count int
-// @return err error
-func GetBaseFromSciClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_classify WHERE classify_name_en=? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
-
-	return
-}
-
-// GetBaseFromSciClassifyById 通过分类id的获取分类信息
-func GetBaseFromSciClassifyById(classifyId int) (item *BaseFromSciClassify, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_sci_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).First(&item).Error
-
-	return
-}
-
-// EditBaseFromSciClassify 修改SMM原始数据分类
-func EditBaseFromSciClassify(classifyId int, classifyName string) (err error) {
-	sql := `UPDATE base_from_sci_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyName, classifyId).Error
-
-	return
-}
-
-// EditBaseFromSciClassifyEn
-// @Description: 修改卓创(红桃3)数据英文分类
-// @author: Roc
-// @datetime 2024-04-16 16:56:42
-// @param classifyId int
-// @param classifyNameEn string
-// @return err error
-func EditBaseFromSciClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	sql := `UPDATE base_from_sci_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyNameEn, classifyId).Error
-	return
-}
-
-// UpdateBaseFromSciClassifySort 修改SMM原始数据分类的排序
-func UpdateBaseFromSciClassifySort(classifyId int) (err error) {
-	sql := `UPDATE base_from_sci_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyId).Error
-
-	return
-}
-
-type BaseFromSciClassifyItems struct {
-	ClassifyId           int                         `description:"分类ID"`
-	BaseFromSciIndexId   int                         `description:"指标类型ID"`
-	BaseFromSciIndexCode string                      `description:"指标唯一编码"`
-	ClassifyName         string                      `description:"分类名称"`
-	ClassifyNameEn       string                      `description:"英文分类名称"`
-	ParentId             int                         `description:"父级id"`
-	Level                int                         `description:"层级"`
-	Sort                 int                         `description:"排序字段,越小越靠前,默认值:10"`
-	Children             []*BaseFromSciClassifyItems `gorm:"-" description:"下级"`
-}
-
-type BaseFromSciClassifyNameItems struct {
-	ClassifyId   int                             `description:"分类ID"`
-	ClassifyName string                          `description:"分类名称"`
-	ParentId     int                             `description:"父级id"`
-	Children     []*BaseFromSciClassifyNameItems `gorm:"-" description:"下级"`
-}
-
-type BaseFromSciClassifyResp struct {
-	List []*BaseFromSciClassifyItems
-}
-
-type BaseFromSciClassifyNameResp struct {
-	List []*BaseFromSciClassifyNameItems
-}
-
-type BaseFromSciClassifyItemsButton struct {
-	AddButton    bool `description:"是否可添加"`
-	OpButton     bool `description:"是否可编辑"`
-	DeleteButton bool `description:"是否可删除"`
-	MoveButton   bool `description:"是否可移动"`
-}
-
-// GetBaseFromSciClassifyByParentId 根据上级id获取当下的分类列表数据
-func GetBaseFromSciClassifyByParentId(parentId int) (items []*BaseFromSciClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	err = o.Raw(sql, parentId).Scan(&items).Error
-
-	return
-}
-
-// GetAllBaseFromSciClassify 获取所有的分类列表数据
-func GetAllBaseFromSciClassify() (items []*BaseFromSciClassifyItems, err error) {
-	sql := ` SELECT * FROM base_from_sci_classify WHERE parent_id <> 0 order by sort asc,classify_id asc`
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
-type DeleteBaseFromSciClassifyReq struct {
-	ClassifyId int `description:"分类id"`
-	EdbInfoId  int `description:"指标id"`
-}
-
-type BaseFromSciClassifyListResp struct {
-	AllNodes      []*BaseFromSciClassifyItems
-	CanOpClassify bool `description:"是否允许操作分类"`
-}
-
-type BaseFromSciClassifySimplify struct {
-	ClassifyId   int    `description:"分类id"`
-	ClassifyName string `description:"分类名称"`
-	ParentId     int
-}
-
-// MoveUpSciIndexClassifyBySort 往上移动
-func MoveUpSciIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	sql := `update base_from_sci_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	err = global.DmSQL["data"].Exec(sql, parentId, nextSort, currentSort).Error
-
-	return
-}
-
-// MoveDownSciIndexClassifyBySort 往下移动
-func MoveDownSciIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_sci_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	err = o.Exec(sql, parentId, prevSort, currentSort).Error
-
-	return
-}
-
-// GetSciIndexClassifyMinSort 获取最小不等于0的排序
-func GetSciIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `select COALESCE(MIN(sort), 0) as sort from base_from_sci_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).Scan(&sort).Error
-
-	return
-}
-
-// Update 更新分类基础信息
-func (BaseFromSciClassify *BaseFromSciClassify) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(BaseFromSciClassify).Error
-
-	return
-}
-
-type AddSciClassifyResp struct {
-	ClassifyId int
-}
-
-// DeleteSciClassifyByClassifyId 根据分类id删除对应的指标分类
-func DeleteSciClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := global.DmSQL["data"]
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-	//删除分类
-	sql := `DELETE FROM base_from_sci_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Exec(sql, classifyIdList).Error
-
-	return
-}
-
-// AddSciClassifyMulti 批量新增SMM类别
-func AddSciClassifyMulti(list []*BaseFromSciClassify) (err error) {
-	err = global.DmSQL["data"].CreateInBatches(list, utils.MultiAddNum).Error
-
-	return
-}
-
-// InitSciClassifySort 初始化sort值
-func InitSciClassifySort() (err error) {
-	sql := `UPDATE base_from_sci_classify 
-SET modify_time=NOW(), sort = classify_id`
-	err = global.DmSQL["data"].Exec(sql).Error
-
-	return
-}
-
-// InitSciIndexClassifyId 历史数据的classifyId值
-func InitSciIndexClassifyId() (err error) {
-	sql := `UPDATE base_from_sci_index s
-LEFT JOIN (
-SELECT
-	c1.classify_id,
-	CONCAT( c2.classify_name, c1.classify_name ) AS type_name 
-FROM
-	base_from_sci_classify c1
-	LEFT JOIN base_from_sci_classify c2 ON c1.parent_id = c2.classify_id 
-	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
-	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	err = global.DmSQL["data"].Exec(sql).Error
-
-	return
-}

+ 0 - 207
models/data_manage/base_from_sci_hq_classify.go

@@ -1,207 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// BaseFromSciHqClassify 卓创红期原始数据分类表
-type BaseFromSciHqClassify struct {
-	ClassifyId     int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
-	ClassifyName   string    `description:"分类名称"`
-	ParentId       int       `description:"父级id"`
-	Level          int       `description:"层级"`
-	Sort           int       `description:"排序字段"`
-	ModifyTime     time.Time `description:"修改时间"`
-	CreateTime     time.Time `description:"创建时间"`
-	ClassifyNameEn string    `description:"英文分类名称"`
-}
-
-type BaseFromSciHqClassifyItem struct {
-	ClassifyId     int                          `orm:"column(classify_id);pk" gorm:"primaryKey" `
-	ClassifyName   string                       `description:"分类名称"`
-	ParentId       int                          `description:"父级id"`
-	Level          int                          `description:"层级"`
-	Sort           int                          `description:"排序字段"`
-	UniqueCode     string                       `description:"唯一code"`
-	ModifyTime     time.Time                    `description:"修改时间"`
-	CreateTime     time.Time                    `description:"创建时间"`
-	ClassifyNameEn string                       `description:"英文分类名称"`
-	Children       []*BaseFromSciHqClassifyItem `gorm:"-" description:"子分类"`
-}
-
-type BaseFromSciHqClassifyMaxSort struct {
-	ClassifyId int `description:"分类id"`
-	MaxSort    int `description:"最大排序"`
-}
-
-func (t *BaseFromSciHqClassify) Add() (insertId int64, err error) {
-	err = global.DmSQL["data"].Create(t).Error
-	if err != nil {
-		return
-	}
-	insertId = int64(t.ClassifyId)
-
-	return
-}
-
-func (t *BaseFromSciHqClassify) Update(cols []string) (err error) {
-	o := global.DmSQL["data"]
-	err = o.Select(cols).Updates(t).Error
-
-	return
-}
-
-func BatchAddSciHqClassify(items []*BaseFromSciHqClassify) (err error) {
-	o := global.DmSQL["data"]
-	err = o.CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-// 获取所有分类
-func GetSciHqClassifyAll() (items []*BaseFromSciHqClassifyItem, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_classify ORDER BY sort ASC, classify_id ASC`
-	err = o.Raw(sql).Scan(&items).Error
-
-	return
-}
-
-// GetChildSciHqClassifyListById 获取子分类列表
-func GetChildSciHqClassifyListById(classifyId int) (items []*BaseFromSciHqClassifyItem, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE parent_id=? `
-	err = o.Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-// GetChildSciHqClassifyIdsById 获取子分类的id集合
-func GetChildSciHqClassifyIdsById(classifyId int) (items []int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT classify_id FROM base_from_sci_hq_classify WHERE parent_id=? `
-	err = o.Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-// GetChildSciHqClassifyMaxSortById 获取子分类最大排序
-func GetChildSciHqClassifyMaxSortById(classifyId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COALESCE(MAX(sort), 0)  AS sort FROM base_from_sci_hq_classify WHERE parent_id=? `
-	err = o.Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-// GetSciHqClassifyCountById 获取分类数量
-func GetSciHqClassifyCountById(classifyId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).Scan(&count).Error
-
-	return
-}
-
-// GetSciHqClassifyById 通过分类id获取分类
-func GetSciHqClassifyById(classifyId int) (item *BaseFromSciHqClassify, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).First(&item).Error
-
-	return
-}
-
-// GetSciHqChildClassifyById 通过分类id获取子分类
-func GetSciHqChildClassifyIdsById(classifyId int) (items []int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT classify_id FROM base_from_sci_hq_classify WHERE parent_id=? `
-	err = o.Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqClassifyListByIds 通过分类id获取分类列表
-func GetSciHqClassifyListByIds(classifyIds []int) (items []*BaseFromSciHqClassify, err error) {
-	if len(classifyIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	err = o.Raw(sql, classifyIds).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqClassifyCountByName 通过分类名称获取分类
-func GetSciHqClassifyCountByName(classifyName string, lang string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_classify WHERE 1=1`
-	if lang == utils.EnLangVersion {
-		sql += ` AND classify_name_en=? `
-	} else {
-		sql += ` AND classify_name=? `
-	}
-	err = o.Raw(sql, classifyName).Scan(&count).Error
-
-	return
-}
-
-func GetBaseFromSciHqClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_classify WHERE classify_name_en=? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
-
-	return
-}
-
-func GetBaseFromSciHqClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
-
-	return
-}
-
-// DeleteSciHqClassifyByClassifyId 根据分类id删除对应的指标分类
-func DeleteSciHqClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := global.DmSQL["data"]
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-	//删除分类
-	sql := `DELETE FROM base_from_sci_hq_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Exec(sql, classifyIdList).Error
-
-	return
-}
-
-// GetSciHqIndexClassifyMinSort 获取最小不等于0的排序
-func GetSciHqIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COALESCE(MIN(sort), 0) as sort FROM base_from_sci_hq_classify WHERE parent_id=? AND sort <> 0 `
-	err = o.Raw(sql, parentId).Scan(&sort).Error
-
-	return
-}
-
-// MoveUpSciHqIndexClassifyBySort 往上移动
-func MoveUpSciHqIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_sci_hq_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	err = o.Exec(sql, parentId, nextSort, currentSort).Error
-
-	return
-}
-
-// MoveDownSciHqIndexClassifyBySort 往下移动
-func MoveDownSciHqIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := global.DmSQL["data"]
-	sql := `update base_from_sci_hq_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	err = o.Exec(sql, parentId, prevSort, currentSort).Error
-
-	return
-}

+ 0 - 52
models/data_manage/base_from_sci_hq_data.go

@@ -1,52 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/utils"
-	"time"
-
-	"github.com/beego/beego/v2/client/orm"
-)
-
-type BaseFromSciHqData struct {
-	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk" gorm:"primaryKey" `
-	BaseFromSciHqIndexId int       `description:"指标id"`
-	IndexCode            string    `description:"指标编码"`
-	DataTime             string    `description:"数据日期"`
-	Value                float64   `description:"数据值"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"修改时间"`
-	DataTimestamp        int64     `description:"数据时间戳"`
-}
-
-// GetSciHqDataByIndexId 根据指标id获取指标数据
-func GetSciHqDataByIndexId(indexId int) (items []*BaseFromSciHqData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_sci_hq_data WHERE base_from_sci_hq_index_id=? ORDER BY data_time DESC`
-	_, err = o.Raw(sql, indexId).QueryRows(&items)
-	return
-}
-
-// GetSciHqDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
-func GetSciHqDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
-	if len(indexIdList) == 0 {
-		return
-	}
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT DISTINCT data_time FROM base_from_sci_hq_data WHERE base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
-	_, err = o.Raw(sql, indexIdList).QueryRows(&items)
-	return
-}
-
-func GetSciHqIndexDataByCode(indexCode string) (items []*BaseFromSciHqData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT *  FROM base_from_sci_hq_data WHERE index_code=? ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
-	return
-}
-
-func GetSciHqIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci_hq_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
-	return
-}

+ 0 - 378
models/data_manage/base_from_sci_hq_index.go

@@ -1,378 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"time"
-
-	"github.com/beego/beego/v2/client/orm"
-)
-
-type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `gorm:"primaryKey" `
-	ClassifyId           int       `description:"指标分类id"`
-	IndexCode            string    `description:"指标编码"`
-	IndexName            string    `description:"指标名称"`
-	Unit                 string    `description:"单位"`
-	Frequency            string    `description:"频度"`
-	StartDate            string    `description:"开始日期"`
-	EndDate              string    `description:"结束日期"`
-	Sort                 int       `description:"排序"`
-	LatestValue          float64   `description:"最新值"`
-	LatestDate           time.Time `description:"最后更新时间"`
-	TerminalCode         string
-	FilePath             string `json:"-"`
-	CreateTime           time.Time
-	ModifyTime           time.Time
-}
-
-type BaseFromSciHqIndexView struct {
-	BaseFromSciHqIndexId int     `orm:"pk" gorm:"primaryKey" `
-	EdbInfoId            int     `description:"指标库id"`
-	ClassifyId           int     `description:"指标分类id"`
-	IndexCode            string  `description:"指标编码"`
-	IndexName            string  `description:"指标名称"`
-	UniqueCode           string  `description:"唯一code"`
-	Frequency            string  `description:"频度"`
-	Unit                 string  `description:"单位"`
-	StartDate            string  `description:"开始日期"`
-	EndDate              string  `description:"结束日期"`
-	Sort                 int     `description:"排序"`
-	LatestValue          float64 `description:"最新值"`
-	LatestDate           string  `description:"最后更新时间"`
-	EdbExist             int     `description:"edb是否存在"`
-	ModifyTime           string
-}
-
-func (b *BaseFromSciHqIndex) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(b).Error
-
-	return
-}
-
-// GetSciHqIndexByCondition 根据条件获取卓创红期指标列表
-func GetSciHqIndexByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	sql := ` SELECT * FROM base_from_sci_hq_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexByCondition 根据条件获取卓创红期指标列表
-func GetSciHqIndexByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` AND frequency=?`
-	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = o.Raw(sql, pars, frequency).Scan(&items).Error
-
-	return
-}
-
-func GetSciHqIndexCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = o.Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-// GetSciHqIndexAndEdbInfoByCondition 根据条件获取卓创红期index和指标库的信息
-func GetSciHqIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT b.*, e.edb_info_id FROM base_from_sci_hq_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC `
-	err = o.Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)...).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexByIndexCode 根据指标编码获取指标信息
-func GetSciHqIndexByIndexCode(indexCode string) (item *BaseFromSciHqIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).First(&item).Error
-
-	return
-}
-
-// GetSciHqIndexByIndexId 根据指标id获取指标信息
-func GetSciHqIndexByIndexId(indexId int) (item *BaseFromSciHqIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_index WHERE base_from_sci_hq_index_id=? `
-	err = o.Raw(sql, indexId).First(&item).Error
-
-	return
-}
-
-// GetSciHqIndexListByIndexIds 根据指标id获取指标信息
-func GetSciHqIndexListByIndexIds(indexIds []int) (items []*BaseFromSciHqIndex, err error) {
-	if len(indexIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM base_from_sci_hq_index WHERE base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `) `
-	err = o.Raw(sql, indexIds).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexCountByClassifyIds 获取分类下指标的个数
-func GetSciHqIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := global.DmSQL["data"]
-	num := len(classifyIds)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).Scan(&count).Error
-
-	return
-}
-
-// GetSciHqIndexByClassifyId 根据分类id获取卓创红期指标列表
-func GetSciHqIndexByClassifyId(classifyIds []int, startSize, pageSize int) (items []*BaseFromSciHqIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT b.*, e.edb_info_id,
-	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
-	FROM base_from_sci_hq_index AS b
-	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=88
-	WHERE b.classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) ORDER BY b.sort ASC LIMIT ?,? `
-	err = o.Raw(sql, classifyIds, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexCountByClassifyId 根据分类id获取卓创红期指标数量
-func GetSciHqIndexCountByClassifyId(classifyIds []int) (count int, err error) {
-	if len(classifyIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) `
-	err = o.Raw(sql, classifyIds).Scan(&count).Error
-
-	return
-}
-
-// GetSciHqIndexCount 获取卓创红期指标数量
-func GetSciHqIndexCount() (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index `
-	err = o.Raw(sql).Scan(&count).Error
-
-	return
-}
-
-func GetSciHqIndexByPage(startSize, pageSize int) (items []*BaseFromSciHqIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT b.*, e.edb_info_id,
-	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
-	FROM base_from_sci_hq_index AS b
-	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=88
-	ORDER BY b.modify_time DESC LIMIT ?,?`
-	err = o.Raw(sql, startSize, pageSize).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
-func GetSciHqIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromSciHqIndexView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT base_from_sci_hq_index_id, classify_id, index_code, index_name, CONCAT(classify_id, '_', base_from_sci_hq_index_id) AS unique_code  FROM base_from_sci_hq_index WHERE classify_id = ? ORDER BY sort ASC `
-	err = o.Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
-func GetSciHqIndexBaseInfoByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT base_from_sci_hq_index_id, index_code, index_name  FROM base_from_sci_hq_index WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY sort ASC `
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COALESCE(MAX(t.num),0) AS count FROM ( SELECT COUNT(1) AS num  FROM base_from_sci_hq_index AS a INNER JOIN base_from_sci_hq_data AS b ON a.index_code=b.index_code WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY a.base_from_sci_hq_index_id) AS t `
-	err = o.Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-// GetSciHqIndexMaxSortByClassifyId 根据分类id获取指标最大排序
-func GetSciHqIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT COALESCE(MAX(sort), 0) as sort FROM base_from_sci_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).Scan(&sort).Error
-
-	return
-}
-
-func GetSciHqFrequencyByCondition(condition string, pars []interface{}) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := global.DmSQL["data"]
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// GetSciHqClassifyMaxSortByClassifyIds 通过分类id获取对应分类的最大sort
-func GetSciHqClassifyMaxSortByClassifyIds(classifyIds []int) (items []*BaseFromSciHqClassifyMaxSort, err error) {
-	if len(classifyIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := `SELECT bc.classify_id, COALESCE(MAX(bi.sort), 0) AS max_sort FROM base_from_sci_hq_classify  AS bc
-	LEFT JOIN base_from_sci_hq_index AS bi
-	ON bc.classify_id=bi.classify_id  
-	WHERE bc.classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)
-	GROUP BY bc.classify_id
-	`
-	// sql = ` SELECT classify_id, MAX(sort) AS max_sort FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) GROUP BY classify_id `
-	err = o.Raw(sql, classifyIds).Scan(&items).Error
-
-	return
-}
-
-func BatchModifySciHqIndexClassify(items []*BaseFromSciHqIndex) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_sci_hq_index SET classify_id=?, sort=? WHERE base_from_sci_hq_index_id=? `
-	p, err := o.Raw(sql).Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		p.Close()
-	}()
-	for _, v := range items {
-		_, err = p.Exec(v.ClassifyId, v.Sort, v.BaseFromSciHqIndexId)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// MoveDownSciHqIndexBySort 往下移动
-func MoveDownSciHqIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_sci_hq_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, classifyId, prevSort, currentSort).Exec()
-	return
-}
-
-// MoveUpSciHqIndexBySort 往上移动
-func MoveUpSciHqIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_sci_hq_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, classifyId, nextSort, currentSort).Exec()
-	return
-}
-
-func DeleteSciHqIndexById(indexId 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_sci_hq_index WHERE base_from_sci_hq_index_id=? `
-	_, err = to.Raw(sql, indexId).Exec()
-	if err != nil {
-		return
-	}
-	sql = `DELETE FROM base_from_sci_hq_data WHERE base_from_sci_hq_index_id=? `
-	_, err = to.Raw(sql, indexId).Exec()
-	if err != nil {
-		return
-	}
-	return
-}
-
-func DeleteSciHqIndexByIds(indexIds []int) (err error) {
-	if len(indexIds) == 0 {
-		return
-	}
-	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_sci_hq_index WHERE base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `) `
-	_, err = o.Raw(sql, indexIds).Exec()
-	if err != nil {
-		return
-	}
-	sql = `DELETE FROM base_from_sci_hq_data WHERE base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `) `
-	_, err = o.Raw(sql, indexIds).Exec()
-	if err != nil {
-		return
-	}
-	return
-}
-
-// MoveSciHqIndex 移动指标分类
-func MoveSciHqIndex(indexId, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_sci_hq_index
-			SET
-			  classify_id = ?, modify_time=NOW() 
-			WHERE base_from_sci_hq_index_id = ?`
-	_, err = o.Raw(sql, classifyId, indexId).Exec()
-	return
-}
-
-// GetSciHqIndexMinSortByClassifyId 获取最小不等于0的排序
-func GetSciHqIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT COALESCE(MIN(sort), 0) as sort FROM base_from_sci_hq_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
-	return
-}

+ 0 - 159
models/data_manage/ccf_stock_classify.go

@@ -1,159 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// CCFStockClassify CCF化纤-装置分类
-type CCFStockClassify struct {
-	CcfStockClassifyId int       `orm:"column(ccf_stock_classify_id);pk" gorm:"primaryKey" `
-	ClassifyName       string    `description:"分类名称"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-}
-
-func (m *CCFStockClassify) TableName() string {
-	return "ccf_stock_classify"
-}
-
-type CCFStockClassifyCols struct {
-	CcfStockClassifyId string
-	ClassifyName       string
-	CreateTime         string
-	ModifyTime         string
-}
-
-func (m *CCFStockClassify) Cols() CCFStockClassifyCols {
-	return CCFStockClassifyCols{
-		CcfStockClassifyId: "ccf_stock_classify_id",
-		ClassifyName:       "classify_name",
-		CreateTime:         "create_time",
-		ModifyTime:         "modify_time",
-	}
-}
-
-func (m *CCFStockClassify) PrimaryId() string {
-	return m.Cols().CcfStockClassifyId
-}
-
-func (m *CCFStockClassify) Create() (err error) {
-	err = global.DmSQL["data"].Create(m).Error
-
-	return
-}
-
-func (m *CCFStockClassify) CreateMulti(items []*CCFStockClassify) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-func (m *CCFStockClassify) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(m).Error
-
-	return
-}
-
-func (m *CCFStockClassify) Del() (err error) {
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = global.DmSQL["data"].Exec(sql, m.CcfStockClassifyId).Error
-
-	return
-}
-
-func (m *CCFStockClassify) MultiDel(menuIds []int) (err error) {
-	if len(menuIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	err = o.Exec(sql, menuIds).Error
-
-	return
-}
-
-func (m *CCFStockClassify) GetItemById(id int) (item *CCFStockClassify, err error) {
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).First(&item).Error
-
-	return
-}
-
-func (m *CCFStockClassify) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *CCFStockClassify, err error) {
-	o := global.DmSQL["data"]
-	order := ``
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars...).First(&item).Error
-
-	return
-}
-
-func (m *CCFStockClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func (m *CCFStockClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*CCFStockClassify, err error) {
-	o := global.DmSQL["data"]
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-func (m *CCFStockClassify) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*CCFStockClassify, err error) {
-	o := global.DmSQL["data"]
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-// CCFStockClassifyItem CCF化纤-装置分类
-type CCFStockClassifyItem struct {
-	ClassifyId   int    `description:"分类ID"`
-	ClassifyName string `description:"分类名称"`
-	CreateTime   string `description:"创建时间"`
-	ModifyTime   string `description:"修改时间"`
-}
-
-func (m *CCFStockClassify) Format2Item() (item *CCFStockClassifyItem) {
-	item = new(CCFStockClassifyItem)
-	item.ClassifyId = m.CcfStockClassifyId
-	item.ClassifyName = m.ClassifyName
-	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, m.CreateTime)
-	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, m.ModifyTime)
-	return
-}

+ 0 - 177
models/data_manage/ccf_stock_excel.go

@@ -1,177 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"html"
-	"regexp"
-	"strings"
-	"time"
-)
-
-// CCFStockExcel CCF化纤装置表格
-type CCFStockExcel struct {
-	CcfStockExcelId int       `orm:"column(ccf_stock_excel_id);pk" gorm:"primaryKey" `
-	ClassifyId      int       `description:"分类ID"`
-	ExcelDate       time.Time `description:"表格日期"`
-	ExcelContent    string    `description:"表格HTML"`
-	FromPage        string    `description:"表格来源"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
-}
-
-func (m *CCFStockExcel) TableName() string {
-	return "ccf_stock_excel"
-}
-
-type CCFStockExcelCols struct {
-	CcfStockExcelId string
-	ClassifyId      string
-	ExcelDate       string
-	ExcelContent    string
-	FromPage        string
-	CreateTime      string
-	ModifyTime      string
-}
-
-func (m *CCFStockExcel) Cols() CCFStockExcelCols {
-	return CCFStockExcelCols{
-		CcfStockExcelId: "ccf_stock_excel_id",
-		ClassifyId:      "classify_id",
-		ExcelDate:       "excel_date",
-		ExcelContent:    "excel_content",
-		FromPage:        "from_page",
-		CreateTime:      "create_time",
-		ModifyTime:      "modify_time",
-	}
-}
-
-func (m *CCFStockExcel) PrimaryId() string {
-	return m.Cols().CcfStockExcelId
-}
-
-func (m *CCFStockExcel) Create() (err error) {
-	err = global.DmSQL["data"].Create(m).Error
-
-	return
-}
-
-func (m *CCFStockExcel) CreateMulti(items []*CCFStockExcel) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-
-	return
-}
-
-func (m *CCFStockExcel) Update(cols []string) (err error) {
-	o := global.DmSQL["data"]
-	err = o.Select(cols).Updates(m).Error
-
-	return
-}
-
-func (m *CCFStockExcel) Del() (err error) {
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Exec(sql, m.CcfStockExcelId).Error
-
-	return
-}
-
-func (m *CCFStockExcel) MultiDel(menuIds []int) (err error) {
-	if len(menuIds) == 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	err = o.Exec(sql, menuIds).Error
-
-	return
-}
-
-func (m *CCFStockExcel) GetItemById(id int) (item *CCFStockExcel, err error) {
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).First(&item).Error
-	return
-}
-
-func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *CCFStockExcel, err error) {
-	o := global.DmSQL["data"]
-	order := ``
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars...).First(&item).Error
-
-	return
-}
-
-func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-func (m *CCFStockExcel) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*CCFStockExcel, err error) {
-	o := global.DmSQL["data"]
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-func (m *CCFStockExcel) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*CCFStockExcel, err error) {
-	o := global.DmSQL["data"]
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := fmt.Sprintf(`ORDER BY %s DESC`, m.Cols().CreateTime)
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = o.Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
-type CCFStockExcelItem struct {
-	ExcelId      int    `description:"表格ID"`
-	ClassifyId   int    `description:"分类ID"`
-	ExcelDate    string `description:"表格日期"`
-	ExcelContent string `description:"表格HTML"`
-	CreateTime   string `description:"创建时间"`
-	ModifyTime   string `description:"修改时间"`
-}
-
-func (m *CCFStockExcel) Format2Item() (item *CCFStockExcelItem) {
-	item = new(CCFStockExcelItem)
-	item.ExcelId = m.CcfStockExcelId
-	item.ClassifyId = m.ClassifyId
-	item.ExcelDate = utils.TimeTransferString(utils.FormatDate, m.ExcelDate)
-	content := html.UnescapeString(m.ExcelContent)
-	content = regexp.MustCompile(`\n`).ReplaceAllString(content, "")
-	item.ExcelContent = html.UnescapeString(content)
-	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, m.CreateTime)
-	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, m.ModifyTime)
-	return
-}

+ 0 - 47
models/data_manage/request/sci_data.go

@@ -1,47 +0,0 @@
-package request
-
-// AddBaseFromSciClassifyReq 添加SMM分类请求
-type AddBaseFromSciClassifyReq struct {
-	ParentId     int    `description:"上级id"`
-	ClassifyName string `description:"分类名称"`
-	//Level        int    `description:"层级,第一级传0,其余传上一级的层级"`
-}
-
-// EditBaseFromSciClassifyReq 修改SMM分类请求
-type EditBaseFromSciClassifyReq struct {
-	ClassifyName string `description:"分类名称"`
-	ClassifyId   int    `description:"分类id"`
-}
-
-// MoveBaseFromSciClassifyReq 移动分类请求参数
-type MoveBaseFromSciClassifyReq struct {
-	ClassifyId     int `description:"分类id"`
-	ParentId       int `description:"父级分类id"`
-	PrevClassifyId int `description:"上一个兄弟节点分类id"`
-	NextClassifyId int `description:"下一个兄弟节点分类id"`
-}
-
-// DelBaseFromSciClassifyReq 删除SMM分类请求
-type DelBaseFromSciClassifyReq struct {
-	ClassifyId int `description:"分类id"`
-}
-
-// MoveBaseFromSciReq 移动指标请求参数
-type MoveBaseFromSciReq struct {
-	ClassifyId             int `description:"分类id"`
-	BaseFromSciIndexId     int `description:"指标id"`
-	PrevBaseFromSciIndexId int `description:"上一个兄弟节点分类id"`
-	NextBaseFromSciIndexId int `description:"下一个兄弟节点分类id"`
-}
-
-
-// EditBaseFromSciReq 编辑SMM指标
-type EditBaseFromSciReq struct {
-	BaseFromSciIndexId int `description:"指标id"`
-	ClassifyId         int `description:"分类id"`
-}
-
-// DelBaseFromSciReq 删除SMM指标
-type DelBaseFromSciReq struct {
-	BaseFromSciIndexId int `description:"指标id"`
-}

+ 0 - 71
models/data_manage/request/sci_hq_data.go

@@ -1,71 +0,0 @@
-package request
-
-type AddBaseFromSciHqClassifyReq struct {
-	ParentId     int    `description:"上级id"`
-	ClassifyName string `description:"分类名称"`
-}
-
-// DelBaseFromSciHqReq 删除卓创红期分类
-type DelBaseFromSciHqClassifyReq struct {
-	ClassifyId int `description:"分类id"`
-}
-
-// EditBaseFromSciClassifyReq 编辑卓创红期分类
-type EditBaseFromSciHqClassifyReq struct {
-	ClassifyName string `description:"分类名称"`
-	ClassifyId   int    `description:"分类id"`
-}
-
-// EditBaseFromSciHqReq 编辑卓创红期指标所属分类
-type EditBaseFromSciHqReq struct {
-	BaseFromSciHqIndexId int `description:"指标id"`
-	ClassifyId           int `description:"分类id"`
-}
-
-// DelBaseFromSciHqReq 删除卓创红期指标
-type DelBaseFromSciHqReq struct {
-	BaseFromSciHqIndexId int `description:"指标id"`
-}
-
-// ResetBaseFromSciHqReq 重置指标所属分类
-type ResetBaseFromSciHqReq struct {
-	BaseFromSciHqIndexId int `description:"指标id"`
-}
-
-// SciHqDataBatchAddCheckReq 卓创红期指标批量添加校验
-type SciHqDataBatchAddCheckReq struct {
-	// MysteelChemicalDataListReq
-	IndexCodes []string `description:"指标编码"`
-}
-
-// SciHqDataBatchListReq 卓创红期指标批量列表
-type SciHqDataBatchListReq struct {
-	ClassifyId  int    `description:"分类id"`
-	KeyWord     string `description:"关键字"`
-	SelectedId  []int  `description:"已选指标id, 为true时表示反选"`
-	IsSelectAll bool   `description:"是否查询全部, 默认false, true:全选, false:查询已选"`
-}
-
-// MoveBaseFromSciHqClassifyReq 移动分类请求参数
-type MoveBaseFromSciHqClassifyReq struct {
-	ClassifyId     int `description:"分类id"`
-	ParentId       int `description:"父级分类id"`
-	PrevClassifyId int `description:"上一个兄弟节点分类id"`
-	NextClassifyId int `description:"下一个兄弟节点分类id"`
-}
-
-// MoveBaseFromSciHqReq 移动指标请求参数
-type MoveBaseFromSciHqReq struct {
-	ClassifyId               int `description:"分类id"`
-	BaseFromSciHqIndexId     int `description:"指标id"`
-	PrevBaseFromSciHqIndexId int `description:"上一个兄弟节点id"`
-	NextBaseFromSciHqIndexId int `description:"下一个兄弟节点id"`
-}
-
-// ExportSciHqExcelReq导出卓创红期excel指标
-type ExportSciHqExcelReq struct {
-	KeyWord       string   `description:"关键字, 指标编码或指标ID"`
-	IndexCode     []string `description:"指标编码,全选时,表示反选"`
-	IsSelectedAll bool     `description:"是否全选:true:全选|false: 无"`
-	ClassifyId    int      `description:"指标id"`
-}

+ 0 - 35
models/data_manage/response/sci_hq_data.go

@@ -1,35 +0,0 @@
-package response
-
-import (
-	"eta_gn/eta_api/models/data_manage"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type SciHqIndexPageListResp struct {
-	List   []*data_manage.BaseFromSciHqIndexView
-	Paging *paging.PagingItem
-}
-
-type EditSciHqIndexInfoResp struct {
-	BaseFromSciHqIndexId int
-	IndexCode            string
-}
-
-type SciHqSingleDataResp struct {
-	BaseFromSciHqIndexId int
-	ClassifyId           int
-	EdbInfoId            int
-	Name                 string
-	IndexCode            string
-	IndexName            string
-	Frequency            string
-	Unit                 string
-	ApiStartTime         string
-	ApiUpdateTime        string
-	StartTime            string
-	FinishTime           string
-	CreateTime           string
-	ModifyTime           string
-	Data                 []*data_manage.BaseFromSciHqData
-}

+ 0 - 149
models/data_manage/sci_data.go

@@ -1,149 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type SciClassify struct {
-	TypeName string `orm:"column(type_name)" description:"分类名称"`
-	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
-}
-
-type SciFrequency struct {
-	Frequency string `description:"频度"`
-}
-
-func GetSciFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err error) {
-	sql := ` SELECT frequency FROM base_from_sci_index WHERE classify_id = ? `
-	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
-	return
-}
-
-type SciIndex struct {
-	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey" `
-	Interface          string
-	Name               string
-	IndexCode          string
-	IndexName          string
-	Type1              string `orm:"column(type_1)"`
-	Type2              string `orm:"column(type_2)"`
-	Type3              string `orm:"column(type_3)"`
-	Frequency          string
-	Unit               string
-	ApiStartTime       string
-	ApiUpdateTime      string
-	StartTime          string
-	FinishTime         string
-	CreateTime         string
-	ModifyTime         string
-}
-
-func GetSciIndex(condition string, pars []interface{}) (items []*SciIndex, err error) {
-	sql := ` SELECT * FROM base_from_sci_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY sort ASC, base_from_sci_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-
-	return
-}
-
-type SciExportIndex struct {
-	TypeName   string
-	IndexCode  string
-	IndexName  string
-	Type1      string `orm:"column(type_1)"`
-	Type2      string `orm:"column(type_2)"`
-	Type3      string `orm:"column(type_3)"`
-	Frequency  string
-	Unit       string
-	ModifyTime string
-}
-
-func GetSciFrequency(classifyId int) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
-	return
-}
-
-func GetSciFrequencyByCode(code string) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	err = global.DmSQL["data"].Raw(sql, code).Find(&items).Error
-	return
-}
-
-type SciIndexList struct {
-	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey" `
-	Interface          string
-	Name               string
-	IndexCode          string
-	IndexName          string
-	Type1              string `orm:"column(type_1)"`
-	Type2              string `orm:"column(type_2)"`
-	Type3              string `orm:"column(type_3)"`
-	Frequency          string
-	Unit               string
-	ApiStartTime       string
-	ApiUpdateTime      string
-	StartTime          string
-	FinishTime         string
-	ModifyTime         string
-	DataList           []*SciIndexData
-	Paging             *paging.PagingItem `description:"分页数据"`
-}
-
-type SciIndexData struct {
-	Value    string `orm:"column(value)" description:"日期"`
-	DataTime string `orm:"column(data_time)" description:"值"`
-}
-
-func GetSciIndexData(indexCode string, startSize, pageSize int) (items []*SciIndexData, err error) {
-	sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
-	return
-}
-
-func GetSciIndexDataCount(indexCode string) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-	return
-}
-
-// GetSciItemList 模糊查询Sci数据库指标列表
-func GetSciItemList(keyword string) (items []*SciIndex, err error) {
-	sql := "SELECT * FROM base_from_sci_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
-	return
-}
-
-func GetSciIndexDataByCode(indexCode string) (items []*SciIndexData, err error) {
-	sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
-	return
-}
-
-func GetSciDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_sci_index AS a
-				INNER JOIN base_from_sci_data AS b ON a.index_code=b.index_code
-				WHERE a.classify_id=?
-				GROUP BY a.base_from_sci_index_id
-			)AS t `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
-	return
-}
-
-type ExportSciDataMaxCount struct {
-	TypeName string
-	Count    int
-}
-
-type ExportSciIndexData struct {
-	Value     string `orm:"column(value)" description:"日期"`
-	DataTime  string `orm:"column(data_time)" description:"值"`
-	IndexCode string `orm:"column(index_code)" description:"指标编码"`
-}

+ 0 - 13
models/db2.go

@@ -221,24 +221,14 @@ func initEdbData() {
 		new(data_manage.PredictEdbConf),                  //预测指标配置
 		new(data_manage.BaseFromMysteelChemicalClassify), //预测指标配置
 		new(data_manage.BaseFromMysteelChemicalIndex),    //钢联化工
-		new(data_manage.BaseFromEiaSteoClassify),         // Eia steo 报告指标
-		new(data_manage.BaseFromEiaSteoIndex),            // Eia steo 报告指标分类
 		new(data_manage.PredictEdbRuleData),              //预测指标,动态规则的计算数据
 		new(data_manage.ComTradeCountry),                 //联合国商品贸易数据库的国家编码表
 		new(data_manage.ComTradeData),                    //联合国商品贸易数据表
-		new(data_manage.BaseFromSci),
-		new(data_manage.BaseFromSciIndex),
-		new(data_manage.BaseFromSciData),
-		new(data_manage.BaseFromSciClassify),
 		new(data_manage.TradePositionDalianTop),
 		new(data_manage.TradePositionZhengzhouTop),
 		new(data_manage.TradePositionCffexTop),
 		new(data_manage.TradePositionShanghaiTop),
 		new(data_manage.TradePositionIneTop),
-		new(data_manage.BaseFromBaiinfo),
-		new(data_manage.BaseFromBaiinfoIndex),
-		new(data_manage.BaseFromBaiinfoData),
-		new(data_manage.BaseFromBaiinfoClassify),
 		new(data_manage.EdbDataInsertConfig),      // 指标数据插入配置表
 		new(data_manage.EdbInfoNoPermissionAdmin), //指标不可见用户配置表
 		new(data_manage.EdbTerminal),              //指标终端
@@ -247,9 +237,6 @@ func initEdbData() {
 		new(data_manage.BaseFromThsHfClassify),
 		new(data_manage.BaseFromEdbMapping),
 		new(data_manage.EdbInfoRelation), //指标关系表
-		new(data_manage.BaseFromSciHqClassify),
-		new(data_manage.BaseFromSciHqIndex),
-		new(data_manage.BaseFromSciHqData),
 	)
 }
 

+ 12 - 867
routers/commentsRouter.go

@@ -2608,60 +2608,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromChangesVisitorsCovidController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromChangesVisitorsCovidController"],
-		beego.ControllerComments{
-			Method:           "VisitorsCovidLastDate",
-			Router:           `/visitors_covid/last_date`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromChangesVisitorsCovidController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromChangesVisitorsCovidController"],
-		beego.ControllerComments{
-			Method:           "VisitorsCovidList",
-			Router:           `/visitors_covid/list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"],
-		beego.ControllerComments{
-			Method:           "ClassifyList",
-			Router:           `/base_from_national_statistics/classify_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"],
-		beego.ControllerComments{
-			Method:           "DbList",
-			Router:           `/base_from_national_statistics/db_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"],
-		beego.ControllerComments{
-			Method:           "IndexDetail",
-			Router:           `/base_from_national_statistics/index_detail`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromNationalStatisticsController"],
-		beego.ControllerComments{
-			Method:           "IndexList",
-			Router:           `/base_from_national_statistics/index_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromThsHfController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:BaseFromThsHfController"],
 		beego.ControllerComments{
 			Method:           "ClassifyAdd",
@@ -3967,195 +3913,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoClassify",
-			Router:           `/baiinfo/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "AddBaiinfoClassify",
-			Router:           `/baiinfo/classify/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "DeleteBaiinfoClassify",
-			Router:           `/baiinfo/classify/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EditBaiinfoClassify",
-			Router:           `/baiinfo/classify/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "MoveBaiinfoClassify",
-			Router:           `/baiinfo/classify/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoClassifyName",
-			Router:           `/baiinfo/classify/name`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoData",
-			Router:           `/baiinfo/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "DeleteBaiinfoData",
-			Router:           `/baiinfo/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EditBaiinfo",
-			Router:           `/baiinfo/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoFrequency",
-			Router:           `/baiinfo/frequency`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "MoveBaiinfoData",
-			Router:           `/baiinfo/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ResetBaiinfoData",
-			Router:           `/baiinfo/reset`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoSearchList",
-			Router:           `/baiinfo/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "BaiinfoSingleData",
-			Router:           `/baiinfo/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFClassify",
-			Router:           `/ccf/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ExportCCFList",
-			Router:           `/ccf/export`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFIndexData",
-			Router:           `/ccf/index/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFSearchList",
-			Router:           `/ccf/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFSingleData",
-			Router:           `/ccf/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFStockClassify",
-			Router:           `/ccf/stock/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "CCFStockTable",
-			Router:           `/ccf/stock/table`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
 		beego.ControllerComments{
 			Method:           "BatchChartInfoRefresh",
@@ -4678,42 +4435,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EiaSteoClassify",
-			Router:           `/eia_steo/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EiaSteoData",
-			Router:           `/eia_steo/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EiaSteoSearchList",
-			Router:           `/eia_steo/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ExportBaiinfoList",
-			Router:           `/export/baiinfoList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
 		beego.ControllerComments{
 			Method:           "ExportGlList",
@@ -4741,15 +4462,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ExportSciList",
-			Router:           `/export/sciList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
 		beego.ControllerComments{
 			Method:           "ExportSmmList",
@@ -4759,96 +4471,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenweiClassify",
-			Router:           `/fenwei/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ExportFenweiList",
-			Router:           `/fenwei/export`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "GetFenWeiFrequencyList",
-			Router:           `/fenwei/frequency/list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "GetFenWeiIndexInfo",
-			Router:           `/fenwei/get/index/info`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenWeiIndexAdd",
-			Router:           `/fenwei/index/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenWeiIndexAddValidate",
-			Router:           `/fenwei/index/add/validate`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenweiIndexData",
-			Router:           `/fenwei/index/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenWeiIndexDataExport",
-			Router:           `/fenwei/index/data/export`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenweiSearchList",
-			Router:           `/fenwei/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "FenweiSingleData",
-			Router:           `/fenwei/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
 		beego.ControllerComments{
 			Method:           "GlClassify",
@@ -5038,132 +4660,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciClassify",
-			Router:           `/sci/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "AddSciClassify",
-			Router:           `/sci/classify/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "DeleteSciClassify",
-			Router:           `/sci/classify/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EditSciClassify",
-			Router:           `/sci/classify/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "MoveSciClassify",
-			Router:           `/sci/classify/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciClassifyName",
-			Router:           `/sci/classify/name`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciData",
-			Router:           `/sci/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "DeleteSciData",
-			Router:           `/sci/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EditSci",
-			Router:           `/sci/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciFrequency",
-			Router:           `/sci/frequency`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "MoveSciData",
-			Router:           `/sci/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "ResetSciData",
-			Router:           `/sci/reset`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciSearchList",
-			Router:           `/sci/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "SciSingleData",
-			Router:           `/sci/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbInfoController"],
 		beego.ControllerComments{
 			Method:           "SmmApiList",
@@ -5411,61 +4907,34 @@ func init() {
 		beego.ControllerComments{
 			Method:           "CalculateFuncList",
 			Router:           `/factor_edb_series/calculate_func/list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
-		beego.ControllerComments{
-			Method:           "CorrelationMatrix",
-			Router:           `/factor_edb_series/correlation/matrix`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
-		beego.ControllerComments{
-			Method:           "Detail",
-			Router:           `/factor_edb_series/detail`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
-		beego.ControllerComments{
-			Method:           "Edit",
-			Router:           `/factor_edb_series/edit`,
-			AllowHTTPMethods: []string{"post"},
+			AllowHTTPMethods: []string{"get"},
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"],
+	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
 		beego.ControllerComments{
-			Method:           "FrequencyList",
-			Router:           `/edb_source/jiayue/frequency_list`,
-			AllowHTTPMethods: []string{"get"},
+			Method:           "CorrelationMatrix",
+			Router:           `/factor_edb_series/correlation/matrix`,
+			AllowHTTPMethods: []string{"post"},
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"],
+	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
 		beego.ControllerComments{
-			Method:           "IndexPageList",
-			Router:           `/edb_source/jiayue/index_page_list`,
+			Method:           "Detail",
+			Router:           `/factor_edb_series/detail`,
 			AllowHTTPMethods: []string{"get"},
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:JiaYueEdbSourceController"],
+	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:FactorEdbSeriesController"],
 		beego.ControllerComments{
-			Method:           "List",
-			Router:           `/edb_source/jiayue/list`,
-			AllowHTTPMethods: []string{"get"},
+			Method:           "Edit",
+			Router:           `/factor_edb_series/edit`,
+			AllowHTTPMethods: []string{"post"},
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
@@ -6100,195 +5569,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "ExportSciHqList",
-			Router:           `/export/sciHqList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "Classify",
-			Router:           `/sci_hq/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "AddClassify",
-			Router:           `/sci_hq/classify/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "DelClassify",
-			Router:           `/sci_hq/classify/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "EditClassify",
-			Router:           `/sci_hq/classify/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "MoveClassify",
-			Router:           `/sci_hq/classify/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "DeleteSciHqData",
-			Router:           `/sci_hq/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "AddEdbInfo",
-			Router:           `/sci_hq/edb_info/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "AddCheck",
-			Router:           `/sci_hq/edb_info/add_check`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "BatchAdd",
-			Router:           `/sci_hq/edb_info/batch_add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "BatchDelete",
-			Router:           `/sci_hq/edb_info/batch_delete`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "BatchEdit",
-			Router:           `/sci_hq/edb_info/batch_edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "NameCheck",
-			Router:           `/sci_hq/edb_info/name_check`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "EditSciHq",
-			Router:           `/sci_hq/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "BatchIndexList",
-			Router:           `/sci_hq/index/batch_list`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "IndexList",
-			Router:           `/sci_hq/index/list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "IndexPageList",
-			Router:           `/sci_hq/index/page/list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "MoveSciHqData",
-			Router:           `/sci_hq/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "ResetSciHqIndex",
-			Router:           `/sci_hq/reset`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "SearchList",
-			Router:           `/sci_hq/search_list`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:SciHqDataController"],
-		beego.ControllerComments{
-			Method:           "SingleData",
-			Router:           `/sci_hq/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_source:DataSourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_source:DataSourceController"],
 		beego.ControllerComments{
 			Method:           "GfexClassifyList",
@@ -10861,15 +10141,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "ExportoilchemList",
-			Router:           `/data/export/oilchemList`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
 		beego.ControllerComments{
 			Method:           "IneDataList",
@@ -10879,123 +10150,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "MtjhClassify",
-			Router:           `/data/mtjh/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "MtjhData",
-			Router:           `/data/mtjh/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "MtjhFrequency",
-			Router:           `/data/mtjh/frequency`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "MtjhSearchList",
-			Router:           `/data/mtjh/search`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "MtjhSingleData",
-			Router:           `/data/mtjh/single_data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "AddCheck",
-			Router:           `/data/oilchem/add_check`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "BatchAdd",
-			Router:           `/data/oilchem/batch_add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "BatchIndexList",
-			Router:           `/data/oilchem/batch_list`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "OilchemClassify",
-			Router:           `/data/oilchem/classify`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "OilchemData",
-			Router:           `/data/oilchem/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "OilchemIndexList",
-			Router:           `/data/oilchem/indexList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "NameCheck",
-			Router:           `/data/oilchem/name_check`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "OilchemSearchList",
-			Router:           `/data/oilchem/search`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
 		beego.ControllerComments{
 			Method:           "ShfeDataList",
@@ -11023,15 +10177,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TradeCommonController"],
-		beego.ControllerComments{
-			Method:           "ExportMtjhList",
-			Router:           `/export/mtjh`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:UserLoginController"],
 		beego.ControllerComments{
 			Method:           "AreaCodeList",

+ 0 - 4
routers/router.go

@@ -155,13 +155,10 @@ func init() {
 				&data_manage.ChartClassifyController{},
 				&data_manage.ChartInfoController{},
 				&data_manage.ManualController{},
-				&data_manage.BaseFromChangesVisitorsCovidController{},
 				&excel.ExcelClassifyController{},
 				&excel.ExcelInfoController{},
 				&data_manage.PredictEdbClassifyController{},
 				&data_manage.PredictEdbInfoController{},
-				&data_manage.BaseFromNationalStatisticsController{},
-				&data_manage.JiaYueEdbSourceController{},
 				&data_manage.ChartThemeController{},
 				&data_manage_permission.DataMangePermissionController{},
 				&data_manage.BloombergDataController{},
@@ -169,7 +166,6 @@ func init() {
 				&data_manage.BaseFromThsHfController{},
 				&data_manage.EdbInfoRelationController{},
 				&data_manage.FactorEdbSeriesController{},
-				&data_manage.SciHqDataController{},
 				&data_manage.EdbCollectController{},
 				&data_manage.EdbCollectClassifyController{},
 			),

+ 0 - 9
services/data/base_bridge.go

@@ -41,12 +41,3 @@ type BridgeIndexDataItem struct {
 	DataTime   time.Time `description:"数据日期"`
 	UpdateTime time.Time `description:"更新时间"`
 }
-
-// InitBridgeOB 初始化桥接服务
-func InitBridgeOB(bridgeKey string) EdbBridge {
-	switch bridgeKey {
-	case "bridge_jiayue":
-		return new(EdbBridgeJiaYue) // 嘉悦物产
-	}
-	return nil
-}

+ 0 - 527
services/data/base_from_baiinfo.go

@@ -1,527 +0,0 @@
-package data
-
-import (
-	"errors"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// AddBaiinfoClassify 添加SCI分类
-func AddBaiinfoClassify(classifyName string, parentId, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.BaseFromBaiinfoClassify, err error, errMsg string) {
-	// 校验分类名称相同的数量
-	{
-		var count int
-		switch lang {
-		case utils.EnLangVersion:
-			count, err = data_manage.GetBaseFromBaiinfoClassifyEnCount(classifyName, parentId)
-		default:
-			count, err = data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, parentId)
-		}
-		if err != nil {
-			errMsg = `判断名称是否已存在失败`
-			return
-		}
-		if count > 0 {
-			errMsg = `分类名称已存在,请重新输入`
-			err = errors.New(errMsg)
-			return
-		}
-	}
-
-	level := 1
-	if parentId > 0 {
-		parentClassify, e := data_manage.GetBaseFromBaiinfoClassifyById(parentId)
-		if e != nil {
-			if utils.IsErrNoRow(e) {
-				err = e
-				errMsg = `一级分类不存在`
-				return
-			}
-			err = e
-			errMsg = `查询一级分类失败`
-			return
-		}
-		level = parentClassify.Level + 1
-	}
-	classifyInfo = &data_manage.BaseFromBaiinfoClassify{
-		ClassifyName:    classifyName,
-		ClassifyNameEn:  classifyName,
-		ParentId:        parentId,
-		SysUserId:       sysUserId,
-		SysUserRealName: sysUserName,
-		Sort:            0,
-		Level:           level,
-		ModifyTime:      time.Now(),
-		CreateTime:      time.Now(),
-	}
-	classifyId, err := data_manage.AddBaseFromBaiinfoClassify(classifyInfo)
-	if err != nil {
-		errMsg = "保存分类失败"
-		return
-	}
-	classifyInfo.ClassifyId = int(classifyId)
-	//更新sort为classifyId
-	err = data_manage.UpdateBaseFromBaiinfoClassifySort(int(classifyId))
-	return
-}
-
-// EditBaiinfoClassify 编辑Baiinfo分类
-func EditBaiinfoClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
-	item, err := data_manage.GetBaseFromBaiinfoClassifyById(classifyId)
-	if err != nil {
-		errMsg = `保存失败`
-		return
-	}
-
-	switch lang {
-	case utils.EnLangVersion:
-		// 名字相同,那么就直接返回
-		if item.ClassifyNameEn == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromBaiinfoClassifyEnCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromBaiinfoClassifyEn(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	default:
-
-		// 名字相同,那么就直接返回
-		if item.ClassifyName == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromBaiinfoClassify(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	}
-
-	return
-}
-
-// MoveBaiinfoClassify 移动Baiinfo分类
-func MoveBaiinfoClassify(classifyId, parentClassifyId, prevClassifyId, nextClassifyId int) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromBaiinfoClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	updateCol := make([]string, 0)
-
-	//判断上级id是否一致,如果不一致的话,那么需要移动该分类层级
-	if classifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
-		parentClassifyInfo, tmpErr := data_manage.GetBaseFromBaiinfoClassifyById(parentClassifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上级分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		classifyInfo.ParentId = parentClassifyInfo.ClassifyId
-		classifyInfo.Level = parentClassifyInfo.Level + 1
-		updateCol = append(updateCol, "ParentId", "Level")
-	}
-	var currentSort, prevSort, nextSort int
-	currentSort = classifyInfo.Sort
-
-	var prevClassify *data_manage.BaseFromBaiinfoClassify
-	var nextClassify *data_manage.BaseFromBaiinfoClassify
-	//如果有传入 上一个兄弟节点分类id
-	if prevClassifyId > 0 {
-		prevClassify, err = data_manage.GetBaseFromBaiinfoClassifyById(prevClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevClassify.Sort
-	}
-	if nextClassifyId > 0 {
-		//下一个兄弟节点
-		nextClassify, err = data_manage.GetBaseFromBaiinfoClassifyById(nextClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextClassify.Sort
-	}
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部
-		//更新为0排序的数据为当前最小排序
-		if nextClassify != nil {
-			minSort, e := data_manage.GetBaiinfoIndexClassifyMinSort(parentClassifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextClassify.Sort = minSort
-			err = nextClassify.Update([]string{"Sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownBaiinfoIndexClassifyBySort(parentClassifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpBaiinfoIndexClassifyBySort(parentClassifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = nextSort
-	}
-	classifyInfo.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = classifyInfo.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// DelBaiinfoClassify 删除SCI分类
-func DelBaiinfoClassify(classifyId int, sysUser *system.Admin) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromBaiinfoClassifyById(classifyId)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	// 需要删除的分类id集合
-	classifyIdList := make([]int, 0)
-	classifyIdList = append(classifyIdList, classifyId)
-	// 查找所有的子集id
-	if classifyInfo.ParentId <= 0 {
-		childrenClassifyInfoList, tmpErr := data_manage.GetBaseFromBaiinfoClassifyByParentId(classifyId)
-		if tmpErr != nil {
-			errMsg = "删除失败"
-			err = errors.New("获取分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		for _, v := range childrenClassifyInfoList {
-			classifyIdList = append(classifyIdList, v.ClassifyId)
-		}
-	}
-
-	// 获取分类下的所有指标
-	count, err := data_manage.GetBaseFromBaiinfoIndexCountByClassifyIds(classifyIdList)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	if count > 0 {
-		errMsg = "该分类下有指标,不可删除"
-		err = errors.New("该分类下有指标,不可删除")
-		return
-	}
-
-	// 删除对应的分类
-	err = data_manage.DeleteBaiinfoClassifyByClassifyId(classifyIdList)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// MoveBaiinfoData2 移动SCI指标
-func MoveBaiinfoData2(indexId, classifyId, prevIndexId, nextIndexId int) (err error, errMsg string) {
-	//分类信息
-	baiinfoIndex, err := data_manage.GetBaseFromBaiinfoIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	//判断分类是否存在
-	if classifyId > 0 {
-		_, err = data_manage.GetBaseFromBaiinfoClassifyById(classifyId)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取分类信息失败,Err:" + err.Error())
-			if utils.IsErrNoRow(err) {
-				errMsg = "找不到该分类"
-				err = nil
-			}
-			return
-		}
-	}
-
-	//如果改变了分类,那么移动该图表数据
-	if baiinfoIndex.ClassifyId != classifyId {
-		tmpErr := data_manage.MoveBaseFromBaiinfoIndex(indexId, classifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("移动失败,Err:" + tmpErr.Error())
-			return
-		}
-	}
-
-	//移动排序
-	updateCol := make([]string, 0)
-	var currentSort, prevSort, nextSort int
-	currentSort = baiinfoIndex.Sort
-	//如果有传入 上一个兄弟节点分类id
-	var prevIndex *data_manage.BaseFromBaiinfoIndex
-	var nextIndex *data_manage.BaseFromBaiinfoIndex
-	if prevIndexId > 0 {
-		prevIndex, err = data_manage.GetBaseFromBaiinfoIndexByIndexId(prevIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevIndex.Sort
-	}
-
-	if nextIndexId > 0 {
-		//下一个兄弟节点
-		nextIndex, err = data_manage.GetBaseFromBaiinfoIndexByIndexId(nextIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextIndex.Sort
-	}
-
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部, 但是历史数据里下个节点的sort为0的情况
-		//更新为0排序的数据为当前最小排序
-		if nextIndex != nil {
-			minSort, e := data_manage.GetBaseFromBaiinfoIndexMinSortByClassifyId(classifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextIndex.Sort = minSort
-			err = nextIndex.Update([]string{"Sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownBaiinfoIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		baiinfoIndex.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpBaiinfoIndexBySort(classifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		baiinfoIndex.Sort = nextSort
-	}
-
-	//更新
-	baiinfoIndex.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = baiinfoIndex.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// EditBaiinfoIndex 编辑SCI指标
-func EditBaiinfoIndex(indexId, classifyId int, frequency, unit string, sysUser *system.Admin) (baseFromBaiinfoIndex *data_manage.BaseFromBaiinfoIndex, err error, errMsg string) {
-	baseFromBaiinfoIndex, err = data_manage.GetBaseFromBaiinfoIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	baseFromBaiinfoIndex.ClassifyId = classifyId
-	baseFromBaiinfoIndex.ModifyTime = time.Now()
-	baseFromBaiinfoIndex.Frequency = frequency
-	baseFromBaiinfoIndex.Unit = unit
-	err = baseFromBaiinfoIndex.Update([]string{"ClassifyId", "ModifyTime", "frequency", "unit"})
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-
-	return
-}
-
-// DelBaiinfoData 删除SCI指标
-func DelBaiinfoData(indexId int) (err error, errMsg string) {
-	baseFromBaiinfoIndex, err := data_manage.GetBaseFromBaiinfoIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 获取已经加入到EDB指标库的Baiinfo指标
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_BAIINFO, baseFromBaiinfoIndex.IndexCode)
-	if err != nil && !utils.IsErrNoRow(err) {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-	if edbInfo != nil {
-		errMsg = "当前指标已被引用,不可删除"
-		err = nil
-		return
-	}
-
-	// 删除对应的分类和指标
-	err = data_manage.DeleteBaseFromBaiinfoIndexById(indexId)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// ResetBaiinfoData 指标数据清除分类接口
-func ResetBaiinfoData(indexId int) (err error, errMsg string) {
-	baiinfoIndex, err := data_manage.GetBaseFromBaiinfoIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 更新指标在未分类下的排序,永远排在未分类的最后一个
-	//移动排序
-	classifyId := 0
-	updateCol := make([]string, 0)
-	var currentSort, prevSort int
-	currentSort = baiinfoIndex.Sort
-	//未分类的最大的sort值
-	prevSort, err = data_manage.GetBaseFromBaiinfoIndexMaxSortByClassifyId(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	//如果前面一个节点的sort值比当前大,则当前节点往下移动
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownBaiinfoIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		baiinfoIndex.Sort = prevSort
-	}
-
-	//更新
-	baiinfoIndex.ModifyTime = time.Now()
-	baiinfoIndex.ClassifyId = classifyId
-	updateCol = append(updateCol, "Sort", "ModifyTime", "ClassifyId")
-	err = baiinfoIndex.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}

+ 0 - 162
services/data/base_from_fenwei_index_service.go

@@ -1,162 +0,0 @@
-// Package data
-// @Author gmy 2024/8/22 9:44:00
-package data
-
-import (
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"fmt"
-)
-
-// FenWeiIndexAddValidate 指标添加校验
-func FenWeiIndexAddValidate(indexCodes []string) (*[]data_manage.FenWeiIndexCheckData, error) {
-	// 根据指标编码获取指标库 指标信息
-	edbInfos, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_FENWEI, indexCodes)
-	if err != nil {
-		return nil, err
-	}
-	var respList []data_manage.FenWeiIndexCheckData
-	if len(edbInfos) > 0 {
-		for _, ebdInfo := range edbInfos {
-			respList = append(respList, data_manage.FenWeiIndexCheckData{
-				IndexCode:  ebdInfo.EdbCode,
-				IndexName:  ebdInfo.EdbName,
-				Unit:       ebdInfo.Unit,
-				Frequency:  ebdInfo.Frequency,
-				EdbInfoId:  ebdInfo.EdbInfoId,
-				ClassifyId: ebdInfo.ClassifyId,
-				UniqueCode: ebdInfo.UniqueCode,
-			})
-		}
-	}
-	return &respList, nil
-}
-
-// FenWeiIndexNameCheck 指标名称校验
-func FenWeiIndexNameCheck(indexNames []string, resp []*data_manage.FenWeiNameCheckResult) ([]*data_manage.FenWeiNameCheckResult, error) {
-	// 重名校验
-	edbList, e := data_manage.GetEdbInfoByNameArr(indexNames, utils.EDB_INFO_TYPE)
-	if e != nil {
-		return nil, e
-	}
-	nameExists := make(map[string]bool)
-	for _, edbInfo := range edbList {
-		nameExists[edbInfo.EdbName] = true
-	}
-	if len(nameExists) > 0 {
-		for _, v := range resp {
-			v.Exist = nameExists[v.IndexName]
-		}
-	}
-	return resp, nil
-}
-
-// FenWeiIndexAdd 批量添加指标
-func FenWeiIndexAdd(req data_manage.FenWeiIndexAddReq, lang string) (edb *data_manage.EdbInfo, err error, errMsg string, skip bool) {
-	if req.EdbCode == "" {
-		err = fmt.Errorf("指标ID为空")
-		return
-	}
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("BloombergIndexSource2Edb新增失败, Err: %s", err.Error())
-			utils.FileLog.Info(tips)
-		}
-	}()
-	source := utils.DATA_SOURCE_FENWEI
-
-	// 是否已有指标数据
-	dataList, e := data_manage.GetEdbDataAllByEdbCode(req.EdbCode, source, utils.DATA_SUB_SOURCE_EDB, utils.EDB_DATA_LIMIT)
-	if e != nil {
-		err = fmt.Errorf("获取指标数据失败, Err: %s", e.Error())
-		return
-	}
-
-	// 新增指标数据
-	if len(dataList) == 0 {
-		res, e := AddEdbData(source, req.EdbCode, req.Frequency)
-		if e != nil {
-			err = fmt.Errorf("index_lib: 新增指标数据失败, Err: %s", e.Error())
-			return
-		}
-		if res == nil {
-			err = fmt.Errorf("index_lib: 新增指标数据失败, res nil")
-			return
-		}
-		if res.Ret != 200 {
-			err = fmt.Errorf("index_lib: 新增指标数据失败, Ret: %d", res.Ret)
-			return
-		}
-	}
-
-	// 是否新增过指标
-	exist, e := data_manage.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
-		return
-	}
-	if exist != nil {
-		skip = true
-		return
-	}
-
-	// 开始结束时间
-	var startDate, endDate string
-	minMax, e := data_manage.GetEdbInfoMaxAndMinInfo(source, utils.DATA_SUB_SOURCE_EDB, req.EdbCode)
-	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("MinMax: 获取指标极值失败, err: %s", e.Error())
-		return
-	}
-	if minMax != nil {
-		startDate = minMax.MinDate
-		endDate = minMax.MaxDate
-	}
-
-	// 新增指标到指标库
-	edbInfo, e, msg, _ := EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, startDate, endDate, req.AdminId, req.AdminRealName, lang)
-	if e != nil {
-		errMsg = msg
-		err = fmt.Errorf("EdbInfo: 新增指标失败, err: %s", e.Error())
-		return
-	}
-	edb = edbInfo
-
-	// EdbInfoAdd方法已经新增es,这里不需要再新增???
-	// 新增es
-	// go AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-	return
-}
-
-// GetFenWeiIndexInfo 获取指标信息-分页
-func GetFenWeiIndexInfo(keyWord string, classifyIdList []string, frequencyList []string) (fenWeiIndexInfoList []*data_manage.BaseFromFenweiIndex, err error) {
-
-	// 获取指标
-	var condition string
-	var pars []interface{}
-	if keyWord != "" {
-		condition += ` AND CONCAT(index_name,index_code) LIKE '%` + keyWord + `%'`
-	}
-	if len(classifyIdList) > 0 {
-		condition += ` AND classify_id IN (`
-		for _, v := range classifyIdList {
-			condition += `?,`
-			pars = append(pars, v)
-		}
-		condition = condition[:len(condition)-1] + `)`
-	}
-	if len(frequencyList) > 0 {
-		condition += ` AND frequency IN (`
-		for _, v := range frequencyList {
-			condition += `?,`
-			pars = append(pars, v)
-		}
-		condition = condition[:len(condition)-1] + `)`
-	}
-
-	fenWeiIndexInfoList, err = data_manage.GetFenWeiIndexInfoPage(condition, pars)
-	if err != nil {
-		return
-	}
-
-	return
-}

+ 0 - 59
services/data/base_from_oilchem.go

@@ -1,59 +0,0 @@
-package data
-
-import (
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"fmt"
-)
-
-type OilchemIndexSource2EdbReq struct {
-	EdbCode       string
-	EdbName       string
-	Frequency     string
-	Unit          string
-	ClassifyId    int
-	AdminId       int
-	AdminRealName string
-}
-
-// OilchemIndexSource2Edb 新增隆众资讯数据从数据源到指标库
-func OilchemIndexSource2Edb(req OilchemIndexSource2EdbReq, lang string) (edb *data_manage.EdbInfo, errMsg string, skip bool, err error) {
-	if req.EdbCode == "" {
-		err = fmt.Errorf("指标ID为空")
-		return
-	}
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("OilchemIndexSource2Edb新增失败, Err: %s", err.Error())
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-		}
-	}()
-	source := utils.DATA_SOURCE_OILCHEM
-
-	// 是否新增过指标
-	exist, e := data_manage.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
-		return
-	}
-	if exist != nil {
-		skip = true
-		return
-	}
-
-	// 开始结束时间
-	var startDate, endDate string
-
-	// 新增指标库
-	edbInfo, e, msg, _ := EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, startDate, endDate, req.AdminId, req.AdminRealName, lang)
-	if e != nil {
-		errMsg = msg
-		err = fmt.Errorf("EdbInfo: 新增指标失败, err: %s", e.Error())
-		return
-	}
-
-	edb = edbInfo
-
-	return
-}

+ 0 - 522
services/data/base_from_sci.go

@@ -1,522 +0,0 @@
-package data
-
-import (
-	"errors"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// AddSciClassify 添加SCI分类
-func AddSciClassify(classifyName string, parentId, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.BaseFromSciClassify, err error, errMsg string) {
-	// 校验分类名称相同的数量
-	{
-		var count int
-		switch lang {
-		case utils.EnLangVersion:
-			count, err = data_manage.GetBaseFromSciClassifyEnCount(classifyName, parentId)
-		default:
-			count, err = data_manage.GetBaseFromSciClassifyCount(classifyName, parentId)
-		}
-		if err != nil {
-			errMsg = `判断名称是否已存在失败`
-			return
-		}
-		if count > 0 {
-			errMsg = `分类名称已存在,请重新输入`
-			err = errors.New(errMsg)
-			return
-		}
-	}
-	level := 1
-	if parentId > 0 {
-		parentClassify, e := data_manage.GetBaseFromSciClassifyById(parentId)
-		if e != nil {
-			if utils.IsErrNoRow(e) {
-				err = e
-				errMsg = `一级分类不存在`
-				return
-			}
-			err = e
-			errMsg = `查询一级分类失败`
-			return
-		}
-		level = parentClassify.Level + 1
-	}
-	classifyInfo = &data_manage.BaseFromSciClassify{
-		ClassifyName:    classifyName,
-		ClassifyNameEn:  classifyName,
-		ParentId:        parentId,
-		SysUserId:       sysUserId,
-		SysUserRealName: sysUserName,
-		Sort:            0,
-		Level:           level,
-		ModifyTime:      time.Now(),
-		CreateTime:      time.Now(),
-	}
-	classifyId, err := data_manage.AddBaseFromSciClassify(classifyInfo)
-	if err != nil {
-		errMsg = "保存分类失败"
-		return
-	}
-	classifyInfo.ClassifyId = int(classifyId)
-	//更新sort为classifyId
-	err = data_manage.UpdateBaseFromSciClassifySort(int(classifyId))
-	return
-}
-
-// EditSciClassify 编辑Sci分类
-func EditSciClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
-	item, err := data_manage.GetBaseFromSciClassifyById(classifyId)
-	if err != nil {
-		errMsg = `保存失败`
-		return
-	}
-	switch lang {
-	case utils.EnLangVersion:
-		// 名字相同,那么就直接返回
-		if item.ClassifyNameEn == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromSciClassifyEnCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromSciClassifyEn(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	default:
-		// 名字相同,那么就直接返回
-		if item.ClassifyName == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromSciClassifyCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromSciClassify(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	}
-
-	return
-}
-
-// MoveSciClassify 移动Sci分类
-func MoveSciClassify(classifyId, parentClassifyId, prevClassifyId, nextClassifyId int) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromSciClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	updateCol := make([]string, 0)
-
-	//判断上级id是否一致,如果不一致的话,那么需要移动该分类层级
-	if classifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
-		parentClassifyInfo, tmpErr := data_manage.GetBaseFromSciClassifyById(parentClassifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上级分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		classifyInfo.ParentId = parentClassifyInfo.ClassifyId
-		classifyInfo.Level = parentClassifyInfo.Level + 1
-		updateCol = append(updateCol, "ParentId", "Level")
-	}
-	var currentSort, prevSort, nextSort int
-	currentSort = classifyInfo.Sort
-
-	var prevClassify *data_manage.BaseFromSciClassify
-	var nextClassify *data_manage.BaseFromSciClassify
-	//如果有传入 上一个兄弟节点分类id
-	if prevClassifyId > 0 {
-		prevClassify, err = data_manage.GetBaseFromSciClassifyById(prevClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevClassify.Sort
-	}
-	if nextClassifyId > 0 {
-		//下一个兄弟节点
-		nextClassify, err = data_manage.GetBaseFromSciClassifyById(nextClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextClassify.Sort
-	}
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部
-		//更新为0排序的数据为当前最小排序
-		if nextClassify != nil {
-			minSort, e := data_manage.GetSciIndexClassifyMinSort(parentClassifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextClassify.Sort = minSort
-			err = nextClassify.Update([]string{"Sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciIndexClassifyBySort(parentClassifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpSciIndexClassifyBySort(parentClassifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = nextSort
-	}
-	classifyInfo.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = classifyInfo.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// DelSciClassify 删除SCI分类
-func DelSciClassify(classifyId int, sysUser *system.Admin) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromSciClassifyById(classifyId)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	// 需要删除的分类id集合
-	classifyIdList := make([]int, 0)
-	classifyIdList = append(classifyIdList, classifyId)
-	// 查找所有的子集id
-	if classifyInfo.ParentId <= 0 {
-		childrenClassifyInfoList, tmpErr := data_manage.GetBaseFromSciClassifyByParentId(classifyId)
-		if tmpErr != nil {
-			errMsg = "删除失败"
-			err = errors.New("获取分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		for _, v := range childrenClassifyInfoList {
-			classifyIdList = append(classifyIdList, v.ClassifyId)
-		}
-	}
-
-	// 获取分类下的所有指标
-	count, err := data_manage.GetBaseFromSciIndexCountByClassifyIds(classifyIdList)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	if count > 0 {
-		errMsg = "该分类下有指标,不可删除"
-		err = errors.New("该分类下有指标,不可删除")
-		return
-	}
-
-	// 删除对应的分类
-	err = data_manage.DeleteSciClassifyByClassifyId(classifyIdList)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// MoveSciData2 移动SCI指标
-func MoveSciData2(indexId, classifyId, prevIndexId, nextIndexId int) (err error, errMsg string) {
-	//分类信息
-	sciIndex, err := data_manage.GetBaseFromSciIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	//判断分类是否存在
-	if classifyId > 0 {
-		_, err = data_manage.GetBaseFromSciClassifyById(classifyId)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取分类信息失败,Err:" + err.Error())
-			if utils.IsErrNoRow(err) {
-				errMsg = "找不到该分类"
-				err = nil
-			}
-			return
-		}
-	}
-
-	//如果改变了分类,那么移动该图表数据
-	if sciIndex.ClassifyId != classifyId {
-		tmpErr := data_manage.MoveBaseFromSciIndex(indexId, classifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("移动失败,Err:" + tmpErr.Error())
-			return
-		}
-	}
-
-	//移动排序
-	updateCol := make([]string, 0)
-	var currentSort, prevSort, nextSort int
-	currentSort = sciIndex.Sort
-	//如果有传入 上一个兄弟节点分类id
-	var prevIndex *data_manage.BaseFromSciIndex
-	var nextIndex *data_manage.BaseFromSciIndex
-	if prevIndexId > 0 {
-		prevIndex, err = data_manage.GetBaseFromSciIndexByIndexId(prevIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevIndex.Sort
-	}
-
-	if nextIndexId > 0 {
-		//下一个兄弟节点
-		nextIndex, err = data_manage.GetBaseFromSciIndexByIndexId(nextIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextIndex.Sort
-	}
-
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部, 但是历史数据里下个节点的sort为0的情况
-		//更新为0排序的数据为当前最小排序
-		if nextIndex != nil {
-			minSort, e := data_manage.GetBaseFromSciIndexMinSortByClassifyId(classifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextIndex.Sort = minSort
-			err = nextIndex.Update([]string{"Sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		sciIndex.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpSciIndexBySort(classifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		sciIndex.Sort = nextSort
-	}
-
-	//更新
-	sciIndex.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = sciIndex.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// EditSciIndex 编辑SCI指标
-func EditSciIndex(indexId, classifyId int, sysUser *system.Admin) (baseFromSciIndex *data_manage.BaseFromSciIndex, err error, errMsg string) {
-	baseFromSciIndex, err = data_manage.GetBaseFromSciIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	baseFromSciIndex.ClassifyId = classifyId
-	baseFromSciIndex.ModifyTime = time.Now()
-	err = baseFromSciIndex.Update([]string{"ClassifyId", "ModifyTime"})
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-
-	return
-}
-
-// DelSciData 删除SCI指标
-func DelSciData(indexId int) (err error, errMsg string) {
-	baseFromSciIndex, err := data_manage.GetBaseFromSciIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 获取已经加入到EDB指标库的Sci指标
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI, baseFromSciIndex.IndexCode)
-	if err != nil && !utils.IsErrNoRow(err) {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-	if edbInfo != nil {
-		errMsg = "当前指标已被引用,不可删除"
-		err = nil
-		return
-	}
-
-	// 删除对应的分类和指标
-	err = data_manage.DeleteBaseFromSciIndexById(indexId)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// ResetSciData 指标数据清除分类接口
-func ResetSciData(indexId int) (err error, errMsg string) {
-	sciIndex, err := data_manage.GetBaseFromSciIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 更新指标在未分类下的排序,永远排在未分类的最后一个
-	//移动排序
-	classifyId := 0
-	updateCol := make([]string, 0)
-	var currentSort, prevSort int
-	currentSort = sciIndex.Sort
-	//未分类的最大的sort值
-	prevSort, err = data_manage.GetBaseFromSciIndexMaxSortByClassifyId(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	//如果前面一个节点的sort值比当前大,则当前节点往下移动
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		sciIndex.Sort = prevSort
-	}
-
-	//更新
-	sciIndex.ModifyTime = time.Now()
-	sciIndex.ClassifyId = classifyId
-	updateCol = append(updateCol, "Sort", "ModifyTime", "ClassifyId")
-	err = sciIndex.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}

+ 0 - 583
services/data/base_from_sci_hq.go

@@ -1,583 +0,0 @@
-package data
-
-import (
-	"errors"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, msg string, err error) {
-	var count int
-	switch lang {
-	case utils.EnLangVersion:
-		count, err = data_manage.GetBaseFromSciHqClassifyEnCount(classifyName, parentId)
-	default:
-		count, err = data_manage.GetBaseFromSciHqClassifyCount(classifyName, parentId)
-	}
-	if err != nil {
-		return
-	}
-	if count > 0 {
-		return false, "分类已存在", nil
-	}
-
-	sort, err := data_manage.GetChildSciHqClassifyMaxSortById(parentId)
-	if err != nil {
-		return false, "", err
-	}
-	if parentId > 0 {
-		count, err = data_manage.GetSciHqClassifyCountById(parentId)
-		if err != nil {
-			return false, "", err
-		}
-		if count == 0 {
-			return false, "", errors.New("父分类不存在")
-		}
-		sciHqClassify := &data_manage.BaseFromSciHqClassify{
-			ClassifyName:   classifyName,
-			ClassifyNameEn: classifyName,
-			ParentId:       parentId,
-			Level:          2,
-			Sort:           sort + 1,
-			ModifyTime:     time.Now(),
-			CreateTime:     time.Now(),
-		}
-		_, err = sciHqClassify.Add()
-		if err != nil {
-			return
-		}
-	} else {
-		sciHqClassify := &data_manage.BaseFromSciHqClassify{
-			ClassifyName:   classifyName,
-			ClassifyNameEn: classifyName,
-			ParentId:       0,
-			Level:          1,
-			Sort:           sort + 1,
-			ModifyTime:     time.Now(),
-			CreateTime:     time.Now(),
-		}
-		insertId, er := sciHqClassify.Add()
-		if er != nil {
-			return false, "", er
-		}
-		sciHqClassifyList := []*data_manage.BaseFromSciHqClassify{
-			{
-				ClassifyName:   "价格",
-				ClassifyNameEn: "价格",
-				ParentId:       int(insertId),
-				Level:          2,
-				Sort:           1,
-				ModifyTime:     time.Now(),
-				CreateTime:     time.Now(),
-			},
-			{
-				ClassifyName:   "供应",
-				ClassifyNameEn: "供应",
-				ParentId:       int(insertId),
-				Level:          2,
-				Sort:           2,
-				ModifyTime:     time.Now(),
-				CreateTime:     time.Now(),
-			},
-			{
-				ClassifyName:   "需求",
-				ClassifyNameEn: "需求",
-				ParentId:       int(insertId),
-				Level:          2,
-				Sort:           3,
-				ModifyTime:     time.Now(),
-				CreateTime:     time.Now(),
-			},
-			{
-				ClassifyName:   "库存",
-				ClassifyNameEn: "库存",
-				ParentId:       int(insertId),
-				Level:          2,
-				Sort:           4,
-				ModifyTime:     time.Now(),
-				CreateTime:     time.Now(),
-			},
-		}
-		err = data_manage.BatchAddSciHqClassify(sciHqClassifyList)
-		if err != nil {
-			return
-		}
-	}
-	return true, "", nil
-}
-
-func DelSciHqClassify(classifyId int) (err error) {
-	classify, err := data_manage.GetSciHqClassifyById(classifyId)
-	if err != nil {
-		return
-	}
-	var classifyIds []int
-	classifyIds = append(classifyIds, classify.ClassifyId)
-	if classify.ParentId == 0 {
-		tmpClassifyIds, er := data_manage.GetChildSciHqClassifyIdsById(classify.ClassifyId)
-		if er != nil {
-			err = er
-			return
-		}
-		classifyIds = append(classifyIds, tmpClassifyIds...)
-	}
-	// 获取分类下的所有指标
-	count, err := data_manage.GetSciHqIndexCountByClassifyIds(classifyIds)
-	if err != nil {
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-	if count > 0 {
-		err = errors.New("该分类下有指标,不可删除")
-		return
-	}
-	// 删除对应的分类
-	err = data_manage.DeleteSciHqClassifyByClassifyId(classifyIds)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// ResetSciHqIndex 指标数据清除分类接口
-func ResetSciHqIndex(indexId int) (err error) {
-	sciHqIndex, err := data_manage.GetSciHqIndexByIndexId(indexId)
-	if err != nil {
-		return
-	}
-
-	// 更新指标在未分类下的排序,永远排在未分类的最后一个
-	//移动排序
-	classifyId := 0
-	updateCol := make([]string, 0)
-	var currentSort, prevSort int
-	currentSort = sciHqIndex.Sort
-	//未分类的最大的sort值
-	prevSort, err = data_manage.GetSciHqIndexMaxSortByClassifyId(classifyId)
-	if err != nil {
-		err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	//如果前面一个节点的sort值比当前大,则当前节点往下移动
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		sciHqIndex.Sort = prevSort
-	}
-
-	//更新
-	sciHqIndex.ModifyTime = time.Now()
-	sciHqIndex.ClassifyId = classifyId
-	updateCol = append(updateCol, "Sort", "ModifyTime", "ClassifyId")
-	err = sciHqIndex.Update(updateCol)
-	if err != nil {
-		err = errors.New("移动失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// 批量删除卓创红期指标
-func BatchDelSciHqData(indexIds []int) (existIndex []*data_manage.BaseFromSciHqIndex, err error) {
-	sciHqIndexList, err := data_manage.GetSciHqIndexListByIndexIds(indexIds)
-	if err != nil {
-		return
-	}
-
-	indexCodes := make([]string, 0)
-	codeToIndex := make(map[string]*data_manage.BaseFromSciHqIndex)
-	for _, v := range sciHqIndexList {
-		indexCodes = append(indexCodes, v.IndexCode)
-		codeToIndex[v.IndexCode] = v
-	}
-
-	edbInfoList, err := data_manage.GetEdbInfoListByEdbCodes(utils.DATA_SOURCE_SCI_HQ, indexCodes)
-	if err != nil {
-		return
-	}
-	deleteIndexIds := make([]int, 0)
-	for _, v := range edbInfoList {
-		if index, ok := codeToIndex[v.EdbCode]; ok {
-			existIndex = append(existIndex, index)
-			delete(codeToIndex, v.EdbCode)
-		}
-	}
-	for _, v := range codeToIndex {
-		deleteIndexIds = append(deleteIndexIds, v.BaseFromSciHqIndexId)
-	}
-
-	// 删除对应的指标
-	err = data_manage.DeleteSciHqIndexByIds(deleteIndexIds)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// DelSciHqData 删除卓创红期指标
-func DelSciHqData(indexId int) (err error, errMsg string) {
-	baseFromSciHqIndex, err := data_manage.GetSciHqIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 获取已经加入到EDB指标库的Sci指标
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, baseFromSciHqIndex.IndexCode)
-	if err != nil && !utils.IsErrNoRow(err) {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-	if edbInfo != nil {
-		errMsg = "当前指标已被引用,不可删除"
-		err = nil
-		return
-	}
-
-	// 删除对应的指标
-	err = data_manage.DeleteSciHqIndexById(indexId)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// EditSciHqIndex 编辑卓创红期指标
-func EditSciHqIndex(indexId, classifyId int) (baseFromSciHqIndex *data_manage.BaseFromSciHqIndex, errMsg string, err error) {
-	baseFromSciHqIndex, err = data_manage.GetSciHqIndexByIndexId(indexId)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-	classify, err := data_manage.GetSciHqClassifyById(classifyId)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			errMsg = `该分类不存在或已删除`
-			err = nil
-		}
-		return
-	}
-	if classify.Level == 1 { // 顶级分类
-		errMsg = `不合法的编辑`
-		err = nil
-		return
-	}
-	maxSort, err := data_manage.GetChildSciHqClassifyMaxSortById(classifyId)
-	if err != nil {
-		return
-	}
-
-	baseFromSciHqIndex.ClassifyId = classifyId
-	baseFromSciHqIndex.Sort = maxSort + 1
-	baseFromSciHqIndex.ModifyTime = time.Now()
-	err = baseFromSciHqIndex.Update([]string{"classify_id", "sort", "modify_time"})
-	return
-}
-
-type SciHqIndexSource2EdbReq struct {
-	EdbCode       string
-	EdbName       string
-	Frequency     string
-	Unit          string
-	ClassifyId    int
-	AdminId       int
-	AdminRealName string
-}
-
-// SciHqIndexSource2Edb 新增卓创红期数据从数据源到指标库
-func SciHqIndexSource2Edb(req SciHqIndexSource2EdbReq, lang string) (edb *data_manage.EdbInfo, errMsg string, skip bool, err error) {
-	if req.EdbCode == "" {
-		err = fmt.Errorf("指标ID为空")
-		return
-	}
-	defer func() {
-		if err != nil {
-			tips := fmt.Sprintf("SciHqIndexSource2Edb新增失败, Err: %s", err.Error())
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-		}
-	}()
-	source := utils.DATA_SOURCE_SCI_HQ
-
-	// 是否新增过指标
-	exist, e := data_manage.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
-		return
-	}
-	if exist != nil {
-		skip = true
-		return
-	}
-
-	// 开始结束时间
-	var startDate, endDate string
-
-	// 新增指标库
-	edbInfo, e, msg, _ := EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, startDate, endDate, req.AdminId, req.AdminRealName, lang)
-	if e != nil {
-		errMsg = msg
-		err = fmt.Errorf("EdbInfo: 新增指标失败, err: %s", e.Error())
-		return
-	}
-
-	edb = edbInfo
-
-	return
-}
-
-// MoveSciHqClassify 移动卓创红期分类
-func MoveSciHqClassify(classifyId, parentClassifyId, prevClassifyId, nextClassifyId int) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetSciHqClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	updateCol := make([]string, 0)
-
-	//判断上级id是否一致,如果不一致的话,那么需要移动该分类层级
-	if classifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
-		parentClassifyInfo, tmpErr := data_manage.GetSciHqClassifyById(parentClassifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上级分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		classifyInfo.ParentId = parentClassifyInfo.ClassifyId
-		classifyInfo.Level = parentClassifyInfo.Level + 1
-		updateCol = append(updateCol, "ParentId", "Level")
-	}
-	var currentSort, prevSort, nextSort int
-	currentSort = classifyInfo.Sort
-
-	var prevClassify *data_manage.BaseFromSciHqClassify
-	var nextClassify *data_manage.BaseFromSciHqClassify
-	//如果有传入 上一个兄弟节点分类id
-	if prevClassifyId > 0 {
-		prevClassify, err = data_manage.GetSciHqClassifyById(prevClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevClassify.Sort
-	}
-	if nextClassifyId > 0 {
-		//下一个兄弟节点
-		nextClassify, err = data_manage.GetSciHqClassifyById(nextClassifyId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点分类信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextClassify.Sort
-	}
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部
-		//更新为0排序的数据为当前最小排序
-		if nextClassify != nil {
-			minSort, e := data_manage.GetSciHqIndexClassifyMinSort(parentClassifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextClassify.Sort = minSort
-			err = nextClassify.Update([]string{"sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciHqIndexClassifyBySort(parentClassifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpSciHqIndexClassifyBySort(parentClassifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		classifyInfo.Sort = nextSort
-	}
-	classifyInfo.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = classifyInfo.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// MoveSciHqData 移动卓创红期指标
-func MoveSciHqData(indexId, classifyId, prevIndexId, nextIndexId int) (err error, errMsg string) {
-	//分类信息
-	sciHqIndex, err := data_manage.GetSciHqIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	//判断分类是否存在
-	if classifyId > 0 {
-		_, err = data_manage.GetSciHqClassifyById(classifyId)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取分类信息失败,Err:" + err.Error())
-			if utils.IsErrNoRow(err) {
-				errMsg = "找不到该分类"
-				err = nil
-			}
-			return
-		}
-	}
-
-	//如果改变了分类,那么移动该图表数据
-	if sciHqIndex.ClassifyId != classifyId {
-		tmpErr := data_manage.MoveSciHqIndex(indexId, classifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("移动失败,Err:" + tmpErr.Error())
-			return
-		}
-	}
-
-	//移动排序
-	updateCol := make([]string, 0)
-	var currentSort, prevSort, nextSort int
-	currentSort = sciHqIndex.Sort
-	//如果有传入 上一个兄弟节点分类id
-	var prevIndex *data_manage.BaseFromSciHqIndex
-	var nextIndex *data_manage.BaseFromSciHqIndex
-	if prevIndexId > 0 {
-		prevIndex, err = data_manage.GetSciHqIndexByIndexId(prevIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("上一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		prevSort = prevIndex.Sort
-	}
-
-	if nextIndexId > 0 {
-		//下一个兄弟节点
-		nextIndex, err = data_manage.GetSciHqIndexByIndexId(nextIndexId)
-		if err != nil {
-			if utils.IsErrNoRow(err) {
-				errMsg = "移动失败"
-				err = errors.New("下一个兄弟节点指标信息不存在" + err.Error())
-				return
-			}
-			errMsg = "移动失败"
-			err = errors.New("获取下一个兄弟节点指标信息失败,Err:" + err.Error())
-			return
-		}
-		nextSort = nextIndex.Sort
-	}
-
-	// 修改历史数据中的排序为0的情况
-	if prevSort == 0 && nextSort == 0 { //目标是让当前分类处于目录的最顶部, 但是历史数据里下个节点的sort为0的情况
-		//更新为0排序的数据为当前最小排序
-		if nextIndex != nil {
-			minSort, e := data_manage.GetSciHqIndexMinSortByClassifyId(classifyId)
-			if e != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + e.Error())
-				return
-			}
-			if minSort > 1 {
-				minSort -= 1
-			}
-			nextIndex.Sort = minSort
-			err = nextIndex.Update([]string{"Sort"})
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("更新下一个兄弟节点分类信息失败,Err:" + err.Error())
-				return
-			}
-			nextSort = minSort
-		}
-	}
-	//移到两个排序值中间操作
-	if prevSort >= currentSort {
-		//往下移动
-		err = data_manage.MoveDownSciHqIndexBySort(classifyId, prevSort, currentSort)
-		if err != nil {
-			err = errors.New("向下移动出错:" + err.Error())
-			return
-		}
-		sciHqIndex.Sort = prevSort
-	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
-		err = data_manage.MoveUpSciHqIndexBySort(classifyId, nextSort, currentSort)
-		if err != nil {
-			err = errors.New("向上移动出错:" + err.Error())
-			return
-		}
-		sciHqIndex.Sort = nextSort
-	}
-
-	//更新
-	sciHqIndex.ModifyTime = time.Now()
-	updateCol = append(updateCol, "Sort", "ModifyTime")
-	err = sciHqIndex.Update(updateCol)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-	return
-}

+ 0 - 241
services/data/jiayue_index.go

@@ -1,241 +0,0 @@
-package data
-
-import (
-	"encoding/json"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-// 桥接服务接口
-var (
-	BridgeApiJiaYueIndexUrl         = "/api/index_data/jiayue/index"          // 获取指标信息
-	BridgeApiJiaYueIndexDataUrl     = "/api/index_data/jiayue/index_data"     // 获取指标数据
-	BridgeApiJiaYuePageIndexUrl     = "/api/index_data/jiayue/page_index"     // 获取指标列表-分页
-	BridgeApiJiaYueFrequencyListUrl = "/api/index_data/jiayue/frequency_list" // 获取指标频度列表
-)
-
-type EdbBridgeJiaYue struct{}
-
-// GetIndex 获取指标信息
-func (brg *EdbBridgeJiaYue) GetIndex(req GetIndexFromBridgeReq) (item BridgeIndexItem, err error) {
-	var params data_manage.BridgeJiaYueIndexParams
-	params.IndexCode = req.IndexCode
-	params.SourceExtend = req.SourceExtend
-	params.IndexCodeRequired = req.IndexCodeRequired
-	indexData, e := GetJiaYueIndexFromBridge(params)
-	if e != nil {
-		err = fmt.Errorf("GetJiaYueIndexDataFromBridge err: %s", e.Error())
-		return
-	}
-	if indexData.Id <= 0 {
-		return
-	}
-	item.Id = indexData.Id
-	item.IndexCode = indexData.IndexCode
-	item.IndexName = indexData.IndexName
-	item.Unit = indexData.Unit
-	item.Frequency = brg.TransFrequency(indexData.Frequency)
-	return
-}
-
-// TransFrequency 嘉悦指标频度转换
-func (brg *EdbBridgeJiaYue) TransFrequency(origin string) string {
-	mapping := map[string]string{
-		"日":   "日度",
-		"周":   "周度",
-		"旬":   "旬度",
-		"半月":  "旬度",
-		"月":   "月度",
-		"季":   "季度",
-		"半年":  "半年度",
-		"年":   "年度",
-		"日度":  "日度",
-		"周度":  "周度",
-		"旬度":  "旬度",
-		"月度":  "月度",
-		"季度":  "季度",
-		"半年度": "半年度",
-		"年度":  "年度",
-	}
-	return mapping[origin]
-}
-
-// GetJiaYueIndexFromBridge 从桥接服务获取指标信息
-func GetJiaYueIndexFromBridge(param data_manage.BridgeJiaYueIndexParams) (indexData data_manage.BridgeJiaYueIndexAndData, err error) {
-	defer func() {
-		if err != nil {
-			b, _ := json.Marshal(param)
-			tips := fmt.Sprintf("桥接服务-获取嘉悦指标信息, err: %s, params: %s", err.Error(), string(b))
-			go alarm_msg.SendAlarmMsg(tips, 3)
-		}
-	}()
-
-	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYueIndexUrl)
-	data, e := json.Marshal(param)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-	body := ioutil.NopCloser(strings.NewReader(string(data)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", checkToken)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
-	}
-
-	result := new(data_manage.BridgeJiaYueResultIndexData)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	indexData = result.Data
-	return
-}
-
-// GetJiaYueFrequencyListFromBridge 获取指标频度列表
-func GetJiaYueFrequencyListFromBridge() (frequencies []string, err error) {
-	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYueFrequencyListUrl)
-	body := ioutil.NopCloser(strings.NewReader(""))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", checkToken)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
-	}
-
-	result := new(data_manage.BridgeJiaYueResultFrequencyList)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	frequencies = result.Data
-	return
-}
-
-// GetJiaYueIndexPageListFromBridge 获取指标分页列表
-func GetJiaYueIndexPageListFromBridge(param data_manage.BridgeJiaYuePageIndexReq) (total int, items []data_manage.DictIndex, err error) {
-	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYuePageIndexUrl)
-	data, e := json.Marshal(param)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-	body := ioutil.NopCloser(strings.NewReader(string(data)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", checkToken)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
-	}
-
-	result := new(data_manage.BridgeJiaYueResultIndexPageList)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	total = result.Data.Total
-	items = result.Data.List
-	return
-}