瀏覽代碼

删除不必要的煤炭数据相关代码

- 移除了与煤炭数据相关的多个模型和函数
- 删除了煤炭数据导出功能和相关控制器方法
- 移除了与煤炭数据相关的常量定义
Roc 5 月之前
父節點
當前提交
4161b1c334
共有 48 個文件被更改,包括 29 次插入11238 次删除
  1. 0 313
      controllers/commodity_trade_base_index.go
  2. 0 263
      controllers/data_manage/com_trade.go
  3. 1 157
      controllers/data_manage/edb_info.go
  4. 0 106
      controllers/data_manage/edb_info_refresh.go
  5. 0 509
      controllers/data_manage/gl_data.go
  6. 0 727
      controllers/data_manage/lz_data.go
  7. 0 1909
      controllers/data_manage/mysteel_chemical_data.go
  8. 0 416
      controllers/data_source/guagnzhouqihuo.go
  9. 0 329
      controllers/data_source/icpi.go
  10. 0 332
      controllers/data_source/sci99.go
  11. 0 1009
      controllers/data_stat/edb_source_stat.go
  12. 0 475
      controllers/target.go
  13. 0 109
      models/data_manage/coal_data.go
  14. 0 44
      models/data_manage/com_trade_country.go
  15. 0 86
      models/data_manage/com_trade_data.go
  16. 0 55
      models/data_manage/com_trade_index.go
  17. 0 16
      models/data_manage/edb_data_quarter.go
  18. 10 0
      models/data_manage/edb_data_wind.go
  19. 0 15
      models/data_manage/edb_data_wind_wsd.go
  20. 15 3
      models/data_manage/edb_info.go
  21. 0 146
      models/data_manage/gl_data.go
  22. 0 147
      models/data_manage/jiayue_index.go
  23. 0 98
      models/data_manage/lz_data.go
  24. 0 248
      models/data_manage/mysteel_chemical_classify.go
  25. 0 626
      models/data_manage/mysteel_chemical_index.go
  26. 0 91
      models/data_source/base_from_sci99.go
  27. 0 131
      models/data_source/guagnzhouqihuo.go
  28. 0 109
      models/data_source/icpi.go
  29. 0 178
      models/data_source/longzhong.go
  30. 0 114
      models/data_stat/edb_info_delete_log.go
  31. 0 70
      models/data_stat/edb_info_stat_column.go
  32. 0 105
      models/data_stat/edb_info_update_log.go
  33. 0 148
      models/data_stat/edb_info_update_stat.go
  34. 0 74
      models/data_stat/edb_source_stat.go
  35. 2 20
      models/db2.go
  36. 0 80
      models/eta_trial/request.go
  37. 0 186
      models/target.go
  38. 0 549
      routers/commentsRouter.go
  39. 0 7
      routers/router.go
  40. 0 167
      services/data/data_manage_permission/data_move.go
  41. 0 3
      services/data/edb_classify.go
  42. 0 14
      services/data/edb_info.go
  43. 1 52
      services/data/edb_info_refresh.go
  44. 0 862
      services/data/mysteel_chemical.go
  45. 0 61
      services/data_stat/edb_delete_log.go
  46. 0 57
      services/data_stat/edb_info_stat.go
  47. 0 21
      services/task.go
  48. 0 1
      utils/constants.go

+ 0 - 313
controllers/commodity_trade_base_index.go

@@ -6,12 +6,8 @@ import (
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 )
 
 type TradeCommonController struct {
@@ -1672,35 +1668,6 @@ func (this *TradeCommonController) CoalMineData() {
 	}
 }
 
-// CoalSearchList
-// @Title 煤炭网模糊搜索
-// @Description 煤炭网模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /data/coalMineData/search [get]
-func (this *TradeCommonController) CoalSearchList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	//关键字
-	keyword := this.GetString("Keyword")
-
-	list, err := data_manage.GetCoalItemList(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 获取煤炭单条数据
@@ -1996,286 +1963,6 @@ func (this *TradeCommonController) CoalSingleData() {
 	}
 }
 
-// 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/coalList [get]
-func (this *TradeCommonController) ExportCoalList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	classifyId, _ := this.GetInt("ClassifyId")
-	var suffix string
-	if classifyId == 1 {
-		suffix = "jsm_index"
-	} else if classifyId == 2 {
-		suffix = "company_index"
-	} else if classifyId == 3 {
-		suffix = "firm_index"
-	} else if classifyId == 4 {
-		suffix = "coastal_index"
-	} else if classifyId == 5 {
-		suffix = "inland_index"
-	}
-	breedName := this.GetString("TypeName") //分类
-
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	//不为空就是导出分类表
-	if breedName != "" {
-		//获取指标
-		var secNameList []*string
-		var err error
-		if classifyId == 1 {
-			secNameList, err = data_manage.GetClassifyJsmByGroupName(breedName)
-			if err != nil {
-				fmt.Println("获取数据失败,Err:" + err.Error())
-				return
-			}
-		} else {
-			secNameList, err = data_manage.GetClassifyFromCoalByGroupName(suffix, breedName)
-			if err != nil {
-				fmt.Println("获取数据失败,Err:" + err.Error())
-				return
-			}
-		}
-		if len(secNameList) <= 0 {
-			fmt.Println("secNameList长度为0")
-			return
-		}
-		sheetNew, err := xlsxFile.AddSheet(breedName)
-
-		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
-		if classifyId == 1 {
-			dataMax, err = data_manage.GetCoalJsmMaxCount(breedName)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-		} else {
-			dataMax, err = data_manage.GetCoalCompanyMaxCount(suffix, breedName)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-		}
-
-		setRowIndex := 6
-		for k, sv := range secNameList {
-			//获取数据
-			dataList, err := data_manage.GetBaseFromCoalIndexByCode(suffix, *sv)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			windRow.AddCell().SetValue(breedName)
-			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)
-					if classifyId == 3 {
-						displayDateCell := row.AddCell()
-						displayDateCell.SetValue(dv.DataTime)
-					} else {
-						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 {
-		name := this.GetString("IndexName")
-		indexCode := this.GetString("IndexCode") //指标唯一编码
-		unit := this.GetString("UnitName")
-		modifyTime := this.GetString("ModifyTime")
-
-		sheet, err := xlsxFile.AddSheet("指标")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-		//获取数据
-		dataList, err := data_manage.GetBaseFromCoalIndexByCode(suffix, 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(name)
-		indexCodeRow := sheet.AddRow()
-		indexCodeRow.AddCell().SetValue("指标ID")
-		indexCodeRow.AddCell().SetValue(indexCode)
-
-		rowFrequency := sheet.AddRow()
-		celFrequency := rowFrequency.AddCell()
-		celFrequency.SetValue("频率")
-		rowFrequency.AddCell().SetValue(dataList[0].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)
-
-		fmt.Println("len(dataList):", len(dataList))
-		dataMax, err := data_manage.GetCoalCount(suffix, breedName)
-		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("06.01.02") + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}
-
 // EicLatestDateV2
 // @title	获取欧洲天然气最新日期V2
 // @Description	获取欧洲天然气最新日期接口

+ 0 - 263
controllers/data_manage/com_trade.go

@@ -1,263 +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"
-	"time"
-)
-
-// ComTradeCountryList
-// @Title UN国家列表
-// @Description UN国家列表接口
-// @Success 200 {object} []data_manage.ComTradeCountryItem
-// @router /com_trade/country/list [get]
-func (this *EdbInfoController) ComTradeCountryList() {
-	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
-	}
-
-	list, err := data_manage.GetComTradeCountryItemAll()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// ComTradeDataList
-// @Title UN数据列表
-// @Description UN数据列表接口
-// @Param   PageSize   query   int  true       "每页页码数"
-// @Param   CurrentIndex   query   int  true       "当前页码"
-// @Param   IndexCode   query   string  true       "指标code"
-// @Param   Year   query   string  true       "年份"
-// @Param   Date   query   string  true       "日期"
-// @Param   Flow   query   string  true       "贸易流向:X(Export:出口);M(Import:进口)"
-// @Param   ReporterCode   query   string  true       "出口国id"
-// @Param   PartnerCode   query   string  true       "进口国id"
-// @Param   Partner2Code   query   string  true       "第2进口国id"
-// @Param   DateType   query   int  true       "日期类型,0:所有,1:年度,2:月度"
-// @Param   SortParam   query   string  false       "排序字段参数,用来排序的字段, 枚举值:'data_time':日期"
-// @Param   SortType   query   string  true       "如何排序,是正序还是倒序,枚举值:`asc 正序`,`desc 倒叙`"
-// @Success 200 {object} data_manage.ComTradeDataListResp
-// @router /com_trade/data/list [get]
-func (this *EdbInfoController) ComTradeDataList() {
-	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)
-
-	var condition string
-	var pars []interface{}
-
-	// @Param   IndexCode   query   string  true       "指标code"
-	indexCode := this.GetString("IndexCode")
-	if indexCode != `` {
-		condition += ` AND index_code = ? `
-		pars = append(pars, indexCode)
-	}
-	// @Param   Flow   query   string  true       "贸易流向:X(Export:出口);M(Import:进口)"
-	flow := this.GetString("Flow")
-	if flow != `` {
-		condition += ` AND flow = ? `
-		pars = append(pars, flow)
-	}
-	// @Param   DateType   query   int  true       "日期类型,0:所有,1:年度,2:月度"
-	dateType, _ := this.GetInt("DateType", 0)
-	if dateType > 0 {
-		condition += ` AND date_type = ? `
-		pars = append(pars, dateType)
-	}
-	// @Param   Date   query   string  true       "日期"
-	date := this.GetString("Date")
-	if date != `` {
-		switch dateType {
-		case 1:
-			condition += ` AND data_time = ? `
-			pars = append(pars, date+"-12-31")
-		case 2:
-			condition += ` AND data_time = ? `
-			dateTime, tmpErr := time.ParseInLocation(utils.FormatDate, date+"-01", time.Local)
-			if tmpErr != nil {
-				br.Msg = "日期异常"
-				br.ErrMsg = "日期异常:" + tmpErr.Error()
-				return
-			}
-			pars = append(pars, dateTime.AddDate(0, 1, -1).Format(utils.FormatDate))
-		}
-
-	}
-
-	// @Param   ReporterCode   query   string  true       "出口国id"
-	reporterCode := this.GetString("ReporterCode")
-	if reporterCode != `` && reporterCode != `-1` {
-		condition += ` AND reporter_code = ? `
-		pars = append(pars, reporterCode)
-	}
-	// @Param   PartnerCode   query   string  true       "进口国id"
-	partnerCode := this.GetString("PartnerCode")
-	if partnerCode != `` && partnerCode != `-1` {
-		condition += ` AND partner_code = ? `
-		pars = append(pars, partnerCode)
-	}
-	// @Param   Partner2Code   query   string  true       "第2进口国id"
-	partner2Code := this.GetString("Partner2Code")
-	if partner2Code != `` && partner2Code != `-1` {
-		condition += ` AND partner2_code = ? `
-		pars = append(pars, partner2Code)
-	}
-
-	sortParam := this.GetString("SortParam")
-	sortType := this.GetString("SortType")
-	sortStr := ``
-
-	switch sortParam {
-	case "data_time":
-	default:
-		sortParam = " data_time "
-	}
-	switch sortType {
-	case "desc", "asc":
-	default:
-		sortType = "desc"
-	}
-	sortStr = fmt.Sprintf("%s %s,modify_time desc ", sortParam, sortType)
-
-	total, err := data_manage.GetComTradeListCount(condition, pars)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	list, err := data_manage.GetComTradeList(condition, pars, startSize, pageSize, sortStr)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	var lastUpdateTime time.Time
-	lastUpdateTimeStr := ``
-	// 获取用到的指标信息
-	comTradeList, err := data_manage.GetAllComTradeIndexList()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	comTradeMap := make(map[int]*data_manage.ComTradeIndex)
-	for _, v := range comTradeList {
-		comTradeMap[v.ComTradeId] = v
-		if lastUpdateTime.IsZero() || lastUpdateTime.Before(v.UpdateTime) {
-			lastUpdateTime = v.UpdateTime
-			lastUpdateTimeStr = lastUpdateTime.Format(utils.FormatDateTime)
-		}
-	}
-
-	if len(list) > 0 {
-		// 给指标数据赋值指标名称
-		for _, v := range list {
-			if comTradeInfo, ok := comTradeMap[v.ComTradeId]; ok {
-				v.IndexNameCn = comTradeInfo.IndexNameCn
-			}
-			v.Date = fmt.Sprint(v.DataTime.Year())
-			if v.DateType == 2 {
-				v.Date = v.DataTime.Format(utils.FormatYearMonthDate)
-			}
-		}
-	}
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := data_manage.ComTradeDataListResp{
-		Paging:         page,
-		List:           list,
-		LastUpdateTime: lastUpdateTimeStr,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// ComTradeList
-// @Title UN指标列表
-// @Description UN指标列表接口
-// @Param   Keyword   query   string  true       "关键字搜索"
-// @Success 200 {object} []data_manage.ComTradeIndex
-// @router /com_trade/list [get]
-func (this *EdbInfoController) ComTradeList() {
-	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 condition string
-	var pars []interface{}
-
-	// @Param   IndexCode   query   string  true       "指标code"
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += ` AND ( index_name_cn like ? or index_code like ? ) `
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	list, err := data_manage.GetComTradeIndexList(condition, pars)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	if len(list) <= 0 {
-		list = make([]*data_manage.ComTradeIndex, 0)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}

+ 1 - 157
controllers/data_manage/edb_info.go

@@ -16,7 +16,6 @@ import (
 	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	excel2 "eta_gn/eta_api/services/data/excel"
-	"eta_gn/eta_api/services/data_stat"
 	"eta_gn/eta_api/services/elastic"
 	"eta_gn/eta_api/utils"
 	"fmt"
@@ -84,53 +83,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	//判断指标是否存在
 	var item *data_manage.EdbInfo
 	var err error
-	if source == utils.DATA_SOURCE_GL {
-		// 如果是钢联的话,那么就先判断是不是存在钢联化工
-		item, err = data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, edbCode)
-		if err != nil {
-			if !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				return
-			}
-		}
-		err = nil
-		if item != nil {
-			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-		} else {
-			// 判断是不是已经在钢联这边已经存在了
-			item, err = data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_GL, edbCode)
-			if err != nil {
-				if !utils.IsErrNoRow(err) {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
-					return
-				}
-			}
-			err = nil
-
-			// 如果在钢联来源也没找到,那么就需要再判断下是否处于 《钢联化工》 数据源里面
-			if item == nil {
-				tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(edbCode)
-				if err != nil {
-					if !utils.IsErrNoRow(err) {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取失败,Err:" + err.Error()
-						return
-					}
-				}
-				err = nil
-				if tmpInfo != nil {
-					source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-				}
-			}
-
-		}
-	}
-
-	if item == nil {
-		item, err = data_manage.GetEdbInfoByEdbCode(source, edbCode)
-	}
+	item, err = data_manage.GetEdbInfoByEdbCode(source, edbCode)
 	if err != nil {
 		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
@@ -305,60 +258,6 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				}
 				isAdd = true
 			}
-		} 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) {
-				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
-			}
-			//获取指标信息
-			eiasteoInfo, err := data_manage.GetComTradeIndex(edbCode)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
-				return
-			}
-			if eiasteoInfo != nil {
-				//eiasteoInfo.
-				if eiasteoInfo.Type <= 2 {
-					searchItem.Frequency = `年度`
-				} else {
-					searchItem.Frequency = `月度`
-				}
-				if eiasteoInfo.Type == 1 || eiasteoInfo.Type == 3 {
-					searchItem.Unit = "美元"
-				} else {
-					searchItem.Unit = "千克"
-				}
-				searchItem.EdbName = eiasteoInfo.Name
-			}
 		} else if source == utils.DATA_SOURCE_BUSINESS { //自有数据
 			indexObj := data_manage.BaseFromBusinessIndex{}
 			indexInfo, err := indexObj.GetDetailByEdbCode(edbCode)
@@ -874,28 +773,6 @@ func (this *EdbInfoController) EdbInfoAdd() {
 		return
 	}
 
-	//if req.StartDate == "" || req.EndDate == "" {
-	//	br.Msg = "日期不能为空"
-	//	return
-	//}
-
-	// 兼容钢联与钢联化工数据
-	if source == utils.DATA_SOURCE_GL {
-		// 如果是钢联的话,那么就先判断是不是存在钢联化工
-		tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(req.EdbCode)
-		if err != nil {
-			if !utils.IsErrNoRow(err) {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败,Err:" + err.Error()
-				return
-			}
-		}
-		if tmpInfo != nil {
-			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-			req.Source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-		}
-	}
-
 	// 指标入库
 	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 {
@@ -910,11 +787,6 @@ func (this *EdbInfoController) EdbInfoAdd() {
 
 	//新增操作日志
 	{
-		// 添加钢联指标更新日志
-		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
@@ -1148,13 +1020,6 @@ func (this *EdbInfoController) EdbInfoEdit() {
 		go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, req.Frequency, req.Unit)
 	}
 
-	// 添加钢联指标更新日志
-	if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-		if edbInfo.EdbName != req.EdbName || edbInfo.Frequency != req.Frequency || edbInfo.Unit != req.Unit {
-			go data_stat.AddEdbInfoUpdateLog(req.EdbInfoId, 1, "", sysUser, 1)
-		}
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -4037,7 +3902,6 @@ func (this *EdbInfoController) EdbChartList() {
 				return
 			}
 
-			issSupplierStopIndexCodeMap := make(map[string]bool)
 			{
 				tmpEdbCodeList := make([]string, 0)
 				for _, v := range list {
@@ -4045,19 +3909,6 @@ func (this *EdbInfoController) EdbChartList() {
 						tmpEdbCodeList = append(tmpEdbCodeList, v.EdbCode)
 					}
 				}
-				if len(tmpEdbCodeList) > 0 {
-					notIsSupplierStopIndexList, e := data_manage.GetNotIsSupplierStopIndexByCodeList(tmpEdbCodeList, 1)
-					if e != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取数据失败,Err:" + e.Error()
-						return
-					}
-
-					// 已被供应商暂停的指标编码
-					for _, v := range notIsSupplierStopIndexList {
-						issSupplierStopIndexCodeMap[v.IndexCode] = true
-					}
-				}
 			}
 
 			for _, v := range list {
@@ -4072,13 +3923,6 @@ func (this *EdbInfoController) EdbChartList() {
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
 				}
 
-				// 供应商停用
-				if v.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-					if _, ok := issSupplierStopIndexCodeMap[v.EdbCode]; ok {
-						v.IsSupplierStop = 1
-					}
-				}
-
 				respList = append(respList, v)
 			}
 		}

+ 0 - 106
controllers/data_manage/edb_info_refresh.go

@@ -95,62 +95,6 @@ func (c *EdbInfoController) RefreshClassifyList() {
 
 	list := make([]*edb_refresh.BaseClassifyItems, 0)
 	switch source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
-		rootList, err := data_manage.GetBaseFromMysteelChemicalClassifyByParentId(0)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-
-		classifyAll, err := data_manage.GetAllBaseFromMysteelChemicalClassify()
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-
-		rootChildMap := make(map[int][]*edb_refresh.BaseClassifyItems)
-
-		for _, v := range classifyAll {
-			//tmpList, ok := rootChildMap[v.ParentId]
-			//if !ok {
-			//	tmpList = make([]data_manage.BaseClassifyItems, 0)
-			//}
-			//tmpList = append(tmpList, data_manage.BaseClassifyItems{
-			//	ClassifyId:   v.BaseFromMysteelChemicalClassifyId,
-			//	ClassifyName: v.ClassifyName,
-			//	ParentId:     v.ParentId,
-			//	UniqueCode:   fmt.Sprint(v.BaseFromMysteelChemicalClassifyId),
-			//	Children:     nil,
-			//})
-			//rootChildMap[v.ParentId] = tmpList
-
-			rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], &edb_refresh.BaseClassifyItems{
-				ClassifyId:   v.BaseFromMysteelChemicalClassifyId,
-				ClassifyName: v.ClassifyName,
-				ParentId:     v.ParentId,
-				UniqueCode:   fmt.Sprint(v.BaseFromMysteelChemicalClassifyId),
-				Children:     nil,
-			})
-		}
-		for _, v := range rootList {
-			tmp := &edb_refresh.BaseClassifyItems{
-				ClassifyId:   v.BaseFromMysteelChemicalClassifyId,
-				ClassifyName: v.ClassifyName,
-				ParentId:     v.ParentId,
-				UniqueCode:   fmt.Sprint(v.BaseFromMysteelChemicalClassifyId),
-				Children:     nil,
-			}
-			if existItems, ok := rootChildMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-				tmp.Children = existItems
-			} else {
-				items := make([]*edb_refresh.BaseClassifyItems, 0)
-				tmp.Children = items
-			}
-			list = append(list, tmp)
-		}
-
 	default:
 		tmpList, err := data_manage.GetAllEdbClassify()
 		if err != nil && !utils.IsErrNoRow(err) {
@@ -499,8 +443,6 @@ func (c *EdbInfoController) SaveEdbRefreshStatus() {
 	}
 
 	switch req.Source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
-		err = data_manage.ModifyMysteelChemicalUpdateStatus(edbIdList, edbCodeList, isStop)
 	default:
 		err = data_manage.ModifyEdbInfoUpdateStatus(edbIdList, isStop, calculateEdbIdList)
 	}
@@ -573,8 +515,6 @@ func (c *EdbInfoController) SaveEdbRefreshStatusSingle() {
 	}
 
 	switch edbInfo.Source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
-		err = data_manage.ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfo.EdbInfoId, isStop, edbInfo.EdbCode, calculateEdbIdList)
 	default: // wind
 		err = data_manage.EdbInfoUpdateStatusByEdbInfoId([]int{edbInfo.EdbInfoId}, isStop, calculateEdbIdList)
 	}
@@ -671,42 +611,6 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 		return
 	}
 
-	// 如果是钢联化工,那么需要过滤供应商暂停的指标
-	if req.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-		// 获取未被供应商暂停的指标
-		tmpEdbCodeList := make([]string, 0)
-		for _, v := range edbList {
-			tmpEdbCodeList = append(tmpEdbCodeList, v.EdbCode)
-		}
-		notIsSupplierStopIndexList, e := data_manage.GetNotIsSupplierStopIndexByCodeList(tmpEdbCodeList, 0)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,Err:" + e.Error()
-			return
-		}
-
-		// 未被供应商暂停的指标编码
-		notIsSupplierStopIndexCodeList := make([]string, 0)
-		for _, v := range notIsSupplierStopIndexList {
-			notIsSupplierStopIndexCodeList = append(notIsSupplierStopIndexCodeList, v.IndexCode)
-		}
-
-		//查询未被供应商暂停的指标信息
-		edbList, err = data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, notIsSupplierStopIndexCodeList)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-
-		if len(edbList) <= 0 {
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "保存成功"
-			return
-		}
-	}
-
 	fromEdbIdList := make([]int, 0)
 	for _, v := range edbList {
 		if req.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
@@ -736,8 +640,6 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 	}
 
 	switch req.Source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联化工
-		err = data_manage.ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbIdList, isStop, edbCodeList, calculateEdbIdList)
 	default:
 		err = data_manage.EdbInfoUpdateStatusByEdbInfoId(edbIdList, isStop, calculateEdbIdList)
 	}
@@ -806,14 +708,6 @@ func (c *EdbInfoController) GetEdbRefreshEdbConfig() {
 
 	// 根据类型查找指标的频度信息
 	switch source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
-		item, err := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(edbInfoId)
-		if err != nil {
-			br.Msg = "获取指标信息失败"
-			br.ErrMsg = err.Error()
-			return
-		}
-		frequency = item.Frequency
 	default:
 		item, err := data_manage.GetEdbInfoById(edbInfoId)
 		if err != nil {

+ 0 - 509
controllers/data_manage/gl_data.go

@@ -1,509 +0,0 @@
-package data_manage
-
-import (
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// @Title 钢联数据分类
-// @Description 隆众数据分类接口
-// @Success 200 {object} data_manage.LzClassify
-// @router /gl/classify [get]
-func (this *EdbInfoController) GlClassify() {
-	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.GetGlSurveyClassify()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyList
-}
-
-// @Title 钢联数据频度
-// @Description 钢联数据频度接口
-// @Param   BreedShortName   query   string  true       "分类名称"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /gl/frequency [get]
-func (this *EdbInfoController) GlFrequency() {
-	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
-	}
-	breedShortName := this.GetString("BreedShortName")
-	if breedShortName == "" {
-		br.Msg = "分类不可为空"
-		br.ErrMsg = "分类不可为空"
-		return
-	}
-	fmt.Println("breedShortName:", breedShortName)
-	frequencyList, err := data_manage.GetGlFrequencyByClassifyId(breedShortName)
-	if err != nil {
-		br.Msg = "获取频度失败"
-		br.ErrMsg = "获取频度失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// @Title 获取钢联数据
-// @Description 获取钢联数据接口
-// @Param   BreedShortName   query   string  true       "分类名称"
-// @Param   Frequency   query   string  true       "频度名称"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /gl/data [get]
-func (this *EdbInfoController) GlData() {
-	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)
-
-	breedShortName := this.GetString("BreedShortName")
-	if breedShortName == "" {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-	frequency := this.GetString("Frequency")
-	if frequency == "" {
-		br.Msg = "请选择频度"
-		br.ErrMsg = "请选择频度"
-		return
-	}
-	//获取指标
-
-	glList, err := data_manage.GetGlIndex(breedShortName, frequency)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_manage.GlIndexList, 0)
-	for _, v := range glList {
-		product := new(data_manage.GlIndexList)
-		product.UnitName = v.UnitName
-		product.Id = v.Id
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.UnitName = v.UnitName
-		product.FrequencyName = v.FrequencyName
-		product.UpdateTime = v.UpdateTime
-
-		total, err := data_manage.GetGlIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-
-		dataList, err := data_manage.GetGlIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.GlIndexData, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// GlSearchList
-// @Title 钢联模糊搜索
-// @Description 钢联模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /gl/search_list [get]
-func (this *EdbInfoController) GlSearchList() {
-	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.GetGlItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// GlSingleData
-// @Title 获取钢联数据
-// @Description 获取钢联单条数据接口
-// @Param   IndexCode   query   string  true       "指标唯一编码"
-// @Success 200 {object} models.BaseResponse
-// @router /gl/single_data [get]
-func (this *EdbInfoController) GlSingleData() {
-	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")
-	dataList, err := data_manage.GetGlDataByCode(indexCode)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = dataList
-}
-
-// ExportGlList
-// @Title 导出钢联数据
-// @Description 导出钢联数据
-// @Param   QuotaName   query   string  false       "名称关键词"
-// @Param   IndexCode   query   string  false       "指标唯一编码"
-// @Param   BreedName   query   string  true       "分类"
-// @Param   Frequency   query   string  true       "频度"
-// @Param   UnitName   query   string  false       "单位"
-// @Param   ModifyTime   query   string  false       "更新时间"
-// @Success 200  导出成功
-// @router /export/glList [get]
-func (this *EdbInfoController) ExportGlList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	breedName := this.GetString("BreedName") //分类
-	//frequency := this.GetString("Frequency")
-
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	frequencies, err := data_manage.GetGlFrequency(breedName)
-	if err != nil {
-		fmt.Println("GetGlFrequency err:", err.Error())
-		utils.FileLog.Info("GetGlFrequency err:" + err.Error())
-		return
-	}
-
-	if breedName != "" {
-		for _, frequency := range frequencies {
-			//获取指标
-			secNameList, err := data_manage.GetGlIndex(breedName, *frequency)
-			if err != nil {
-				fmt.Println("获取数据失败,Err:" + err.Error())
-				return
-			}
-			if len(secNameList) <= 0 {
-				fmt.Println("secNameList长度为0")
-				return
-			}
-			if breedName == "1/3焦煤" {
-				breedName = "三分之一焦煤"
-			}
-			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.GetGlDataMaxCount(breedName)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			fmt.Println("dataMax:", dataMax)
-			setRowIndex := 6
-			for k, sv := range secNameList {
-				//获取数据
-				dataList, err := data_manage.GetGlDataByCode(sv.IndexCode)
-				if err != nil {
-					br.Msg = "获取数据失败"
-					br.ErrMsg = "获取数据失败,Err:" + err.Error()
-					return
-				}
-				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.FrequencyName)
-
-					unitRow.AddCell().SetValue(sv.UnitName)
-					lastModifyDateRow.AddCell().SetValue(sv.UpdateTime)
-
-					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.InputValue)
-							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 {
-		name := this.GetString("QuotaName")
-		indexCode := this.GetString("IndexCode") //指标唯一编码
-		unit := this.GetString("UnitName")
-		modifyTime := this.GetString("ModifyTime")
-		frequency := this.GetString("Frequency")
-		sheet, err := xlsxFile.AddSheet(frequency)
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-
-		//获取指标数据
-		windRow := sheet.AddRow()
-		windRow.AddCell().SetValue("钢联")
-		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)
-
-		//获取数据
-		dataList, err := data_manage.GetGlDataByCode(indexCode)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-		fmt.Println("len(dataList):", len(dataList))
-		dataMax, err := data_manage.GetGlDataMaxCount(breedName)
-		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.InputValue)
-				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 := `钢联数据`
-	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 - 727
controllers/data_manage/lz_data.go

@@ -1,727 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_source"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// @Title 隆众数据分类
-// @Description 隆众数据分类接口
-// @Success 200 {object} data_manage.LzClassify
-// @router /lz/classify [get]
-func (this *EdbInfoController) LzClassify() {
-	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.GetLzSurveyClassify()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyList
-}
-
-// @Title 隆众数据频度
-// @Description 隆众数据频度接口
-// @Param   BreedId   query   int  true       "分类id"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /lz/frequency [get]
-func (this *EdbInfoController) LzFrequency() {
-	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
-	}
-	breedId, _ := this.GetInt("BreedId")
-	if breedId <= 0 {
-		br.Msg = "分类id错误"
-		br.ErrMsg = "分类id错误:breedId" + strconv.Itoa(breedId)
-		return
-	}
-	frequencyList, err := data_manage.GetLzFrequencyByClassifyId(breedId)
-	if err != nil {
-		br.Msg = "获取频度失败"
-		br.ErrMsg = "获取频度失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// @Title 获取隆众数据
-// @Description 获取隆众数据接口
-// @Param   BreedId   query   int  true       "分类id"
-// @Param   Frequency   query   int  true       "频度"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /lz/data [get]
-func (this *EdbInfoController) LzData() {
-	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
-	}
-	breedId, _ := this.GetInt("BreedId")
-	if breedId <= 0 {
-		br.Msg = "分类id错误"
-		br.ErrMsg = "分类id错误:breedId" + strconv.Itoa(breedId)
-		return
-	}
-	frequency, _ := this.GetInt("Frequency")
-	if frequency <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "频度错误:frequency" + strconv.Itoa(frequency)
-		return
-	}
-	//获取指标
-	fmt.Println("breedId:", breedId)
-	fmt.Println("frequency:", frequency)
-	productList, err := data_manage.GetLongzhongSurveyProduct(breedId, frequency)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_manage.LzProductList, 0)
-	for _, v := range productList {
-		fmt.Println(v.SurveyProductId)
-		product := new(data_manage.LzProductList)
-		product.SurveyProductId = v.SurveyProductId
-		product.BreedName = v.BreedName
-		product.QuotaName = v.SampleName + v.BreedName + v.Custom + v.QuotaName
-		product.UnitName = v.UnitName
-		product.SampleType = v.SampleType
-		product.SampleName = v.SampleName
-		product.Device = v.Device
-		product.Frequency = v.Frequency
-		product.Custom = v.Custom
-		product.StartDate = v.StartDate
-		product.EndDate = v.EndDate
-		product.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
-		product.LzCode = v.LzCode
-
-		dataList, err := data_manage.GetLongzhongSurveyProductData(v.SurveyProductId)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.LzProductData, 0)
-		}
-		product.DataList = dataList
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// LzSearchList
-// @Title 隆众模糊搜索
-// @Description 隆众模糊搜索
-// @Param   Keyword   query   string  ture       "关键字搜索"
-// @Success 200 {object} models.BaseResponse
-// @router /lz/search_list [get]
-func (this *EdbInfoController) LzSearchList() {
-	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_source.GetLzItemList(keyword)
-	if err != nil {
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		br.Msg = "获取失败"
-		return
-	}
-	resultList := make([]*data_manage.LzProductList, 0)
-	for _, v := range list {
-		product := new(data_manage.LzProductList)
-		product.SurveyProductId = v.SurveyProductId
-		product.BreedName = v.BreedName
-		product.QuotaName = v.SampleName + v.BreedName + v.Custom + v.QuotaName
-		product.UnitName = v.UnitName
-		product.SampleType = v.SampleType
-		product.SampleName = v.SampleName
-		product.Device = v.Device
-		product.Frequency = v.Frequency
-		product.Custom = v.Custom
-		product.StartDate = v.StartDate
-		product.EndDate = v.EndDate
-		product.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
-		product.LzCode = v.LzCode
-
-		dataList, err := data_manage.GetLongzhongSurveyProductData(v.SurveyProductId)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.LzProductData, 0)
-		}
-		product.DataList = dataList
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// ExportLzList
-// @Title 导出隆众数据
-// @Description 导出数据列表
-// @Param   QuotaName   query   string  false       "名称关键词"
-// @Param   LzCode   query   string  false       "指标唯一编码"
-// @Param   BreedName   query   string  true       "分类"
-// @Param   Frequency   query   string  true       "频度"
-// @Param   UnitName   query   string  false       "单位"
-// @Param   ModifyTime   query   string  false       "更新时间"
-// @Success 200  导出成功
-// @router /export/lzList [get]
-func (this *EdbInfoController) ExportLzList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	breedName := this.GetString("BreedName") //分类
-	//frequency := this.GetString("Frequency")
-
-	secNameList := make([]*models.EdbdataExportList, 0)
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	frequencies, err := models.GetLzFrequency(breedName)
-	if err != nil {
-		fmt.Println("GetLzFrequency err:", err.Error())
-		utils.FileLog.Info("GetLzFrequency err:" + err.Error())
-		return
-	}
-	if breedName != "" {
-		for _, frequency := range frequencies {
-			//获取指标
-			secNameList, err := models.GetLzSurveyProductByNameAndFrequency(breedName, *frequency)
-			if err != nil {
-				fmt.Println("获取数据失败,Err:" + err.Error())
-				return
-			}
-			if len(secNameList) <= 0 {
-				fmt.Println("secNameList长度为0")
-				return
-			}
-			var frequencyName string
-			if *frequency == 1 {
-				frequencyName = "日度"
-			} else if *frequency == 2 {
-				frequencyName = "周度"
-			} else if *frequency == 3 {
-				frequencyName = "月度"
-			} else if *frequency == 4 {
-				frequencyName = "季度"
-			} else if *frequency == 5 {
-				frequencyName = "年度"
-			} else if *frequency == 99 {
-				frequencyName = "无固定频率"
-			}
-			singalDataMax, err := data_source.GetLongzhongSurveyDataMaxCountByFrequency(breedName, *frequency)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			if singalDataMax <= 0 {
-				continue
-			}
-			sheetNew, err := xlsxFile.AddSheet(frequencyName)
-
-			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_source.GetLongzhongSurveyDataMaxCount(breedName)
-			if err != nil {
-				fmt.Println("获取指标最大数据量失败", err.Error())
-				return
-			}
-			setRowIndex := 6
-			for k, sv := range secNameList {
-				//获取数据
-				dataList, err := data_source.GetLongzhongSurveyDataById(sv.SurveyProductId)
-				if err != nil {
-					br.Msg = "获取数据失败"
-					br.ErrMsg = "获取数据失败,Err:" + err.Error()
-					return
-				}
-				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.SampleName + sv.BreedName + sv.Custom + sv.QuotaName)
-					indexCodeRow.AddCell().SetValue(sv.LzCode)
-					if sv.Frequency == 1 {
-						frequencyRow.AddCell().SetValue("日度")
-					} else if sv.Frequency == 2 {
-						frequencyRow.AddCell().SetValue("周度")
-					} else if sv.Frequency == 3 {
-						frequencyRow.AddCell().SetValue("月度")
-					} else if sv.Frequency == 4 {
-						frequencyRow.AddCell().SetValue("季度")
-					} else if sv.Frequency == 5 {
-						frequencyRow.AddCell().SetValue("年度")
-					} else if sv.Frequency == 99 {
-						frequencyRow.AddCell().SetValue("无固定频率")
-					}
-
-					unitRow.AddCell().SetValue(sv.UnitName)
-					lastModifyDateRow.AddCell().SetValue(sv.EndDate)
-
-					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().SetFloat(dv.InputValue)
-							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 {
-		name := this.GetString("QuotaName")
-		lzCode := this.GetString("LzCode") //指标唯一编码
-		unit := this.GetString("UnitName")
-		modifyTime := this.GetString("ModifyTime")
-		frequency, _ := this.GetInt("Frequency")
-
-		sheet, err := xlsxFile.AddSheet("指标")
-		if err != nil {
-			br.Msg = "新增Sheet失败"
-			br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
-			return
-		}
-
-		//获取指标数据
-		windRow := sheet.AddRow()
-		windRow.AddCell().SetValue("隆众")
-		rowSecName := sheet.AddRow()
-		celSecName := rowSecName.AddCell()
-		celSecName.SetValue("指标名称")
-		cellSenName := rowSecName.AddCell()
-		cellSenName.SetValue(name)
-		indexCodeRow := sheet.AddRow()
-		indexCodeRow.AddCell().SetValue("指标ID")
-		indexCodeRow.AddCell().SetValue(lzCode)
-
-		rowFrequency := sheet.AddRow()
-		celFrequency := rowFrequency.AddCell()
-		celFrequency.SetValue("频率")
-		if frequency == 1 {
-			rowFrequency.AddCell().SetValue("日度")
-		} else if frequency == 2 {
-			rowFrequency.AddCell().SetValue("周度")
-		} else if frequency == 3 {
-			rowFrequency.AddCell().SetValue("月度")
-		} else if frequency == 4 {
-			rowFrequency.AddCell().SetValue("季度")
-		} else if frequency == 5 {
-			rowFrequency.AddCell().SetValue("年度")
-		} else if frequency == 99 {
-			rowFrequency.AddCell().SetValue("无固定频率")
-		}
-
-		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)
-
-		surveyProductId, err := data_source.GetLzProductIdByCode(lzCode)
-		//获取数据
-		dataList, err := data_source.GetLongzhongSurveyDataById(surveyProductId)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-		fmt.Println("len(dataList):", len(dataList))
-		dataMax, err := data_source.GetLzSurveyDataMaxCountByProductId(surveyProductId)
-		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().SetFloat(dv.InputValue)
-				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 := `隆众数据`
-	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"
-
-}
-
-// ExportLzQuotasData
-// @Title 导出隆众多个指标数据
-// @Description 导出隆众多个指标数据
-// @Param   BreedIds	query	string	false	"品种ID集合"
-// @Success 200  导出成功
-// @router /export/lzQuotasData [get]
-func (this *EdbInfoController) ExportLzQuotasData() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	breedIdsStr := this.GetString("BreedIds")
-	breedIds := strings.Split(breedIdsStr, ",")
-	if len(breedIds) <= 0 {
-		br.Msg = "请选择品种"
-		br.ErrMsg = "请选择品种"
-		return
-	}
-
-	// 获取多个品种的指标信息
-	quotaList, err := models.GetExportLzSurveyProductByBreedIds(breedIds)
-	if err != nil {
-		br.Msg = "导出失败"
-		br.ErrMsg = "获取指标信息失败, Err: " + err.Error()
-		return
-	}
-
-	// 获取多个品种的指标最大数据量
-	quotaMaxCountList, err := data_source.GetExportLzSurveyDataMaxCount(breedIds)
-	if err != nil {
-		br.Msg = "导出失败"
-		br.ErrMsg = "获取指标最大数据量失败, Err: " + err.Error()
-		return
-	}
-	quotaMaxCountMatch := make(map[string]int)
-	for i := 0; i < len(quotaMaxCountList); i++ {
-		quotaMaxCountMatch[strconv.Itoa(quotaMaxCountList[i].BreedId)] = quotaMaxCountList[i].Count
-	}
-
-	// 获取多个品种对应的指标数据
-	productIdDataMatch := make(map[int][]*data_source.LongzhongSurveyData)
-	for i := 0; i < len(quotaList); i++ {
-		var iniArr []*data_source.LongzhongSurveyData
-		productIdDataMatch[quotaList[i].SurveyProductId] = iniArr
-	}
-	quotaDataList, err := data_source.GetExportLzSurveyDataByBreedIds(breedIds)
-	for k, _ := range productIdDataMatch {
-		var tmpArr []*data_source.LongzhongSurveyData
-		for _, qd := range quotaDataList {
-			if k == qd.SurveyProductId {
-				tmpArr = append(tmpArr, qd)
-			}
-		}
-		productIdDataMatch[k] = tmpArr
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downloadFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	excelFile := xlsx.NewFile()
-
-	frequencyMatch := map[int64]string{
-		1:  "日度",
-		2:  "周度",
-		3:  "月度",
-		4:  "季度",
-		5:  "年度",
-		99: "无固定频率",
-	}
-	for i := 0; i < len(breedIds); i++ {
-		breedId := breedIds[i]
-		breedName := ""
-
-		var breedQuotas []*models.LongzhongSurveyProduct
-		for _, quota := range quotaList {
-			if quota.BreedId == breedId {
-				breedName = quota.BreedName
-				breedQuotas = append(breedQuotas, quota)
-			}
-		}
-		if len(breedQuotas) <= 0 {
-			continue
-		}
-
-		sheetNew, err := excelFile.AddSheet(breedName)
-		if err != nil {
-			br.Msg = "导出失败"
-			br.ErrMsg = "新增sheet失败, Err: " + err.Error()
-			return
-		}
-
-		windRow := sheetNew.AddRow()
-		secNameRow := sheetNew.AddRow()
-		indexCodeRow := sheetNew.AddRow()
-		frequencyRow := sheetNew.AddRow()
-		unitRow := sheetNew.AddRow()
-		lastModifyDateRow := sheetNew.AddRow()
-
-		dataMax := quotaMaxCountMatch[breedId] // 最大数据量
-		setRowIndex := 6
-		for k, sv := range breedQuotas {
-			// 指标信息
-			windRow.AddCell().SetValue("隆众")
-			secNameRow.AddCell().SetValue("指标名称")
-			indexCodeRow.AddCell().SetValue("指标ID")
-			frequencyRow.AddCell().SetValue("频率")
-			unitRow.AddCell().SetValue("单位")
-			lastModifyDateRow.AddCell().SetValue("更新时间")
-
-			secNameRow.AddCell().SetValue(sv.SampleName + sv.BreedName + sv.Custom + sv.QuotaName)
-			indexCodeRow.AddCell().SetValue(sv.LzCode)
-			frequencyRow.AddCell().SetValue(frequencyMatch[sv.Frequency])
-			unitRow.AddCell().SetValue(sv.UnitName)
-			lastModifyDateRow.AddCell().SetValue(sv.EndDate)
-
-			windRow.AddCell()
-			windRow.AddCell()
-			secNameRow.AddCell()
-			indexCodeRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			min := k * 3
-			sheetNew.SetColWidth(min, min, 15)
-
-			// 指标数据
-			quotaData := productIdDataMatch[sv.SurveyProductId]
-			if len(quotaData) <= 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 quotaData {
-					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().SetFloat(dv.InputValue)
-					row.AddCell()
-					endRowIndex = rowIndex
-				}
-				if len(quotaData) < dataMax {
-					dataLen := dataMax - len(quotaData)
-					for n := 0; n < dataLen; n++ {
-						rowIndex := (endRowIndex + 1) + n
-						row := sheetNew.Row(rowIndex)
-						row.AddCell()
-						row.AddCell()
-						row.AddCell()
-					}
-				}
-			}
-		}
-	}
-
-	err = excelFile.Save(downloadFilePath)
-	if err != nil {
-		br.Msg = "导出失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := `隆众数据`
-	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"
-}

+ 0 - 1909
controllers/data_manage/mysteel_chemical_data.go

@@ -1,1909 +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/models/data_manage/response"
-	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/services/data"
-	"eta_gn/eta_api/services/data_stat"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-)
-
-// MysteelChemicalClassify
-// @Title 钢联化工数据分类
-// @Description 钢联化工分类接口
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalClassifyItems
-// @router /mysteel_chemical/classify [get]
-func (this *EdbInfoController) MysteelChemicalClassify() {
-	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.GetBaseFromMysteelChemicalClassifyByParentId(0)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	classifyAll, err := data_manage.GetAllBaseFromMysteelChemicalClassify()
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	rootChildMap := make(map[int][]*data_manage.BaseFromMysteelChemicalClassifyItems)
-	for _, v := range classifyAll {
-		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId)
-
-		button := data.GetMysteelChemicalOpButton(sysUser, v.SysUserId)
-		button.AddButton = false //不管有没有权限,二级分类都是没有添加按钮的
-		v.Button = button
-
-		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-	}
-
-	nodeAll := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-	for k, v := range rootList {
-		button := data.GetMysteelChemicalOpButton(sysUser, v.SysUserId)
-		rootList[k].Button = button
-		rootList[k].UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId)
-
-		if existItems, ok := rootChildMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-			v.Children = items
-		}
-		nodeAll = append(nodeAll, v)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = nodeAll
-}
-
-// MysteelChemicalIndexList
-// @Title 钢联化工数据指标列表
-// @Description 钢联化工数据指标列表接口
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
-// @router /mysteel_chemical/index/list [get]
-func (this *EdbInfoController) MysteelChemicalIndexList() {
-	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("BaseFromMysteelChemicalClassifyId")
-	if classifyId <= 0 {
-		br.Msg = "请选择正确的分类"
-		return
-	}
-	allBaseFromMysteelChemicalIndex, err := data_manage.GetMysteelChemicalIndexByClassifyId(classifyId)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-	nodeAll := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-	for _, v := range allBaseFromMysteelChemicalIndex {
-		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.BaseFromMysteelChemicalIndexId)
-		button := data.GetMysteelChemicalOpButton(sysUser, v.SysUserId)
-		button.AddButton = false //不管有没有权限,指标都是没有添加按钮的
-		v.Button = button
-		nodeAll = append(nodeAll, v)
-	}
-	ret := &data_manage.BaseFromMysteelChemicalIndexResp{
-		List: nodeAll,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = ret
-}
-
-// AddMysteelChemicalClassify
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /mysteel_chemical/classify/add [post]
-func (this *EdbClassifyController) AddMysteelChemicalClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromMysteelChemicalClassifyReq
-	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)
-
-	//添加指标
-	mysteelChemicalClassifyInfo, err, errMsg := data.AddMysteelChemicalClassify(req.ClassifyName, req.ParentId, req.Level, 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 mysteelChemicalClassifyInfo.ParentId == 0 {
-		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
-		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddMysteelChemicalClassify(v, mysteelChemicalClassifyInfo.BaseFromMysteelChemicalClassifyId, mysteelChemicalClassifyInfo.Level, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
-			if tmpErrMsg != `` {
-				go alarm_msg.SendAlarmMsg("钢联化工-添加一级分类时,默认添加二级分类失败,一级分类名称:"+req.ClassifyName+",二级分类名称:"+v+", Err:"+tmpErrMsg, 3)
-				return
-			}
-		}
-	}
-	resp := response.AddMysteelChemicalClassifyResp{
-		BaseFromMysteelChemicalClassifyId: mysteelChemicalClassifyInfo.BaseFromMysteelChemicalClassifyId,
-		UniqueCode:                        fmt.Sprint(mysteelChemicalClassifyInfo.BaseFromMysteelChemicalClassifyId),
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// EditMysteelChemicalClassify
-// @Title 修改分类
-// @Description 修改分类接口
-// @Param	request	body data_manage.EditBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
-// @router /mysteel_chemical/classify/edit [post]
-func (this *EdbClassifyController) EditMysteelChemicalClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.EditBaseFromMysteelChemicalClassifyReq
-	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.BaseFromMysteelChemicalClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.EditMysteelChemicalClassify(req.BaseFromMysteelChemicalClassifyId, 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
-}
-
-// MoveMysteelChemicalClassify
-// @Title 分类移动接口
-// @Description 分类移动接口
-// @Success 200 {object} data_manage.MoveBaseFromMysteelChemicalClassifyReq
-// @router /mysteel_chemical/classify/move [post]
-func (this *EdbClassifyController) MoveMysteelChemicalClassify() {
-	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.MoveBaseFromMysteelChemicalClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromMysteelChemicalClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveMysteelChemicalClassify(req.BaseFromMysteelChemicalClassifyId, req.ParentBaseFromMysteelChemicalClassifyId, req.PrevBaseFromMysteelChemicalClassifyId, req.NextBaseFromMysteelChemicalClassifyId, this.SysUser)
-	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 = "移动成功"
-}
-
-// DeleteMysteelChemicalClassify
-// @Title 删除分类
-// @Description 删除分类接口
-// @Param	request	body data_manage.DelBaseFromMysteelChemicalClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /mysteel_chemical/classify/del [post]
-func (this *EdbClassifyController) DeleteMysteelChemicalClassify() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromMysteelChemicalClassifyReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromMysteelChemicalClassifyId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelMysteelChemicalClassify(req.BaseFromMysteelChemicalClassifyId, 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
-}
-
-// MysteelChemicalSearch
-// @Title 钢联化工指标查询
-// @Description 钢联化工指标查询
-// @Param   BaseFromMysteelChemicalClassifyId   query   int  true       "分类id"
-// @Param   Keyword   query   string  true       "名称关键词"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /mysteel_chemical/search [get]
-func (this *EdbInfoController) MysteelChemicalSearch() {
-	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("BaseFromMysteelChemicalClassifyId")
-
-	var condition string
-	var pars []interface{}
-	if classifyId > 0 {
-		condition += " AND base_from_mysteel_chemical_classify_id=? "
-		pars = append(pars, classifyId)
-	}
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += " AND (index_name like ? OR index_code like ?) "
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	list, err := data_manage.GetMysteelChemicalIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-	classifyIds := make([]int, 0)
-	for _, v := range list {
-		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.Id)
-		if v.BaseFromMysteelChemicalClassifyId > 0 {
-			classifyIds = append(classifyIds, v.BaseFromMysteelChemicalClassifyId)
-		}
-	}
-	if len(classifyIds) > 0 {
-		// 查询父级分类信息
-		classifyList, e := data_manage.GetBaseFromMysteelChemicalClassifyByIds(classifyIds)
-		if e != nil {
-			br.Msg = "获取目录信息失败"
-			br.ErrMsg = "获取失获取目录信息失败,Err:" + err.Error()
-			return
-		}
-		classifyListMap := make(map[int]int, 0)
-		for _, v := range classifyList {
-			classifyListMap[v.BaseFromMysteelChemicalClassifyId] = v.ParentId
-		}
-		for _, v := range list {
-			v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.Id)
-			if p, ok := classifyListMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-				v.ParentClassifyId = p
-			}
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// MysteelChemicalFrequency
-// @Title 钢联化工数据频度
-// @Description 钢联化工数据频度接口
-// @Param   BaseFromMysteelChemicalClassifyId   query   int  true       "分类id"
-// @Param   BaseFromMysteelChemicalIndexId   query   int  true       "钢联化工指标id"
-// @Param   Keyword   query   string  true       "名称关键词"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /mysteel_chemical/frequency [get]
-func (this *EdbInfoController) MysteelChemicalFrequency() {
-	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 condition string
-	var pars []interface{}
-
-	var classifyId int
-	var frequency string
-	// 指定指标
-	indexId, _ := this.GetInt("BaseFromMysteelChemicalIndexId")
-	if indexId > 0 {
-		condition += " AND base_from_mysteel_chemical_index_id = ? "
-		pars = append(pars, indexId)
-	} else {
-		classifyId, _ = this.GetInt("BaseFromMysteelChemicalClassifyId")
-		if classifyId <= 0 {
-			br.Msg = "请选择分类"
-			br.ErrMsg = "请选择分类"
-			return
-		}
-	}
-
-	if classifyId > 0 {
-		condition += " AND base_from_mysteel_chemical_classify_id=? "
-		pars = append(pars, classifyId)
-	}
-	if frequency != `` {
-		condition += " AND frequency=? "
-		pars = append(pars, frequency)
-	}
-
-	// 关键词搜索
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += " AND (index_name like ? OR index_code like ?) "
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	edbFrequencyList := make([]string, 0)
-	frequencyList, err := data_manage.GetMysteelChemicalFrequency(condition, pars)
-	for _, unit := range frequencyList {
-		edbFrequencyList = append(edbFrequencyList, unit.Frequency)
-	}
-	edbFrequencyList = sortEdbFrequency(edbFrequencyList)
-
-	for i, v := range edbFrequencyList {
-		frequencyList[i].Frequency = v
-	}
-
-	if err != nil {
-		br.Msg = "获取频度失败"
-		br.ErrMsg = "获取频度失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = frequencyList
-}
-
-// MysteelChemicalData
-// @Title 获取钢联化工数据
-// @Description 获取钢联化工数据
-// @Param   BaseFromMysteelChemicalClassifyId   query   int  true       "分类id"
-// @Param   BaseFromMysteelChemicalIndexId   query   int  true       "钢联化工指标id"
-// @Param   Frequency   query   string  true       "频度名称"
-// @Param   Keyword   query   string  true       "名称关键词"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /mysteel_chemical/data [get]
-func (this *EdbInfoController) MysteelChemicalData() {
-	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)
-
-	var condition string
-	var pars []interface{}
-
-	var classifyId int
-	var frequency string
-	// 指定指标
-	indexId, _ := this.GetInt("BaseFromMysteelChemicalIndexId")
-	if indexId > 0 {
-		condition += " AND base_from_mysteel_chemical_index_id = ? "
-		pars = append(pars, indexId)
-	} else {
-		classifyId, _ = this.GetInt("BaseFromMysteelChemicalClassifyId")
-		if classifyId <= 0 {
-			br.Msg = "请选择分类"
-			br.ErrMsg = "请选择分类"
-			br.IsSendEmail = false
-			return
-		}
-		frequency = this.GetString("Frequency")
-		if frequency == "" {
-			br.Msg = "请选择频度"
-			br.ErrMsg = "请选择频度"
-			br.IsSendEmail = false
-			return
-		}
-	}
-
-	if classifyId > 0 {
-		condition += " AND base_from_mysteel_chemical_classify_id=? "
-		pars = append(pars, classifyId)
-	}
-	if frequency != `` {
-		condition += " AND frequency=? "
-		pars = append(pars, frequency)
-	}
-
-	// 关键词搜索
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += " AND (index_name like ? OR index_code like ?) "
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	//获取指标
-	list, err := data_manage.GetMysteelChemicalIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	for k, v := range list {
-		total, err := data_manage.GetMysteelChemicalIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-
-		dataList, err := data_manage.GetMysteelChemicalIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_manage.MysteelChemicalData, 0)
-		}
-		edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, v.IndexCode)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标库统计数据失败,Err:" + err.Error()
-			return
-		}
-		if edbInfo == nil {
-			list[k].EdbInfoId = 0
-		} else {
-			list[k].EdbInfoId = edbInfo.EdbInfoId
-		}
-		list[k].DataList = dataList
-		list[k].Paging = page
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// MysteelChemicalExport
-// @Title 导出钢联化工数据
-// @Description 导出钢联化工数据
-// @Param   BaseFromMysteelChemicalClassifyId   query   int  true       "分类"
-// @Param   BaseFromMysteelChemicalIndexId   query   string  true       "钢联化工指标id"
-// @Param   Keyword   query   string  true       "名称关键词"
-// @Success 200  导出成功
-// @router /mysteel_chemical/export/dataList [get]
-func (this *EdbClassifyController) MysteelChemicalExport() {
-	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("BaseFromMysteelChemicalClassifyId") //分类
-	frequency := this.GetString("Frequency")
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	var condition string
-	var pars []interface{}
-	indexId, _ := this.GetInt("BaseFromMysteelChemicalIndexId")
-	if indexId > 0 {
-		condition += " AND base_from_mysteel_chemical_index_id = ? "
-		pars = append(pars, indexId)
-	}
-	if classifyId > 0 {
-		condition += " AND base_from_mysteel_chemical_classify_id=? "
-		pars = append(pars, classifyId)
-	}
-	if frequency != `` {
-		condition += " AND frequency=? "
-		pars = append(pars, frequency)
-	}
-	// 关键词搜索
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += " AND (index_name like ? OR index_code like ?) "
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	var frequencies []string
-	frequencyList, err := data_manage.GetMysteelChemicalFrequency(condition, pars)
-	for _, v := range frequencyList {
-		frequencies = append(frequencies, v.Frequency)
-	}
-
-	fileName := `钢联化工数据`
-	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 {
-		//获取指标
-		var tmpCondition string
-		var tmpPars []interface{}
-		if indexId > 0 {
-			tmpCondition += " AND base_from_mysteel_chemical_index_id = ? "
-			tmpPars = append(pars, indexId)
-		}
-		if classifyId > 0 {
-			tmpCondition += " AND base_from_mysteel_chemical_classify_id=? "
-			tmpPars = append(pars, classifyId)
-		}
-		if frequency != `` {
-			tmpCondition += " AND frequency=? "
-			tmpPars = append(pars, frequency)
-		}
-		// 关键词搜索
-		keyword := this.GetString("Keyword")
-		if keyword != `` {
-			tmpCondition += " AND (index_name like ? OR index_code like ?) "
-			pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-		}
-		//获取指标
-		secNameList, err := data_manage.GetMysteelChemicalIndex(tmpCondition, tmpPars)
-		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.GetBaseFromMysteelChemicalDataMaxCount(classifyId)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-		fmt.Println("dataMax:", dataMax)
-		setRowIndex := 6
-		for k, sv := range secNameList {
-			//获取数据
-			dataList, err := data_manage.GetMysteelChemicalIndexDataByCode(sv.IndexCode)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			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.FrequencyName)
-
-				unitRow.AddCell().SetValue(sv.UnitName)
-				lastModifyDateRow.AddCell().SetValue(sv.UpdateTime)
-
-				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.InputValue)
-						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 += 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"
-}
-
-// AddMysteelChemical
-// @Title 新增钢联化工指标
-// @Description 新增钢联化工指标接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /mysteel_chemical/add [post]
-func (this *EdbClassifyController) AddMysteelChemical() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromMysteelChemicalReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	resp := new(response.AddMysteelChemicalIndexInfoResp)
-	conf, err := models.GetBusinessConf()
-	if err != nil {
-		br.Msg = "添加指标失败"
-		br.ErrMsg = "获取业务配置失败,Err:" + err.Error()
-		return
-	}
-	// 判断钢联化工的数据刷新方式
-	if conf["MySteelDataMethod"] == "api" {
-		if len(req.List) > 150 {
-			br.Msg = "添加指标失败,指标数量不能超过150条"
-			return
-		}
-		ok, errMsg, err := data.HealthCheckMysteelChemicalApi()
-		if err != nil {
-			br.Msg = "添加指标失败"
-			br.ErrMsg = "钢联化工数据接口异常,Err:" + err.Error()
-			return
-		}
-		if !ok {
-			br.Msg = errMsg
-			return
-		}
-		addMySteelList := make([]*data_manage.BaseFromMysteelChemicalIndex, 0)
-		for _, v := range req.List {
-			if v.IndexCode == "" {
-				br.Msg = "请输入指标ID"
-				br.IsSendEmail = false
-				return
-			}
-			if v.BaseFromMysteelChemicalClassifyId <= 0 {
-				br.Msg = "请选择分类"
-				br.IsSendEmail = false
-				return
-			}
-
-			var updateTime1, updateTime2 string
-			if v.UpdateTime != `` {
-				updateTimeList := strings.Split(v.UpdateTime, ",")
-				updateTime1 = updateTimeList[0]
-				if len(updateTimeList) > 1 {
-					updateTime2 = updateTimeList[1]
-				}
-			}
-			v.IndexCode = utils.TrimStr(v.IndexCode)
-			v.IndexCode = strings.Replace(v.IndexCode, "\t", "", -1)
-
-			addMySteelList = append(addMySteelList, &data_manage.BaseFromMysteelChemicalIndex{
-				BaseFromMysteelChemicalClassifyId: v.BaseFromMysteelChemicalClassifyId,
-				IndexCode:                         strings.ToUpper(v.IndexCode),
-				IndexName:                         "",
-				Unit:                              "",
-				Frequency:                         "",
-				StartDate:                         "",
-				EndDate:                           "",
-				Describe:                          "",
-				Source:                            "api",
-				TerminalCode:                      "",
-				UpdateWeek:                        v.UpdateWeek,
-				UpdateTime:                        updateTime1,
-				UpdateTime2:                       updateTime2,
-				SysUserId:                         this.SysUser.AdminId,
-				SysUserRealName:                   this.SysUser.RealName,
-				ModifyTime:                        time.Now(),
-				CreateTime:                        time.Now(),
-			})
-		}
-		mySteelChemicalIndexInfos, err, errMsg := data.BatchAddMysteelChemicalIndex(addMySteelList, this.Lang)
-		if err != nil {
-			br.Msg = errMsg
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-			return
-		}
-
-		if len(mySteelChemicalIndexInfos) > 0 {
-			resp.BaseFromMysteelChemicalIndexId = mySteelChemicalIndexInfos[0].BaseFromMysteelChemicalIndexId
-			resp.IndexCode = mySteelChemicalIndexInfos[0].IndexCode
-			resp.UniqueCode = fmt.Sprint(mySteelChemicalIndexInfos[0].BaseFromMysteelChemicalClassifyId, "_", mySteelChemicalIndexInfos[0].BaseFromMysteelChemicalIndexId)
-		}
-		for _, v := range mySteelChemicalIndexInfos {
-			err = utils.Rc.LPush(utils.CACHE_MYSTEEL_CHEMICAL_ADD_DATA, v.IndexCode)
-			if err != nil {
-				br.Msg = "添加指标失败" + v.IndexCode
-				br.ErrMsg = "添加指标缓存失败" + v.IndexCode + ";Err:" + err.Error()
-				return
-			}
-		}
-	} else {
-		for i, v := range req.List {
-			if v.IndexCode == "" {
-				br.Msg = "请输入指标ID"
-				br.IsSendEmail = false
-				return
-			}
-			if v.BaseFromMysteelChemicalClassifyId <= 0 {
-				br.Msg = "请选择分类"
-				br.IsSendEmail = false
-				return
-			}
-
-			v.IndexCode = utils.TrimStr(v.IndexCode)
-			v.IndexCode = strings.Replace(v.IndexCode, "\t", "", -1)
-
-			//添加指标
-			mysteelChemicalIndexInfo, err, errMsg := data.AddMysteelChemicalIndex(v.BaseFromMysteelChemicalClassifyId, strings.ToUpper(v.IndexCode), v.UpdateWeek, v.UpdateTime, 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 i == 0 {
-				resp.BaseFromMysteelChemicalIndexId = mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId
-				resp.IndexCode = mysteelChemicalIndexInfo.IndexCode
-				resp.UniqueCode = fmt.Sprint(mysteelChemicalIndexInfo.BaseFromMysteelChemicalClassifyId, "_", mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId)
-			}
-		}
-	}
-
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-func sortEdbFrequency(frequencyList []string) (newFrequencyList []string) {
-	var frequencyMap1 = map[string]int{
-		"日度":  1,
-		"周度":  2,
-		"旬度":  3,
-		"月度":  4,
-		"季度":  5,
-		"半年度": 6,
-		"年度":  7,
-	}
-
-	var frequencyMap2 = map[int]string{
-		1: "日度",
-		2: "周度",
-		3: "旬度",
-		4: "月度",
-		5: "季度",
-		6: "半年度",
-		7: "年度",
-	}
-
-	idList := make([]int, 0)
-	for _, frequency := range frequencyList {
-		idList = append(idList, frequencyMap1[frequency])
-	}
-	sort.Ints(idList)
-
-	for _, id := range idList {
-		newFrequencyList = append(newFrequencyList, frequencyMap2[id])
-	}
-	return
-}
-
-// EditMysteelChemical
-// @Title 编辑钢联化工指标
-// @Description 新增钢联化工指标接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /mysteel_chemical/edit [post]
-func (this *EdbClassifyController) EditMysteelChemical() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.AddBaseFromMysteelChemicalReqItem
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-	if req.BaseFromMysteelChemicalIndexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-	if req.BaseFromMysteelChemicalClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	//编辑指标
-	mysteelChemicalIndexInfo, err, errMsg := data.EditMysteelChemicalIndex(req.BaseFromMysteelChemicalIndexId, req.BaseFromMysteelChemicalClassifyId, req.UpdateWeek, req.UpdateTime, 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 := response.AddMysteelChemicalIndexInfoResp{
-		BaseFromMysteelChemicalIndexId: mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId,
-		IndexCode:                      mysteelChemicalIndexInfo.IndexCode,
-		UniqueCode:                     fmt.Sprint(mysteelChemicalIndexInfo.BaseFromMysteelChemicalClassifyId, "_", mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId),
-	}
-	br.Data = resp
-	br.Ret = 200
-	br.Msg = "保存成功"
-	br.Success = true
-	br.IsAddLog = true
-}
-
-// DeleteMysteelChemical
-// @Title 删除指标
-// @Description 删除指标接口
-// @Param	request	body data_manage.DelBaseFromMysteelChemicalReq true "type json string"
-// @Success 200 Ret=200 删除成功
-// @router /mysteel_chemical/del [post]
-func (this *EdbClassifyController) DeleteMysteelChemical() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.DelBaseFromMysteelChemicalReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromMysteelChemicalIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.DelMysteelChemical(req.BaseFromMysteelChemicalIndexId, 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
-}
-
-// MoveMysteelChemical
-// @Title 指标移动接口
-// @Description 分类移动接口
-// @Success 200 {object} data_manage.MoveBaseFromMysteelChemicalReq
-// @router /mysteel_chemical/move [post]
-func (this *EdbClassifyController) MoveMysteelChemical() {
-	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.MoveBaseFromMysteelChemicalReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromMysteelChemicalIndexId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "指标id小于等于0"
-		br.IsSendEmail = false
-		return
-	}
-
-	if req.BaseFromMysteelChemicalClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
-
-	err, errMsg := data.MoveMysteelChemical(req.BaseFromMysteelChemicalIndexId, req.BaseFromMysteelChemicalClassifyId, req.PrevBaseFromMysteelChemicalIndexId, req.NextBaseFromMysteelChemicalIndexId, this.SysUser)
-	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 = "移动成功"
-}
-
-// MysteelChemicalDetail
-// @Title 钢联化工指标详情
-// @Description 钢联化工指标详情接口
-// @Param   BaseFromMysteelChemicalIndexId   query   string  true       "钢联化工指标id"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalClassifyItems
-// @router /mysteel_chemical/detail [get]
-func (this *EdbInfoController) MysteelChemicalDetail() {
-	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
-	}
-
-	indexId, _ := this.GetInt("BaseFromMysteelChemicalIndexId")
-	if indexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-
-	item, err := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(indexId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-	}
-
-	if item.UpdateTime2 != `` {
-		item.UpdateTime = item.UpdateTime + "," + item.UpdateTime2
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = item
-}
-
-// MysteelChemicalDetail
-// @Title 钢联化工指标详情
-// @Description 钢联化工指标详情接口
-// @Param   BaseFromMysteelChemicalIndexId   query   string  true       "钢联化工指标id"
-// @Success 200 {object} data_manage.BaseFromMysteelChemicalClassifyItems
-// @router /mysteel_chemical/refresh [get]
-func (this *EdbInfoController) MysteelChemicalRefresh() {
-	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
-	}
-
-	// 每次刷新都需要两分钟的等待时间
-	setNxKey := utils.CACHE_KEY_MYSTEEL_REFRESH
-	if !utils.Rc.SetNX(setNxKey, 1, 2*60*time.Second) {
-		br.Msg = "系统正在处理数据生成,请2分钟之后刷新"
-		br.IsSendEmail = false
-		return
-	}
-
-	indexId, _ := this.GetInt("BaseFromMysteelChemicalIndexId")
-	if indexId <= 0 {
-		br.Msg = "请选择指标"
-		br.IsSendEmail = false
-		return
-	}
-
-	item, err := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(indexId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-	}
-
-	if item.MergeFilePath == "" {
-		br.Msg = "系统正在处理数据生成,请5分钟之后刷新"
-		br.IsSendEmail = false
-		return
-	}
-
-	go data.CurlRefreshMysteelChemicalData(item.MergeFilePath)
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "刷新成功"
-	br.Data = item
-}
-
-// NameCheck
-// @Title 重名校验
-// @Description 批量新增
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /mysteel_chemical/name_check [post]
-func (c *EdbInfoController) 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 e := json.Unmarshal(c.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.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_MYSTEEL_CHEMICAL, 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_MYSTEEL_CHEMICAL, 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 /mysteel_chemical/batch_add [post]
-func (this *EdbInfoController) 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_MYSTEEL_CHEMICAL_" + 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.MysteelChemicalIndexSource2EdbReq
-		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, e, errMsg, skip := data.MysteelChemicalIndexSource2Edb(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
-}
-
-// EdbInfoAdd
-// @Title 新增指标接口
-// @Description 新增指标接口
-// @Param	request	body data_manage.AddEdbInfoReq true "type json string"
-// @Success Ret=200 保存成功
-// @router /mysteel_chemical/edb_info/add [post]
-func (this *EdbInfoController) Add() {
-	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
-	}
-
-	tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(req.EdbCode)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败,Err:" + err.Error()
-			return
-		}
-	}
-	var source int
-	if tmpInfo != nil {
-		source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-	} else {
-		br.Msg = "指标不存在"
-		return
-	}
-
-	// 指标入库
-	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   EdbCode   query   string  true      "指标编码/指标代码"
-// @Success Ret=200 保存成功
-// @router /mysteel_chemical/edb_info/add_check [get]
-// func (this *EdbInfoController) AddCheck() {
-// 	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 []*data_manage.AddCheckEdbInfoReq
-// 	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
-// 		br.Msg = "参数解析异常!"
-// 		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-// 		return
-// 	}
-
-// 	source := utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-// 	indexNameMap := make(map[string]string)
-// 	indexNames := make([]string, 0)
-// 	for _, v := range req {
-// 		v.EdbCode = strings.Trim(v.EdbCode, "\t")
-// 		v.EdbCode = strings.Trim(v.EdbCode, " ")
-// 		v.EdbCode = strings.Replace(v.EdbCode, "\t", "", -1)
-// 		if v.EdbCode == "" {
-// 			br.Msg = "请输入指标ID"
-// 			return
-// 		}
-// 		v.EdbName = strings.Trim(v.EdbName, "\t")
-// 		v.EdbName = strings.Trim(v.EdbName, " ")
-// 		v.EdbName = strings.Replace(v.EdbName, "\t", "", -1)
-// 		if v.EdbName == "" {
-// 			br.Msg = "请输入指标名称"
-// 			return
-// 		}
-// 		indexNames = append(indexNames, v.EdbName)
-
-// 		item, err := data_manage.GetEdbInfoByEdbCode(source, edbCode)
-// 		if err != nil && !utils.IsErrNoRow(err) {
-// 			br.Msg = "获取失败"
-// 			br.ErrMsg = "获取失败,Err:" + err.Error()
-// 			return
-// 		}
-
-// 		resp := new(data_manage.EdbInfoMySteelChemicalCheckResp)
-// 		if item != nil && item.EdbInfoId > 0 {
-// 			resp.Status = 1
-// 			// 查询该指标是否有权限
-// 			obj := data_manage.EdbInfoNoPermissionAdmin{}
-// 			conf, err := obj.GetByEdbInfoIdAndAdminId(this.SysUser.AdminId, item.EdbInfoId)
-// 			if err != nil && !utils.IsErrNoRow(err) {
-// 				br.Msg = "获取失败"
-// 				br.ErrMsg = "获取当前账号的不可见指标配置失败,err:" + err.Error()
-// 				return
-// 			}
-// 			if conf != nil {
-// 				resp.Status = 3
-// 			}
-// 		} else {
-// 			resp.Status = 2
-// 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, 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(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
-// 				}
-// 			}
-// 		}
-// 	}
-
-// 	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 /mysteel_chemical/edb_info/add_check [post]
-func (c *EdbInfoController) AddCheck() {
-	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.MysteelChemicalDataBatchAddCheckReq
-	if e := json.Unmarshal(c.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	codeMax := 30
-	codeLen := len(req.IndexCodes)
-
-	// 获取指标库已有指标
-	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-	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
-	}
-
-	obj := data_manage.BaseFromMysteelChemicalIndex{}
-	if codeLen == 0 {
-		br.Msg = "请选择指标"
-		return
-	}
-	if codeLen > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-
-	// 查询选中的指标
-	cond := fmt.Sprintf(` AND %s IN (%s)`, data_manage.BaseFromMysteelChemicalIndexCols.IndexCode, utils.GetOrmInReplace(codeLen))
-	pars := make([]interface{}, 0)
-	pars = append(pars, req.IndexCodes)
-	list, e := obj.GeItemsByCondition(cond, pars, 0)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取自有数据原始指标列表失败, Err: " + e.Error()
-		return
-	}
-
-	if len(list) > codeMax {
-		br.Msg = fmt.Sprintf("最多只能选择%d个指标", codeMax)
-		return
-	}
-
-	resp := make([]*data_manage.BaseFromMysteelChemicalIndexItem, 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
-}
-
-// MysteelChemicalSearch
-// @Title 钢联化工指标查询
-// @Description 钢联化工指标查询
-// @Param   BaseFromMysteelChemicalClassifyIds   query   string  true       "分类id"
-// @Param   Keyword   query   string  true       "名称关键词"
-// @Success 200 {object} data_manage.LzFrequency
-// @router /mysteel_chemical/batch_search [get]
-func (this *EdbInfoController) MysteelChemicalBatchSearch() {
-	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
-	}
-	classifyIdStr := this.GetString("BaseFromMysteelChemicalClassifyIds")
-
-	var condition string
-	var pars []interface{}
-	classifyIds := strings.Split(classifyIdStr, ",")
-	if len(classifyIds) > 0 && classifyIds[0] != `` {
-		condition += " AND base_from_mysteel_chemical_classify_id IN (" + utils.GetOrmInReplace(len(classifyIds)) + " ) "
-		pars = append(pars, classifyIds)
-	}
-	keyword := this.GetString("Keyword")
-	if keyword != `` {
-		condition += " AND (index_name like ? OR index_code like ?) "
-		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-	}
-
-	if classifyIdStr == `` && keyword == `` {
-		var list = make([]*data_manage.MysteelChemicalList, 0)
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = list
-		return
-	}
-
-	list, err := data_manage.GetMysteelChemicalIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-	classifyIdInts := make([]int, 0)
-	for _, v := range list {
-		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.Id)
-		if v.BaseFromMysteelChemicalClassifyId > 0 {
-			classifyIdInts = append(classifyIdInts, v.BaseFromMysteelChemicalClassifyId)
-		}
-	}
-	if len(classifyIdInts) > 0 {
-		// 查询父级分类信息
-		classifyList, e := data_manage.GetBaseFromMysteelChemicalClassifyByIds(classifyIdInts)
-		if e != nil {
-			br.Msg = "获取目录信息失败"
-			br.ErrMsg = "获取失获取目录信息失败,Err:" + e.Error()
-			return
-		}
-		classifyListMap := make(map[int]int, 0)
-		for _, v := range classifyList {
-			classifyListMap[v.BaseFromMysteelChemicalClassifyId] = v.ParentId
-		}
-		for _, v := range list {
-			v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.Id)
-			if p, ok := classifyListMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-				v.ParentClassifyId = p
-			}
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}

+ 0 - 416
controllers/data_source/guagnzhouqihuo.go

@@ -1,416 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/controllers"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_source"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strconv"
-	"time"
-)
-
-// 广州期货交易所
-type DataSourceController struct {
-	controllers.BaseAuthController
-}
-
-// ComTradeCountryList
-// @Title 获取广州期货交易所分类
-// @Description 获取广州期货交易所分类
-// @Success 200 {object} []data_manage.ComTradeCountryItem
-// @router /gfex/classify/list [get]
-func (this *DataSourceController) GfexClassifyList() {
-	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
-	}
-
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	classifyList, err := gzqhObj.GetBaseFromTradeGuangzhouClassifyAll()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-
-	classifyMap := make(map[int][]*data_source.BaseFromTradeGuangzhouClassifyView)
-	for _, v := range classifyList {
-		if v.ParentId == 0 {
-			continue
-		}
-		if items, ok := classifyMap[v.ParentId]; !ok {
-			list := make([]*data_source.BaseFromTradeGuangzhouClassifyView, 0)
-			list = append(list, v)
-			classifyMap[v.ParentId] = list
-		} else {
-			items = append(items, v)
-			classifyMap[v.ParentId] = items
-		}
-	}
-
-	classifyItems := make([]*data_source.BaseFromTradeGuangzhouClassifyView, 0)
-	for _, v := range classifyList {
-		if v.ParentId == 0 {
-			v.Children = classifyMap[v.BaseFromTradeGuangzhouClassifyId]
-			classifyItems = append(classifyItems, v)
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyItems
-}
-
-// ComTradeCountryList
-// @Title 获取广州期货交易所数据最大日期
-// @Description 获取广州期货交易所数据最大日期
-// @Success 200 {object} []data_source.ComTradeCountryItem
-// @router /gfex/max/date [get]
-func (this *DataSourceController) GfexMaxDate() {
-	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
-	}
-
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	maxDate, err := gzqhObj.GetBaseFromTradeGuangzhouMaxDate()
-	if err != nil {
-		br.ErrMsg = "获取最新日期失败,Err:" + err.Error()
-		br.Msg = "获取最新日期失败"
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = maxDate
-}
-
-// ComTradeCountryList
-// @Title 获取广州期货交易所-分类下合约
-// @Description 获取广州期货交易所-分类下合约
-// @Param   BaseFromTradeGuangzhouClassifyId   query   int  true       "分类id"
-// @Param   TradeDate   query   string  true       "日期"
-// @Success 200 {object} []data_source.BaseFromTradeGuangzhouContract
-// @router /gfex/contract [get]
-func (this *DataSourceController) GfexContract() {
-	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
-	}
-
-	baseFromTradeGuangzhouClassifyId, _ := this.GetInt("BaseFromTradeGuangzhouClassifyId", 0)
-	if baseFromTradeGuangzhouClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.Msg = "分类id错误"
-		return
-	}
-	tradeDate := this.GetString("TradeDate")
-	if tradeDate == "" {
-		br.Msg = "参数错误"
-		br.Msg = "交易日期不能为空"
-		return
-	}
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	list, err := gzqhObj.GetBaseFromTradeGuangzhouContract(baseFromTradeGuangzhouClassifyId, tradeDate)
-	if err != nil {
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		br.Msg = "获取数据失败"
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// ComTradeCountryList
-// @Title 获取广州期货交易所-分类下指标信息
-// @Description 获取广州期货交易所-分类下指标信息
-// @Param   BaseFromTradeGuangzhouClassifyId   query   int  true       "分类id"
-// @Param   BaseFromTradeGuangzhouContractId   query   int  true       "合约id"
-// @Param   TradeDate   query   string  true       "日期"
-// @Success 200 {object} []data_source.BaseFromTradeGuangzhouIndexView
-// @router /gfex/index_data [get]
-func (this *DataSourceController) GfexIndexData() {
-	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
-	}
-
-	baseFromTradeGuangzhouClassifyId, _ := this.GetInt("BaseFromTradeGuangzhouClassifyId", 0)
-	if baseFromTradeGuangzhouClassifyId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "分类id错误"
-		return
-	}
-	tradeDate := this.GetString("TradeDate")
-	if tradeDate == "" {
-		br.Msg = "参数错误"
-		br.ErrMsg = "交易日期不能为空"
-		return
-	}
-	baseFromTradeGuangzhouContractId, err := this.GetInt("BaseFromTradeGuangzhouContractId", 0)
-	fmt.Println(err)
-	fmt.Println(baseFromTradeGuangzhouContractId)
-
-	var condition string
-	var pars []interface{}
-
-	if baseFromTradeGuangzhouContractId > 0 {
-		condition += `  b.data_time=? `
-		pars = append(pars, tradeDate)
-		condition += ` AND a.base_from_trade_guangzhou_classify_id=? `
-		pars = append(pars, baseFromTradeGuangzhouClassifyId)
-	} else {
-		if baseFromTradeGuangzhouClassifyId == 11 || baseFromTradeGuangzhouClassifyId == 12 { //月度数据处理
-			td, err := time.Parse(utils.FormatDate, tradeDate)
-			if err != nil {
-				br.Msg = "日期格式错误"
-				br.ErrMsg = "日期格式错误,Err:" + err.Error()
-				return
-			}
-			_, monthEndDay := utils.GetMonthStartAndEnd(strconv.Itoa(td.Year()), strconv.Itoa(int(td.Month())))
-			condition += `  a.data_time=? `
-			pars = append(pars, monthEndDay)
-		} else {
-			condition += `  a.data_time=? `
-			pars = append(pars, tradeDate)
-		}
-
-		condition += ` AND b.base_from_trade_guangzhou_classify_id=? `
-		pars = append(pars, baseFromTradeGuangzhouClassifyId)
-	}
-
-	//if baseFromTradeGuangzhouContractId > 0 {
-	//	condition += ` AND c.base_from_trade_guangzhou_contract_id=? `
-	//	pars = append(pars, baseFromTradeGuangzhouContractId)
-	//}
-
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndex(condition, pars, baseFromTradeGuangzhouContractId)
-	if err != nil {
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		br.Msg = "获取数据失败"
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// @Title 获取广州期货交易所-一次性交割卖方仓单明细
-// @Description 获取广州期货交易所-一次性交割卖方仓单明细
-// @Param   BaseFromTradeGuangzhouIndexId   query   int  true       "指标id"
-// @Param   TradeDate   query   string  true       "日期"
-// @Success 200 {object} []data_source.BaseFromTradeGuangzhouIndexView
-// @router /gfex/index/detail [get]
-func (this *DataSourceController) GfexIndexDetail() {
-	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
-	}
-	baseFromTradeGuangzhouIndexId, _ := this.GetInt("BaseFromTradeGuangzhouIndexId", 0)
-	if baseFromTradeGuangzhouIndexId < 0 {
-		br.Msg = "参数错误"
-		return
-	}
-	tradeDate := this.GetString("TradeDate")
-	if tradeDate == "" {
-		br.Msg = "参数错误"
-		br.ErrMsg = "交易日期不能为空"
-		return
-	}
-
-	var condition string
-	var pars []interface{}
-
-	condition += ` a.base_from_trade_guangzhou_classify_id = ? `
-	pars = append(pars, baseFromTradeGuangzhouIndexId)
-
-	td, err := time.Parse(utils.FormatDate, tradeDate)
-	if err != nil {
-		br.Msg = "日期格式错误"
-		br.ErrMsg = "日期格式错误,Err:" + err.Error()
-		return
-	}
-	_, monthEndDay := utils.GetMonthStartAndEnd(strconv.Itoa(td.Year()), strconv.Itoa(int(td.Month())))
-	condition += ` AND a.end_date = ? `
-	pars = append(pars, monthEndDay)
-
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndexDetail(condition, pars)
-	if err != nil {
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		br.Msg = "获取数据失败"
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
-}
-
-// @Title 导出广州期货交易所-一次性交割卖方仓单明细
-// @Description 导出广州期货交易所-一次性交割卖方仓单明细
-// @Param   BaseFromTradeGuangzhouIndexId   query   int  true       "指标id"
-// @Param   TradeDate   query   string  true       "日期"
-// @Success 200  导出成功
-// @router /gfex/index/detail/export [get]
-func (this *DataSourceController) ExportGfexIndexDetail() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	baseFromTradeGuangzhouIndexId, _ := this.GetInt("BaseFromTradeGuangzhouIndexId", 0)
-	if baseFromTradeGuangzhouIndexId < 0 {
-		br.Msg = "参数错误"
-		return
-	}
-	tradeDate := this.GetString("TradeDate")
-	if tradeDate == "" {
-		br.Msg = "参数错误"
-		br.ErrMsg = "交易日期不能为空"
-		return
-	}
-
-	var condition string
-	var pars []interface{}
-
-	condition += ` a.base_from_trade_guangzhou_classify_id = ? `
-	pars = append(pars, baseFromTradeGuangzhouIndexId)
-
-	td, err := time.Parse(utils.FormatDate, tradeDate)
-	if err != nil {
-		br.Msg = "日期格式错误"
-		br.ErrMsg = "日期格式错误,Err:" + err.Error()
-		return
-	}
-	_, monthEndDay := utils.GetMonthStartAndEnd(strconv.Itoa(td.Year()), strconv.Itoa(int(td.Month())))
-	condition += ` AND a.end_date = ? `
-	pars = append(pars, monthEndDay)
-
-	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndexDetail(condition, pars)
-	if err != nil {
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		br.Msg = "获取数据失败"
-		return
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-	sheetNew, err := xlsxFile.AddSheet("详情")
-	if err != nil {
-		br.ErrMsg = "导出失败,Err:" + err.Error()
-		br.Msg = "导出失败"
-		return
-	}
-	titleRow := sheetNew.AddRow()
-	titleRow.AddCell().SetValue("指标ID")
-	titleRow.AddCell().SetValue("指标名称")
-	titleRow.AddCell().SetValue("数值")
-	titleRow.AddCell().SetValue("单位")
-	titleRow.AddCell().SetValue("频度")
-	titleRow.AddCell().SetValue("起始日期")
-	titleRow.AddCell().SetValue("最新日期")
-
-	var indexCode string
-	for _, sv := range list {
-		dataRow := sheetNew.AddRow()
-		dataRow.AddCell().SetValue(sv.IndexCode)
-		dataRow.AddCell().SetValue(sv.IndexName)
-		dataRow.AddCell().SetValue(sv.Value)
-		dataRow.AddCell().SetValue(sv.Unit)
-		dataRow.AddCell().SetValue(sv.Frequency)
-		dataRow.AddCell().SetValue(sv.StartDate)
-		dataRow.AddCell().SetValue(sv.EndDate)
-
-		indexCode = sv.IndexCode
-	}
-	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 := `一次性交割卖方仓单详情`
-	fileName = indexCode[:6] + fileName + `.xlsx` //文件名称
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-
-}

+ 0 - 329
controllers/data_source/icpi.go

@@ -1,329 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_source"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// 消费者价格指数
-
-// ComTradeCountryList
-// @Title 获取居民消费价格指数分类
-// @Description 获取居民消费价格指数分类
-// @Success 200 {object} []data_manage.ComTradeCountryItem
-// @router /icpi/classify/list [get]
-func (this *DataSourceController) IcpiClassifyList() {
-	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
-	}
-
-	icpiObj := new(data_source.BaseFromIcpiIndex)
-	classifyList, err := icpiObj.GetBaseFromIcpiClassifyAll()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyList
-}
-
-// @Title 获取消费者价格指数数据
-// @Description 获取消费者价格指数数据接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Param   BaseFromIcpiClassifyId   query   int  true       "分类id"
-// @Param   KeyWord   query   string  true       "关键词"
-// @Success 200 {object} data_source.BaseFromIcpiIndexView
-// @router /icpi/index/data [get]
-func (this *DataSourceController) IcpiData() {
-	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)
-
-	baseFromIcpiClassifyId, _ := this.GetInt("BaseFromIcpiClassifyId")
-	if baseFromIcpiClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	keyword := this.GetString("KeyWord")
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if baseFromIcpiClassifyId > 0 {
-		condition += ` AND base_from_icpi_classify_id=? `
-		pars = append(pars, baseFromIcpiClassifyId)
-	}
-
-	if keyword != "" {
-		condition += ` AND (index_code =? OR index_name LIKE ?)  `
-		pars = append(pars, keyword)
-		pars = append(pars, "%"+keyword+"%")
-	}
-
-	icpiObj := new(data_source.BaseFromIcpiIndex)
-
-	icpiList, err := icpiObj.GetIcpiIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_source.BaseFromIcpiIndexView, 0)
-	for _, v := range icpiList {
-		product := new(data_source.BaseFromIcpiIndexView)
-		product.BaseFromIcpiIndexId = v.BaseFromIcpiIndexId
-		product.BaseFromIcpiClassifyId = v.BaseFromIcpiClassifyId
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.Unit = v.Unit
-		product.ModifyTime = v.ModifyTime
-
-		total, err := icpiObj.GetIcpiIndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, err := icpiObj.GetIcpiIndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_source.BaseFromIcpiDataView, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// ExportBaiinfoList
-// @Title 导出ICPI数据
-// @Description 导出ICPI数据
-// @Param   BaseFromIcpiClassifyId   query   int  true       "分类id"
-// @Param   KeyWord   query   string  true       "关键词"
-// @Success 200  导出成功
-// @router /icpi/export/icpiDataList [get]
-func (this *DataSourceController) ExportIcpiDataList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	baseFromIcpiClassifyId, _ := this.GetInt("BaseFromIcpiClassifyId")
-	if baseFromIcpiClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	keyword := this.GetString("KeyWord")
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if baseFromIcpiClassifyId >= 0 {
-		condition += ` AND base_from_icpi_classify_id=? `
-		pars = append(pars, baseFromIcpiClassifyId)
-	}
-
-	if keyword != "" {
-		condition += ` AND (index_code =? OR index_name LIKE ?)  `
-		pars = append(pars, keyword)
-		pars = append(pars, "%"+keyword+"%")
-	}
-
-	icpiObj := new(data_source.BaseFromIcpiIndex)
-
-	icpiList, err := icpiObj.GetIcpiIndex(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	if err != nil {
-		fmt.Println("新增Sheet失败", err.Error())
-		return
-	}
-	//sheetNew.SetColWidth()
-	//获取指标数据
-	sheetNew, _ := xlsxFile.AddSheet("ICPI消费价格指数")
-	windRow := sheetNew.AddRow()
-	secNameRow := sheetNew.AddRow()
-	indexCodeRow := sheetNew.AddRow()
-	frequencyRow := sheetNew.AddRow()
-	unitRow := sheetNew.AddRow()
-	lastModifyDateRow := sheetNew.AddRow()
-	//获取分类下指标最大数据量
-	dataMax, err := icpiObj.GetIcpiDataMaxCount(baseFromIcpiClassifyId)
-	if err != nil {
-		fmt.Println("获取指标最大数据量失败", err.Error())
-		return
-	}
-	fmt.Println("dataMax:", dataMax)
-	setRowIndex := 6
-	for k, sv := range icpiList {
-		//获取数据
-		dataList, err := icpiObj.GetIcpiIndexDataByCode(sv.IndexCode)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-		if len(dataList) > 0 {
-			windRow.AddCell().SetValue("ICPI消费价格指数")
-			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()
-					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()
-						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 := `ICPI消费价格指数`
-	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 - 332
controllers/data_source/sci99.go

@@ -1,332 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_source"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// 卓创资讯
-
-// ComTradeCountryList
-// @Title 获取居民消费价格指数分类
-// @Description 获取居民消费价格指数分类
-// @Success 200 {object} []data_manage.ComTradeCountryItem
-// @router /sci99/classify/list [get]
-func (this *DataSourceController) Sci99ClassifyList() {
-	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_source.GetBaseFromSci99Classify()
-	if err != nil {
-		br.Msg = "获取分类失败"
-		br.ErrMsg = "获取分类失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = classifyList
-}
-
-// @Title 获取消费者价格指数数据
-// @Description 获取消费者价格指数数据接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
-// @Param   BaseFromSci99ClassifyId   query   int  true       "分类id"
-// @Param   KeyWord   query   string  true       "关键词"
-// @Success 200 {object} data_source.BaseFromSci99IndexView
-// @router /sci99/index/data [get]
-func (this *DataSourceController) Sci99Data() {
-	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)
-
-	baseFromSci99ClassifyId, _ := this.GetInt("ClassifyId")
-	if baseFromSci99ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	keyword := this.GetString("KeyWord")
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if baseFromSci99ClassifyId > 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, baseFromSci99ClassifyId)
-	}
-
-	if keyword != "" {
-		condition += ` AND (index_code =? OR index_name LIKE ?)  `
-		pars = append(pars, keyword)
-		pars = append(pars, "%"+keyword+"%")
-	}
-
-	sci99List, err := data_source.GetSci99Index(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-	resultList := make([]*data_source.BaseFromSci99IndexList, 0)
-	for _, v := range sci99List {
-		product := new(data_source.BaseFromSci99IndexList)
-		product.BaseFromSciIndexId = v.BaseFromSciIndexId
-		product.ClassifyId = v.ClassifyId
-		product.IndexCode = v.IndexCode
-		product.IndexName = v.IndexName
-		product.Frequency = v.Frequency
-		product.Unit = v.Unit
-		product.ModifyTime = v.ModifyTime
-
-		modifyTime, err := data_source.GetSci99IndexLatestDate(v.IndexCode)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取更新时间失败"
-			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
-			return
-		}
-		product.ModifyTime = modifyTime
-
-		total, err := data_source.GetSci99IndexDataCount(v.IndexCode)
-		page := paging.GetPaging(currentIndex, pageSize, total)
-		dataList, err := data_source.GetSci99IndexData(v.IndexCode, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
-			return
-		}
-		if dataList == nil {
-			dataList = make([]*data_source.BaseFromSci99DataItem, 0)
-		}
-		product.DataList = dataList
-		product.Paging = page
-		resultList = append(resultList, product)
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resultList
-}
-
-// ExportBaiinfoList
-// @Title 导出ICPI数据
-// @Description 导出ICPI数据
-// @Param   BaseFromSci99ClassifyId   query   int  true       "分类id"
-// @Param   KeyWord   query   string  true       "关键词"
-// @Success 200  导出成功
-// @router /sci99/export/sci99DataList [get]
-func (this *DataSourceController) ExportSci99DataList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请重新登录"
-		return
-	}
-
-	baseFromSci99ClassifyId, _ := this.GetInt("ClassifyId")
-	if baseFromSci99ClassifyId < 0 {
-		br.Msg = "请选择分类"
-		br.ErrMsg = "请选择分类"
-		return
-	}
-
-	keyword := this.GetString("KeyWord")
-
-	//获取指标
-	var condition string
-	var pars []interface{}
-
-	if baseFromSci99ClassifyId >= 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, baseFromSci99ClassifyId)
-	}
-
-	if keyword != "" {
-		condition += ` AND (index_code =? OR index_name LIKE ?)  `
-		pars = append(pars, keyword)
-		pars = append(pars, "%"+keyword+"%")
-	}
-
-	sci99List, err := data_source.GetSci99Index(condition, pars)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败,Err:" + err.Error()
-		return
-	}
-
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	xlsxFile := xlsx.NewFile()
-
-	if err != nil {
-		fmt.Println("新增Sheet失败", err.Error())
-		return
-	}
-	//sheetNew.SetColWidth()
-	//获取指标数据
-	sheetNew, _ := xlsxFile.AddSheet("卓创资讯")
-	windRow := sheetNew.AddRow()
-	secNameRow := sheetNew.AddRow()
-	indexCodeRow := sheetNew.AddRow()
-	frequencyRow := sheetNew.AddRow()
-	unitRow := sheetNew.AddRow()
-	lastModifyDateRow := sheetNew.AddRow()
-	//获取分类下指标最大数据量
-	dataMax, err := data_source.GetSci99DataMaxCount(baseFromSci99ClassifyId)
-	if err != nil {
-		fmt.Println("获取指标最大数据量失败", err.Error())
-		return
-	}
-	fmt.Println("dataMax:", dataMax)
-	setRowIndex := 6
-	for k, sv := range sci99List {
-		//获取数据
-		dataList, err := data_source.GetSci99IndexDataByCode(sv.IndexCode)
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "获取数据失败,Err:" + err.Error()
-			return
-		}
-		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()
-					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()
-						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 := `卓创资讯`
-	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 - 1009
controllers/data_stat/edb_source_stat.go

@@ -1,1009 +0,0 @@
-package data_stat
-
-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_stat"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"strings"
-	"time"
-)
-
-// EdbSourceStatController 数据源统计表管理模块
-type EdbSourceStatController struct {
-	controllers.BaseAuthController
-}
-
-// Column
-// @Title 数据源统计表自定义列列表
-// @Description 查询 数据源统计表自定义列列表
-// @Success 200 {object} data_stat.StatColumnList
-// @router /source_column [get]
-func (this *EdbSourceStatController) Column() {
-	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
-	}
-	columnType, _ := this.GetInt("ColumnType")
-	if columnType <= 0 {
-		br.Msg = "请选择表类型"
-		return
-	}
-	tmpList, err := data_stat.GetStatColumn(columnType)
-	if err != nil {
-		br.Msg = "获取自定义列失败"
-		br.ErrMsg = "获取自定义列失败,Err:" + err.Error()
-		return
-	}
-	var list []*data_stat.EdbInfoStatColumnListItem
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoStatColumnListItem)
-		tmp.ColumnKey = v.ColumnKey
-		tmp.IsShow = v.IsShow
-		tmp.ColumnName = v.ColumnName
-		tmp.ColumnNameEn = v.ColumnNameEn
-		tmp.Id = v.Id
-		tmp.IsMust = v.IsMust
-		tmp.IsSort = v.IsSort
-		tmp.Type = v.Type
-		list = append(list, tmp)
-	}
-	var statColumnList data_stat.StatColumnList
-	statColumnList.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = statColumnList
-}
-
-// EditColumn
-// @Title 编辑数据源统计表自定义列
-// @Description 编辑 数据源统计表自定义列列表
-// @Success 200 {object} data_stat.StatColumnList
-// @router /source_column/edit [post]
-func (this *EdbSourceStatController) EditColumn() {
-	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 data_stat.EditStatColumnReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	if len(req.List) <= 0 {
-		br.Msg = "请选择要修改的列"
-		br.IsSendEmail = false
-		return
-	}
-
-	tmpList, err := data_stat.GetAllStatColumn()
-	if err != nil {
-		br.Msg = "获取自定义列失败"
-		br.ErrMsg = "获取自定义列失败,Err:" + err.Error()
-		return
-	}
-	isMustMap := make(map[int]data_stat.EdbInfoStatColumn)
-	if len(tmpList) > 0 {
-		for _, v := range tmpList {
-			if v.IsMust == 1 {
-				isMustMap[v.Id] = v
-			}
-		}
-	}
-
-	var list []*data_stat.EdbInfoStatColumn
-	for k, v := range req.List {
-		if v.Id == 0 {
-			br.Msg = "列序号不能为空"
-			return
-		}
-
-		if v.IsShow == 0 {
-			if exist, ok := isMustMap[v.Id]; ok {
-				br.Msg = exist.ColumnName + "为必选列!"
-				return
-			}
-		}
-		tmp := new(data_stat.EdbInfoStatColumn)
-		tmp.Id = v.Id
-		tmp.Sort = k + 1
-		tmp.IsShow = v.IsShow
-		list = append(list, tmp)
-	}
-
-	err = data_stat.UpdateStatColumn(list)
-	if err != nil {
-		br.Msg = "更新自定义列操作失败!"
-		br.ErrMsg = "更新自定义列操作失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	return
-}
-
-// EdbDeleteLog
-// @Title 查询删除指标列表
-// @Description 查询删除指标列表接口
-// @Success 200 {object} data_stat.GetEdbDeleteLogResp
-// @router /edb_delete_log [get]
-func (this *EdbSourceStatController) EdbDeleteLog() {
-	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
-	}
-
-	sortParamReq := this.GetString("SortParam", "")
-	sortType := this.GetString("SortType", "desc")
-	createTime := this.GetString("CreateTime", "")
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	condition := " and source = ?"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-
-	sortStr := ``
-	sortParam := ``
-	if sortParamReq != `` {
-		switch sortParamReq {
-		case "CreateTime":
-			sortParam = "create_time"
-		case "DataUpdateTime":
-			sortParam = "data_update_time"
-		case "ErDataUpdateDate":
-			sortParam = "er_data_update_date"
-		case "LatestDate":
-			sortParam = "latest_date"
-		case "StartDate":
-			sortParam = "start_date"
-		}
-		if sortParam == "" {
-			br.Msg = "请输入正确的排序字段"
-			return
-		}
-		if strings.ToLower(sortType) != "asc" && strings.ToLower(sortType) != "desc" {
-			br.Msg = "请输入正确的排序类型"
-			return
-		}
-		sortStr = fmt.Sprintf(" order by %s %s, id desc ", sortParam, sortType)
-	}
-	total, err := data_stat.GetEdbDeleteLogCount(condition, pars)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取指标删除列表总数失败"
-			br.ErrMsg = "获取指标删除列表总数失败,Err:" + err.Error()
-			return
-		} else {
-			err = nil
-		}
-	}
-	list := make([]*data_stat.EdbInfoDeleteLogItem, 0)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	if total == 0 {
-		resp := data_stat.GetEdbDeleteLogResp{
-			Paging: page,
-			List:   list,
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-	tmpList, err := data_stat.GetEdbDeleteLogByCondition(condition, pars, sortStr, pageSize, startSize)
-	if err != nil {
-		br.Msg = "获取指标删除列表失败"
-		br.ErrMsg = "获取指标删除列表失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoDeleteLogItem)
-		tmp.EdbCode = v.EdbCode
-		tmp.EdbInfoId = v.EdbInfoId
-		tmp.Id = v.Id
-		tmp.StartDate = v.StartDate
-		tmp.EndDate = v.EndDate
-		tmp.Unit = v.Unit
-		tmp.TerminalCode = v.TerminalCode
-		tmp.CreateTime = v.CreateTime
-		tmp.EdbCreateTime = v.EdbCreateTime
-		tmp.Frequency = v.Frequency
-		tmp.Source = v.Source
-		tmp.SourceName = v.SourceName
-		tmp.EdbName = v.EdbName
-		tmp.EdbNameEn = v.EdbNameEn
-		tmp.EdbNameSource = v.EdbNameSource
-		tmp.LatestDate = v.LatestDate
-
-		tmp.DelSysUserId = v.DelSysUserId
-		tmp.DelSysUserRealName = v.DelSysUserRealName
-		tmp.SysUserId = v.SysUserId
-		tmp.SysUserRealName = v.SysUserRealName
-		tmp.LatestValue = v.LatestValue
-		if v.DataUpdateTime != utils.EmptyDateTimeStr {
-			tmp.DataUpdateTime = v.DataUpdateTime
-		}
-		if v.ErDataUpdateDate != utils.EmptyDateStr {
-			tmp.ErDataUpdateDate = v.ErDataUpdateDate
-		}
-		list = append(list, tmp)
-	}
-
-	resp := data_stat.GetEdbDeleteLogResp{
-		Paging: page,
-		List:   list,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// EdbUpdateLog
-// @Title 查询指标信息变更列表
-// @Description 查询指标信息变更列表接口
-// @Success 200 {object} data_stat.GetEdbUpdateLogResp
-// @router /edb_update_log [get]
-func (this *EdbSourceStatController) EdbUpdateLog() {
-	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
-	}
-
-	sortParamReq := this.GetString("SortParam", "")
-	sortType := this.GetString("SortType", "desc")
-	createTime := this.GetString("CreateTime", "")
-	updateType, _ := this.GetInt("UpdateType", -1)
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	condition := " and source = ? and (data_update_result=1 or data_update_result=0)"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-	if updateType >= 0 {
-		condition += " AND update_type =? "
-		pars = append(pars, updateType)
-	}
-	sortStr := ``
-	sortParam := ``
-	if sortParamReq != `` {
-		switch sortParamReq {
-		case "CreateTime":
-			sortParam = "create_time"
-		case "DataUpdateTime":
-			sortParam = "data_update_time"
-		case "ErDataUpdateDate":
-			sortParam = "er_data_update_date"
-		case "LatestDate":
-			sortParam = "latest_date"
-		case "StartDate":
-			sortParam = "start_date"
-		}
-		if sortParam == "" {
-			br.Msg = "请输入正确的排序字段"
-			return
-		}
-		if strings.ToLower(sortType) != "asc" && strings.ToLower(sortType) != "desc" {
-			br.Msg = "请输入正确的排序类型"
-			return
-		}
-		sortStr = fmt.Sprintf(" order by %s %s, id desc ", sortParam, sortType)
-	}
-	total, err := data_stat.GetEdbUpdateLogCount(condition, pars)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取指标删除列表总数失败"
-			br.ErrMsg = "获取指标删除列表总数失败,Err:" + err.Error()
-			return
-		} else {
-			err = nil
-		}
-	}
-	list := make([]*data_stat.EdbInfoUpdateLogItem, 0)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	if total == 0 {
-		resp := data_stat.GetEdbUpdateLogResp{
-			Paging: page,
-			List:   list,
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-	tmpList, err := data_stat.GetEdbUpdateLogByCondition(condition, pars, sortStr, pageSize, startSize)
-	if err != nil {
-		br.Msg = "获取指标更新列表失败"
-		br.ErrMsg = "获取指标更新列表失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoUpdateLogItem)
-		tmp.Id = v.Id
-		tmp.EdbInfoId = v.EdbInfoId
-		tmp.SourceName = v.SourceName
-		tmp.Source = v.Source
-		tmp.EdbCode = v.EdbCode
-		tmp.EdbName = v.EdbName
-		tmp.EdbNameSource = v.EdbNameSource
-		tmp.Frequency = v.Frequency
-		tmp.Unit = v.Unit
-		tmp.StartDate = v.StartDate
-		tmp.EndDate = v.EndDate
-		tmp.SysUserId = v.SysUserId
-		tmp.SysUserRealName = v.SysUserRealName
-		tmp.UpdateSysUserRealName = v.UpdateSysUserRealName
-		tmp.UpdateSysUserId = v.UpdateSysUserId
-		tmp.UniqueCode = v.UniqueCode
-		tmp.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
-		tmp.LatestDate = v.LatestDate
-		tmp.LatestValue = v.LatestValue
-		tmp.TerminalCode = v.TerminalCode
-		if v.DataUpdateTime != utils.EmptyDateTimeStr {
-			tmp.DataUpdateTime = v.DataUpdateTime
-		}
-		if v.ErDataUpdateDate != utils.EmptyDateStr {
-			tmp.ErDataUpdateDate = v.ErDataUpdateDate
-		}
-		tmp.UpdateType = v.UpdateType
-		list = append(list, tmp)
-	}
-
-	resp := data_stat.GetEdbUpdateLogResp{
-		Paging: page,
-		List:   list,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// EdbUpdateStat
-// @Title 查询数据源明细列表
-// @Description 查询数据源明细列表接口
-// @Success 200 {object} data_stat.GetEdbUpdateStatResp
-// @router /edb_update_stat [get]
-func (this *EdbSourceStatController) EdbUpdateStat() {
-	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
-	}
-
-	sortParamReq := this.GetString("SortParam", "")
-	sortType := this.GetString("SortType", "desc")
-	terminalCode := this.GetString("TerminalCode", "")
-	sysUserId := this.GetString("SysUserId", "")
-	frequency := this.GetString("Frequency", "")
-	keyWord := this.GetString("KeyWord", "") //指标编码/指标名称
-
-	createTime := this.GetString("CreateTime", "")
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	condition := " and source = ?"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-
-	if terminalCode != "" {
-		codeSlice := strings.Split(terminalCode, ",")
-		condition += ` AND terminal_code IN (` + utils.GetOrmInReplace(len(codeSlice)) + `)`
-		pars = append(pars, codeSlice)
-	}
-
-	if sysUserId != "" {
-		sysUserIdSlice := strings.Split(sysUserId, ",")
-		condition += ` AND sys_user_id IN (` + utils.GetOrmInReplace(len(sysUserIdSlice)) + `)`
-		pars = append(pars, sysUserIdSlice)
-	}
-
-	if frequency != "" {
-		frequencySlice := strings.Split(frequency, ",")
-		condition += ` AND frequency IN (` + utils.GetOrmInReplace(len(frequencySlice)) + `)`
-		pars = append(pars, frequencySlice)
-	}
-
-	if keyWord != "" {
-		condition += ` AND (edb_name LIKE ? OR edb_code LIKE ? ) `
-		pars = append(pars, "%"+keyWord+"%", "%"+keyWord+"%")
-	}
-
-	sortStr := ``
-	sortParam := ``
-	if sortParamReq != `` {
-		switch sortParamReq {
-		case "CreateTime":
-			sortParam = "create_time"
-		case "UpdateTime":
-			sortParam = "update_time"
-		case "DataUpdateTime":
-			sortParam = "data_update_time"
-		case "ErDataUpdateDate":
-			sortParam = "er_data_update_date"
-		case "LatestDate":
-			sortParam = "latest_date"
-		case "StartDate":
-			sortParam = "start_date"
-		}
-		if sortParam == "" {
-			br.Msg = "请输入正确的排序字段"
-			return
-		}
-		if strings.ToLower(sortType) != "asc" && strings.ToLower(sortType) != "desc" {
-			br.Msg = "请输入正确的排序类型"
-			return
-		}
-		sortStr = fmt.Sprintf(" order by %s %s, id desc ", sortParam, sortType)
-	}
-	total, err := data_stat.GetEdbUpdateStatCount(condition, pars)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取指标列表总数失败"
-			br.ErrMsg = "获取指标列表总数失败,Err:" + err.Error()
-			return
-		} else {
-			err = nil
-		}
-	}
-	list := make([]*data_stat.EdbInfoUpdateStatItemMore, 0)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	if total == 0 {
-		resp := data_stat.GetEdbUpdateStatResp{
-			Paging: page,
-			List:   list,
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-	tmpList, err := data_stat.GetEdbUpdateStatByCondition(condition, pars, sortStr, pageSize, startSize)
-	if err != nil {
-		br.Msg = "获取指标更新列表失败"
-		br.ErrMsg = "获取指标更新列表失败,Err:" + err.Error()
-		return
-	}
-
-	// 获取初始数据源名称
-	var edbCodeList []string
-	for _, v := range tmpList {
-		edbCodeList = append(edbCodeList, v.EdbCode)
-	}
-	initSourceMap := make(map[string]string)
-	if len(edbCodeList) > 0 {
-		baseCond := " and index_code in (" + utils.GetOrmInReplace(len(edbCodeList)) + ")"
-		var basePars []interface{}
-		basePars = append(basePars, edbCodeList)
-		indexList, tErr := data_manage.GetMysteelChemicalIndexList(baseCond, basePars, 0, 1000, "")
-		if tErr != nil {
-			br.Msg = "获取初始指标信息失败"
-			br.ErrMsg = "获取初始指标信息失败,Err:" + tErr.Error()
-			return
-		}
-		for _, v := range indexList {
-			initSourceMap[v.IndexCode] = v.Source
-		}
-	}
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoUpdateStatItemMore)
-		tmp.Id = v.Id
-		tmp.EdbInfoId = v.EdbInfoId
-		tmp.SourceName = v.SourceName
-		tmp.Source = v.Source
-		tmp.EdbCode = v.EdbCode
-		tmp.EdbName = v.EdbName
-		tmp.EdbNameSource = v.EdbNameSource
-		tmp.Frequency = v.Frequency
-		tmp.Unit = v.Unit
-		tmp.StartDate = v.StartDate
-		tmp.SysUserId = v.SysUserId
-		tmp.SysUserRealName = v.SysUserRealName
-		tmp.LatestDate = v.LatestDate
-		tmp.LatestValue = v.LatestValue
-		tmp.TerminalCode = v.TerminalCode
-		if v.DataUpdateTime != utils.EmptyDateTimeStr {
-			tmp.DataUpdateTime = v.DataUpdateTime
-		}
-		if v.ErDataUpdateDate != utils.EmptyDateStr {
-			tmp.ErDataUpdateDate = v.ErDataUpdateDate
-		}
-		tmp.DataUpdateResult = v.DataUpdateResult
-		tmp.DataUpdateFailedReason = v.DataUpdateFailedReason
-		if v.UpdateTime != utils.EmptyDateTimeStr {
-			tmp.UpdateTime = v.UpdateTime
-		}
-		tmp.IsAdd = v.IsAdd
-		tmp.NeedRefresh = v.NeedRefresh
-		tmp.HasRefresh = v.HasRefresh
-		tmp.InitSourceName, _ = initSourceMap[v.EdbCode]
-		list = append(list, tmp)
-	}
-
-	resp := data_stat.GetEdbUpdateStatResp{
-		Paging: page,
-		List:   list,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// EdbSourceStat
-// @Title 查询数据源统计列表
-// @Description 查询数据源统计列表接口
-// @Success 200 {object} data_stat.GetEdbUpdateLogResp
-// @router /source_stat [get]
-func (this *EdbSourceStatController) EdbSourceStat() {
-	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
-	}
-
-	sortParamReq := this.GetString("SortParam", "")
-	sortType := this.GetString("SortType", "desc")
-	createTime := this.GetString("CreateTime", "")
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	condition := " and source = ?"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-
-	sortStr := ``
-	sortParam := ``
-	if sortParamReq != `` {
-		switch sortParamReq {
-		case "EdbNum":
-			sortParam = "edb_num"
-		case "NeedRefreshNum":
-			sortParam = "need_refresh_num"
-		case "hasRefreshNum":
-			sortParam = "has_refresh_num"
-		case "UpdateSuccessNum":
-			sortParam = "update_success_num"
-		case "UpdateFailedNum":
-			sortParam = "update_failed_num"
-		}
-
-		if sortParam == "" {
-			br.Msg = "请输入正确的排序字段"
-			return
-		}
-		if strings.ToLower(sortType) != "asc" && strings.ToLower(sortType) != "desc" {
-			br.Msg = "请输入正确的排序类型"
-			return
-		}
-		sortStr = fmt.Sprintf(" order by %s %s, id desc ", sortParam, sortType)
-	}
-	total, err := data_stat.GetEdbSourceStatCount(condition, pars)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取数据源统计列表总数失败"
-			br.ErrMsg = "获取数据源统计列表总数失败,Err:" + err.Error()
-			return
-		} else {
-			err = nil
-		}
-	}
-	list := make([]*data_stat.EdbInfoSourceStatItem, 0)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	if total == 0 {
-		resp := data_stat.GetEdbSourceStatResp{
-			Paging: page,
-			List:   list,
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-	tmpList, err := data_stat.GetEdbSourceStatByCondition(condition, pars, sortStr, pageSize, startSize)
-	if err != nil {
-		br.Msg = "获取指标删除列表失败"
-		br.ErrMsg = "获取指标删除列表失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoSourceStatItem)
-		tmp.Id = v.Id
-		tmp.SourceName = v.SourceName
-		tmp.Source = v.Source
-		tmp.TerminalCode = v.TerminalCode
-		tmp.EdbNum = v.EdbNum
-		tmp.EdbNewNum = v.EdbNewNum
-		tmp.EdbDelNum = v.EdbDelNum
-		tmp.NeedRefreshNum = v.NeedRefreshNum
-		tmp.HasRefreshNum = v.HasRefreshNum
-		tmp.UpdateSuccessNum = v.UpdateSuccessNum
-		tmp.UpdateFailedNum = v.UpdateFailedNum
-		tmp.RefreshSuccessNum = v.RefreshSuccessNum
-		tmp.RefreshFailedNum = v.RefreshFailedNum
-		list = append(list, tmp)
-	}
-
-	resp := data_stat.GetEdbSourceStatResp{
-		Paging: page,
-		List:   list,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// EdbUpdateFailedList
-// @Title 查询指标更新失败详情汇总列表
-// @Description 查询指标更新失败详情汇总列表
-// @Success 200 {object} data_stat.GetEdbUpdateLogResp
-// @router /edb_update_stat/failed [get]
-func (this *EdbSourceStatController) EdbUpdateFailedList() {
-	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
-	}
-
-	terminalCode := this.GetString("TerminalCode", "")
-	createTime := this.GetString("CreateTime", "")
-
-	if terminalCode == "" {
-		br.Msg = "请选择对应的终端信息"
-		return
-	}
-	terminalInfo, err := data_manage.GetEdbTerminalByTerminalCode(terminalCode)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			br.Msg = "终端不存在"
-			return
-		}
-		br.Msg = "查询终端信息出错"
-		br.ErrMsg = "查询终端信息出错 Err:" + err.Error()
-		return
-	}
-	condition := " and source = ? and terminal_code = ?"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, terminalCode)
-
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-
-	tmpList, err := data_stat.GetEdbUpdateStatFailedGroupByCondition(condition, pars)
-	if err != nil {
-		br.Msg = "获取指标更新失败详情列表 失败"
-		br.ErrMsg = "获取指标更新失败详情列表 失败,Err:" + err.Error()
-		return
-	}
-
-	list := make([]*data_stat.EdbUpdateFailedList, 0)
-	successNum := 0
-	failedNum := 0
-	if len(tmpList) > 0 {
-		for _, v := range tmpList {
-			if v.SourceUpdateResult == 1 {
-				successNum += v.Num
-			} else {
-				failedNum += v.Num
-				list = append(list, v)
-			}
-		}
-	}
-	resp := data_stat.GetEdbUpdateFailedResp{
-		List:             list,
-		Name:             terminalInfo.Name,
-		TerminalCode:     terminalCode,
-		DirPath:          terminalInfo.DirPath,
-		UpdateSuccessNum: successNum,
-		UpdateFailedNum:  failedNum,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// EdbUpdateFailedDetailList
-// @Title 查询指标更新失败详情列表
-// @Description 查询指标更新失败详情列表
-// @Success 200 {object} data_stat.GetEdbUpdateLogResp
-// @router /edb_update_stat/failed/detail [get]
-func (this *EdbSourceStatController) EdbUpdateFailedDetailList() {
-	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 = paging.StartIndex(currentIndex, pageSize)
-
-	terminalCode := this.GetString("TerminalCode", "")
-	createTime := this.GetString("CreateTime", "")
-	frequency := this.GetString("Frequency", "")
-	sourceUpdateFailedReason := this.GetString("SourceUpdateFailedReason", "")
-
-	if createTime == "" {
-		br.Msg = "请选择创建时间"
-		return
-	}
-
-	if terminalCode == "" {
-		br.Msg = "请选择对应的终端信息"
-		return
-	}
-	if frequency == "" {
-		br.Msg = "请选择对应的频度"
-		return
-	}
-
-	condition := " and source = ? and terminal_code = ? and frequency=? and data_update_failed_reason=? and data_update_result = 2"
-	var pars []interface{}
-	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, terminalCode, frequency, sourceUpdateFailedReason)
-
-	if createTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
-		if err != nil {
-			br.Msg = "请求时间格式错误"
-			return
-		}
-		endT := startT.AddDate(0, 0, 1)
-		condition += " AND create_time >= ? AND create_time < ?"
-		pars = append(pars, createTime, endT.Format(utils.FormatDate))
-	}
-
-	total, err := data_stat.GetEdbUpdateStatCount(condition, pars)
-	if err != nil {
-		if !utils.IsErrNoRow(err) {
-			br.Msg = "获取指标列表总数失败"
-			br.ErrMsg = "获取指标列表总数失败,Err:" + err.Error()
-			return
-		} else {
-			err = nil
-		}
-	}
-	list := make([]*data_stat.EdbInfoUpdateStatItemMore, 0)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	if total == 0 {
-		resp := data_stat.GetEdbUpdateStatResp{
-			Paging: page,
-			List:   list,
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-	tmpList, err := data_stat.GetEdbUpdateStatByCondition(condition, pars, "", pageSize, startSize)
-	if err != nil {
-		br.Msg = "获取指标更新列表失败"
-		br.ErrMsg = "获取指标更新列表失败,Err:" + err.Error()
-		return
-	}
-
-	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoUpdateStatItemMore)
-		tmp.Id = v.Id
-		tmp.EdbInfoId = v.EdbInfoId
-		tmp.SourceName = v.SourceName
-		tmp.Source = v.Source
-		tmp.EdbCode = v.EdbCode
-		tmp.EdbName = v.EdbName
-		tmp.EdbNameSource = v.EdbNameSource
-		tmp.Frequency = v.Frequency
-		tmp.Unit = v.Unit
-		tmp.StartDate = v.StartDate
-		tmp.SysUserId = v.SysUserId
-		tmp.SysUserRealName = v.SysUserRealName
-		tmp.LatestDate = v.LatestDate
-		tmp.LatestValue = v.LatestValue
-		tmp.TerminalCode = v.TerminalCode
-		tmp.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
-		if v.DataUpdateTime != utils.EmptyDateTimeStr {
-			tmp.DataUpdateTime = v.DataUpdateTime
-		}
-		if v.ErDataUpdateDate != utils.EmptyDateStr {
-			tmp.ErDataUpdateDate = v.ErDataUpdateDate
-		}
-		tmp.DataUpdateResult = v.DataUpdateResult
-		tmp.DataUpdateFailedReason = v.DataUpdateFailedReason
-		if v.UpdateTime != utils.EmptyDateTimeStr {
-			tmp.UpdateTime = v.UpdateTime
-		}
-		tmp.IsAdd = v.IsAdd
-		tmp.NeedRefresh = v.NeedRefresh
-		tmp.HasRefresh = v.HasRefresh
-		list = append(list, tmp)
-	}
-
-	resp := data_stat.GetEdbUpdateStatResp{
-		Paging: page,
-		List:   list,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

+ 0 - 475
controllers/target.go

@@ -12,7 +12,6 @@ import (
 	"encoding/json"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_source"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/alarm_msg"
 	"eta_gn/eta_api/services/data"
@@ -1510,480 +1509,6 @@ func (this *TargetController) GetTargetItems() {
 	br.Data = resp
 }
 
-// ExportLongzhong
-// @Title 隆众数据下载
-// @Description 隆众数据下载接口
-// @Success 200 {object} models.ResearcherListResp
-// @router /export/longzhong [get]
-func (this *TargetCommonController) ExportLongzhong() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	parentId := 4
-	classifyList, err := models.GetEdbdataClassifyByParentId(parentId)
-	if err != nil {
-		return
-	}
-	xlsxFile := xlsx.NewFile()
-	if err != nil {
-		fmt.Println("生成文件失败" + err.Error())
-		return
-	}
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downLoadnFilePath := exPath + "/static/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	for _, v := range classifyList {
-		fmt.Println(v.ClassifyId, v.ClassifyName)
-		//获取指标
-		secNameList, err := data_source.GetLongzhonginfoByClassifyId(v.ClassifyId)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-		if len(secNameList) <= 0 {
-			continue
-		}
-		sheetNew, err := xlsxFile.AddSheet(v.ClassifyName)
-
-		if err != nil {
-			fmt.Println("新增Sheet失败", err.Error())
-			return
-		}
-		//sheetNew.SetColWidth()
-		//获取指标数据
-		windRow := sheetNew.AddRow()
-		secNameRow := sheetNew.AddRow()
-		frequencyRow := sheetNew.AddRow()
-		unitRow := sheetNew.AddRow()
-		lastModifyDateRow := sheetNew.AddRow()
-		//获取分类下指标最大数据量
-		dataMax, err := data_source.GetLongzhongDataMaxCount(v.ClassifyId)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-		for k, sv := range secNameList {
-			fmt.Println("line 399:", v.ClassifyId, v.ClassifyName, sv.SecName, sv.Frequency)
-
-			windRow.AddCell().SetValue("Wind")
-			secNameRow.AddCell().SetValue("指标名称")
-			frequencyRow.AddCell().SetValue("频率")
-			unitRow.AddCell().SetValue("单位")
-			lastModifyDateRow.AddCell().SetValue("更新时间")
-
-			secNameRow.AddCell().SetValue(sv.SecName)
-			frequencyRow.AddCell().SetValue(sv.Frequency)
-			unitRow.AddCell().SetValue(sv.Unit)
-			lastModifyDateRow.AddCell().SetValue(sv.LastModifyDate)
-
-			windRow.AddCell()
-			windRow.AddCell()
-			secNameRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			min := k * 3
-			sheetNew.SetColWidth(min, min, 15)
-			//获取数据
-			dataList, err := data_source.GetLongzhongDataById(sv.LongzhonginfoId)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			if len(dataList) <= 0 {
-				for n := 0; n < dataMax; n++ {
-					rowIndex := 5 + n
-					row := sheetNew.Row(rowIndex)
-					row.AddCell()
-					row.AddCell()
-					row.AddCell()
-				}
-			} else {
-				endRowIndex := 0
-				for rk, dv := range dataList {
-					rowIndex := 5 + rk
-					row := sheetNew.Row(rowIndex)
-					displayDate, _ := time.Parse(utils.FormatDate, dv.DisplayTime)
-					displayDateCell := row.AddCell()
-					style := new(xlsx.Style)
-					style.ApplyAlignment = true
-					style.Alignment.WrapText = true
-					displayDateCell.SetStyle(style)
-					displayDateCell.SetDate(displayDate)
-
-					row.AddCell().SetFloat(dv.Close)
-					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 {
-		br.Msg = "保存文件失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := "隆众石化数据" + time.Now().Format("200601021504") + ".xlsx"
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}
-
-// ExportLongzhongPrice
-// @Title 隆众价格数据下载
-// @Description 隆众价格数据下载接口
-// @Success 200 {object} models.ResearcherListResp
-// @router /export/longzhong/price [get]
-func (this *TargetCommonController) ExportLongzhongPrice() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	classifyList, err := models.GetLzPriceClassify()
-	if err != nil {
-		return
-	}
-	xlsxFile := xlsx.NewFile()
-	if err != nil {
-		fmt.Println("生成文件失败" + err.Error())
-		return
-	}
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downLoadnFilePath := exPath + "/static/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	for _, v := range classifyList {
-		//获取指标
-		secNameList, err := models.GetLongzhongpriceinfoByClassifyName(v.ProductName)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-		if len(secNameList) <= 0 {
-			continue
-		}
-		sheetNew, err := xlsxFile.AddSheet(v.ProductName)
-		if err != nil {
-			fmt.Println("新增Sheet失败", err.Error())
-			return
-		}
-		//获取指标数据
-		windRow := sheetNew.AddRow()
-		secNameRow := sheetNew.AddRow()
-		frequencyRow := sheetNew.AddRow()
-		unitRow := sheetNew.AddRow()
-		lastModifyDateRow := sheetNew.AddRow()
-		marketRow := sheetNew.AddRow()
-		manufactureRow := sheetNew.AddRow()
-		standardRow := sheetNew.AddRow()  //规格
-		modelNameRow := sheetNew.AddRow() //规格型号
-
-		titleRow := sheetNew.AddRow()
-		//获取分类下指标最大数据量
-		dataMax, err := models.GetLongzhongPriceDataMaxCount(v.ProductName)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-
-		for k, sv := range secNameList {
-			fmt.Println("line 399:", v.ProductName, sv.InfoTypeRemark, sv.AreaName)
-
-			windRow.AddCell().SetString("Wind")
-			secNameRow.AddCell().SetValue("分类")
-			frequencyRow.AddCell().SetValue("价格类型")
-			unitRow.AddCell().SetValue("单位")
-			lastModifyDateRow.AddCell().SetValue("地区")
-			marketRow.AddCell().SetValue("市场名称")
-			manufactureRow.AddCell().SetValue("厂家名称")
-			standardRow.AddCell().SetValue("规格")
-			modelNameRow.AddCell().SetValue("规格型号")
-
-			secNameRow.AddCell().SetValue(sv.InfoTypeRemark)
-			frequencyRow.AddCell().SetValue(sv.PriceType)
-			unitRow.AddCell().SetValue(sv.Unit)
-			lastModifyDateRow.AddCell().SetValue(sv.AreaName)
-			marketRow.AddCell().SetValue(sv.MarketName)
-			manufactureRow.AddCell().SetValue(sv.ManufactureName)
-			standardRow.AddCell().SetValue(sv.Standard)
-			modelNameRow.AddCell().SetValue(sv.ModelName)
-
-			windRow.AddCell()
-			windRow.AddCell()
-			windRow.AddCell()
-			windRow.AddCell()
-
-			secNameRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			marketRow.AddCell()
-			manufactureRow.AddCell()
-			standardRow.AddCell()
-			modelNameRow.AddCell()
-
-			secNameRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			marketRow.AddCell()
-			manufactureRow.AddCell()
-			standardRow.AddCell()
-			modelNameRow.AddCell()
-
-			secNameRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			marketRow.AddCell()
-			manufactureRow.AddCell()
-			standardRow.AddCell()
-			modelNameRow.AddCell()
-
-			titleRow.AddCell().SetValue("价格日期")
-			titleRow.AddCell().SetValue("价格")
-			titleRow.AddCell().SetValue("低端价格")
-			titleRow.AddCell().SetValue("高端价格")
-			titleRow.AddCell()
-
-			min := k * 5
-			sheetNew.SetColWidth(min, min, 15)
-
-			//获取数据
-			dataList, err := models.GetLongzhongPriceDataById(sv.LongzhongpriceinfoId)
-			if err != nil {
-				fmt.Println("GetLongzhongDataById Err:" + err.Error())
-				return
-			}
-			rowStart := 10
-			if len(dataList) <= 0 {
-				for n := 0; n < dataMax; n++ {
-					rowIndex := rowStart + n
-					row := sheetNew.Row(rowIndex)
-					row.AddCell()
-					row.AddCell()
-					row.AddCell()
-					row.AddCell()
-					row.AddCell()
-				}
-			} else {
-				endRowIndex := 0
-				for rk, dv := range dataList {
-					rowIndex := rowStart + rk
-					row := sheetNew.Row(rowIndex)
-					priceDate, _ := time.Parse(utils.FormatDate, dv.PriceDate)
-					row.AddCell().SetDate(priceDate)
-					row.AddCell().SetFloat(dv.Price)
-					row.AddCell().SetFloat(dv.LowPrice)
-					row.AddCell().SetFloat(dv.HighPrice)
-
-					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()
-						row.AddCell()
-						row.AddCell()
-					}
-				}
-			}
-		}
-	}
-
-	err = xlsxFile.Save(downLoadnFilePath)
-	if err != nil {
-		br.Msg = "保存文件失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := "隆众价格数据" + time.Now().Format("200601021504") + ".xlsx"
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}
-
-// ExportLongzhongSurvey
-// @Title 隆众调研数据下载
-// @Description 隆众调研数据下载接口
-// @Success 200 {object} models.ResearcherListResp
-// @router /export/longzhong/survey [get]
-func (this *TargetCommonController) ExportLongzhongSurvey() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	classifyList, err := models.GetLzSurveyClassify()
-	if err != nil {
-		return
-	}
-	xlsxFile := xlsx.NewFile()
-	if err != nil {
-		fmt.Println("生成文件失败" + err.Error())
-		return
-	}
-	dir, _ := os.Executable()
-	exPath := filepath.Dir(dir)
-	downLoadnFilePath := exPath + "/static/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
-	for _, v := range classifyList {
-		//获取指标
-		secNameList, err := models.GetLongzhongSurveyProductByClassifyName(v.ProductName)
-		if err != nil {
-			fmt.Println("获取数据失败,Err:" + err.Error())
-			return
-		}
-		if len(secNameList) <= 0 {
-			continue
-		}
-		sheetNew, err := xlsxFile.AddSheet(v.ProductName)
-
-		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_source.GetLongzhongSurveyDataMaxCount(v.ProductName)
-		if err != nil {
-			fmt.Println("获取指标最大数据量失败", err.Error())
-			return
-		}
-		setRowIndex := 6
-		for k, sv := range secNameList {
-
-			windRow.AddCell().SetValue("隆众")
-			secNameRow.AddCell().SetValue("指标名称")
-			indexCodeRow.AddCell().SetValue("指标ID")
-			frequencyRow.AddCell().SetValue("频率")
-			unitRow.AddCell().SetValue("单位")
-			lastModifyDateRow.AddCell().SetValue("更新时间")
-
-			secNameRow.AddCell().SetValue(sv.SampleName + sv.BreedName + sv.Custom + sv.QuotaName)
-			indexCodeRow.AddCell().SetValue(sv.LzCode)
-			if sv.Frequency == 1 {
-				frequencyRow.AddCell().SetValue("日度")
-			} else if sv.Frequency == 2 {
-				frequencyRow.AddCell().SetValue("周度")
-			} else if sv.Frequency == 3 {
-				frequencyRow.AddCell().SetValue("月度")
-			} else if sv.Frequency == 4 {
-				frequencyRow.AddCell().SetValue("季度")
-			} else if sv.Frequency == 5 {
-				frequencyRow.AddCell().SetValue("年度")
-			} else if sv.Frequency == 99 {
-				frequencyRow.AddCell().SetValue("无固定频率")
-			}
-
-			unitRow.AddCell().SetValue(sv.UnitName)
-			lastModifyDateRow.AddCell().SetValue(sv.EndDate)
-
-			windRow.AddCell()
-			windRow.AddCell()
-			secNameRow.AddCell()
-			indexCodeRow.AddCell()
-			frequencyRow.AddCell()
-			unitRow.AddCell()
-			lastModifyDateRow.AddCell()
-			min := k * 3
-			sheetNew.SetColWidth(min, min, 15)
-			//获取数据
-			dataList, err := data_source.GetLongzhongSurveyDataById(sv.SurveyProductId)
-			if err != nil {
-				br.Msg = "获取数据失败"
-				br.ErrMsg = "获取数据失败,Err:" + err.Error()
-				return
-			}
-			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().SetFloat(dv.InputValue)
-					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 {
-		br.Msg = "保存文件失败"
-		br.ErrMsg = "保存文件失败"
-		return
-	}
-	fileName := "隆众调研数据" + time.Now().Format("200601021504") + ".xlsx"
-	this.Ctx.Output.Download(downLoadnFilePath, fileName)
-	defer func() {
-		os.Remove(downLoadnFilePath)
-	}()
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "success"
-}
-
 // TargetUnitList
 // @Title 指标列表
 // @Description 指标列表接口

+ 0 - 109
models/data_manage/coal_data.go

@@ -1,109 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-)
-
-type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int    `orm:"column(base_from_coalmine_mapping_id);pk" gorm:"primaryKey" `
-	IndexName                 string `description:"持买单量指标名称"`
-	IndexCode                 string `description:"持买单量指标编码"`
-	CreateTime                string `description:"时间"`
-}
-
-// GetCoalItemList 模糊查询Smm数据库指标列表
-func GetCoalItemList(keyword string) (items []*BaseFromCoalmineMapping, err error) {
-	sql := "SELECT * FROM base_from_coalmine_mapping WHERE CONCAT(index_name,index_code) LIKE ? "
-	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
-
-	return
-}
-
-func GetCoalCompanyMaxCount(suffix, classifyName 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_coalmine_%s 
-	WHERE
-		group_name =? 
-GROUP BY
-	index_name ) AS t `
-	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, classifyName).Scan(&count).Error
-
-	return
-}
-
-func GetCoalJsmMaxCount(classifyName 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_coalmine_jsm_index 
-	WHERE
-		province =? 
-GROUP BY
-	index_name ) AS t `
-	err = o.Raw(sql, classifyName).Scan(&count).Error
-
-	return
-}
-
-func GetCoalCount(suffix, indexCode string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT
-		COUNT( 1 ) AS num 
-	FROM
-		base_from_coalmine_%s 
-	WHERE
-		index_code =? `
-	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, indexCode).Scan(&count).Error
-
-	return
-}
-
-type BaseFromCoalmineIndex struct {
-	BaseFromCoalmineCompanyIndexId int
-	IndexName                      string `description:"持买单量指标名称"`
-	IndexCode                      string `description:"持买单量指标编码"`
-	DealValue                      string `description:"成交量"`
-	DataTime                       string `description:"数据日期"`
-	Source                         string `description:"来源"`
-	Province                       string `description:"省份"`
-	City                           string `description:"城市"`
-	GroupName                      string `description:"集团名称"`
-	Unit                           string `description:"单位"`
-	Frequency                      string `description:"频率"`
-	CreateTime                     string `description:"插入时间"`
-	ModifyTime                     string `description:"修改时间"`
-}
-
-func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? ORDER BY data_time DESC`
-	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, indexCode).Find(&items).Error
-
-	return
-}
-
-func GetClassifyFromCoalByGroupName(suffix, groupName string) (items []*string, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_%s WHERE group_name=? `
-	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, groupName).Scan(&items).Error
-
-	return
-}

+ 0 - 44
models/data_manage/com_trade_country.go

@@ -1,44 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"time"
-)
-
-// ComTradeCountry 联合国商品贸易数据库的国家编码表
-type ComTradeCountry struct {
-	Id         int       `orm:"column(id);pk" gorm:"primaryKey" `
-	ThirdId    int       `description:"第三方的国家id"`
-	Name       string    `description:"国家名称(英文)"`
-	NameCn     string    `description:"国家名称(中文)"`
-	ModifyTime time.Time `description:"修改时间"`
-	CreateTime time.Time `description:"创建时间"`
-}
-
-// AddComTradeCountry 添加联合国商品贸易数据库的国家编码
-func AddComTradeCountry(item *ComTradeCountry) (lastId int64, err error) {
-	o := global.DmSQL["data"]
-	err = o.Create(item).Error
-	if err != nil {
-		return
-	}
-	lastId = int64(item.Id)
-
-	return
-}
-
-// ComTradeCountryItem 联合国商品贸易数据库的国家编码表
-type ComTradeCountryItem struct {
-	ThirdId int    `description:"第三方的国家id"`
-	Name    string `description:"国家名称(英文)"`
-	NameCn  string `description:"国家名称(中文)"`
-}
-
-// GetComTradeCountryItemAll 获取所有的国家
-func GetComTradeCountryItemAll() (list []*ComTradeCountryItem, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM com_trade_country`
-	err = o.Raw(sql).Find(&list).Error
-
-	return
-}

+ 0 - 86
models/data_manage/com_trade_data.go

@@ -1,86 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-// ComTradeData 联合国商品贸易数据表
-type ComTradeData struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey" `
-	ComTradeId         int       `description:"指标id"`
-	IndexCode          string    `description:"联合国商品贸易编码"`
-	Flow               string    `description:"贸易流向:X(Export:出口);M(Import:进口)"`
-	ReporterCode       int       `description:"出口国id"`
-	ReporterName       string    `description:"出口国名称"`
-	PartnerCode        int       `description:"进口国id"`
-	PartnerName        string    `description:"进口国名称"`
-	Partner2Code       int       `description:"第二进口国id"`
-	Partner2Name       string    `description:"第二进口国名称"`
-	DateType           int       `description:"日期类型,1:年度,2:月度"`
-	DataTime           string    `description:"数据日期"`
-	IndexTradeCode     string    `description:"离岸价编码"`
-	TradeValue         float64   `description:"离岸价(美元)"`
-	IndexNetWeightCode string    `description:"净重编码"`
-	NetWeightValue     float64   `description:"净重/公斤"`
-	ModifyTime         time.Time `description:"最新更新时间"`
-	CreateTime         time.Time `description:"创建时间"`
-}
-
-// ComTradeDataListItem 联合国商品贸易数据列表数据
-type ComTradeDataListItem struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey" `
-	ComTradeId         int       `description:"指标id"`
-	IndexCode          string    `description:"联合国商品贸易编码"`
-	IndexNameCn        string    `description:"联合国商品贸易名称(中文)"`
-	Flow               string    `description:"贸易流向:X(Export:出口);M(Import:进口)"`
-	ReporterCode       int       `description:"出口国id"`
-	ReporterName       string    `description:"出口国名称"`
-	PartnerCode        int       `description:"进口国id"`
-	PartnerName        string    `description:"进口国名称"`
-	Partner2Code       int       `description:"第二进口国id"`
-	Partner2Name       string    `description:"第二进口国名称"`
-	DateType           int       `description:"日期类型,1:年度,2:月度"`
-	DataTime           time.Time `description:"数据日期" json:"-"`
-	Date               string    `description:"数据年月份"`
-	IndexTradeCode     string    `description:"离岸价编码"`
-	TradeValue         float64   `description:"离岸价(美元)"`
-	IndexNetWeightCode string    `description:"净重编码"`
-	NetWeightValue     float64   `description:"净重/公斤"`
-	ModifyTime         time.Time `description:"最新更新时间"`
-	CreateTime         time.Time `description:"创建时间"`
-}
-
-// ComTradeDataListResp 联合国商品贸易列表数据返回
-type ComTradeDataListResp struct {
-	Paging         *paging.PagingItem
-	List           []*ComTradeDataListItem
-	LastUpdateTime string
-}
-
-// GetComTradeListCount 获取指标数据汇总数
-func GetComTradeListCount(condition string, pars []interface{}) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM com_trade_data WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-
-	return
-}
-
-// GetComTradeList 获取指标数据列表
-func GetComTradeList(condition string, pars []interface{}, startSize, pageSize int, orderBy string) (list []*ComTradeDataListItem, err error) {
-	sql := `SELECT * FROM com_trade_data WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY ` + orderBy
-	sql += `  limit ?,? `
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
-
-	return
-}

+ 0 - 55
models/data_manage/com_trade_index.go

@@ -1,55 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"time"
-)
-
-// ComTradeIndex 联合国商品贸易数据指标表
-type ComTradeIndex struct {
-	ComTradeId  int       `orm:"column(com_trade_id);pk" gorm:"primaryKey" `
-	IndexCode   string    `description:"联合国商品贸易编码"`
-	IndexName   string    `description:"联合国商品名称"`
-	IndexNameCn string    `description:"联合国商品名称(中文)"`
-	UpdateTime  time.Time `description:"数据最近更新时间"`
-	CreateTime  time.Time `description:"创建时间"`
-}
-
-// GetComTradeIndexList 获取指标数据列表
-func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTradeIndex, err error) {
-	sql := `SELECT * FROM com_trade_index WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY com_trade_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
-
-	return
-}
-
-// GetAllComTradeIndexList 获取指标数据列表
-func GetAllComTradeIndexList() (list []*ComTradeIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM com_trade_index  ORDER BY com_trade_id DESC `
-	err = o.Raw(sql).Find(&list).Error
-
-	return
-}
-
-// ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
-type ComTradeCodeMapping struct {
-	Code       int       `orm:"column(code);pk" gorm:"primaryKey" `
-	IndexCode  string    `description:"联合国商品贸易编码"`
-	Type       int       `description:"1:价格;2:重量"`
-	Name       string    `description:"指标名称"`
-	CreateTime time.Time `description:"创建时间"`
-}
-
-// GetComTradeIndex 根据指标code获取指标信息
-func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM com_trade_code_mapping WHERE code=? `
-	err = o.Raw(sql, indexCode).First(&item).Error
-
-	return
-}

+ 0 - 16
models/data_manage/edb_data_quarter.go

@@ -440,22 +440,6 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 	return
 }
 
-type HzTestEdbdataResult struct {
-	List []*HzTestEdbdataItems
-}
-
-type HzTestEdbdataItems struct {
-	Items []*HzTestEdbdata
-}
-
-type HzTestEdbdata struct {
-	TtradeCode    string    `orm:"column(TRADE_CODE)"`
-	Dt            time.Time `orm:"column(DT)"`
-	Close         float64   `orm:"column(CLOSE)"`
-	ModifyTime    time.Time `orm:"column(modify_time)"`
-	DataTimestamp int64
-}
-
 type EdbDataItems struct {
 	Items                []*EdbDataList
 	Year                 int

+ 10 - 0
models/data_manage/edb_data_wind.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
+	"fmt"
 )
 
 func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbInfoIds []int) (err error) {
@@ -41,3 +42,12 @@ func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbIn
 
 	return
 }
+
+func ModifyEdbInfoWindWsdDataStatus(source, subSource int, edbInfoId int64, edbCode string) (err error) {
+	tableName := GetEdbDataTableNameAndSubSource(source, subSource)
+	sql := ` UPDATE %s SET edb_info_id=?,modify_time=NOW() WHERE edb_code=? `
+	sql = fmt.Sprintf(sql, tableName)
+	err = global.DmSQL["data"].Exec(sql, edbInfoId, edbCode).Error
+
+	return
+}

+ 0 - 15
models/data_manage/edb_data_wind_wsd.go

@@ -1,15 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"fmt"
-)
-
-func ModifyEdbInfoWindWsdDataStatus(source, subSource int, edbInfoId int64, edbCode string) (err error) {
-	tableName := GetEdbDataTableNameAndSubSource(source, subSource)
-	sql := ` UPDATE %s SET edb_info_id=?,modify_time=NOW() WHERE edb_code=? `
-	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Exec(sql, edbInfoId, edbCode).Error
-
-	return
-}

+ 15 - 3
models/data_manage/edb_info.go

@@ -1619,9 +1619,21 @@ func GetEdbInfoByNames(edbNames string) (items []*EdbInfoList, err error) {
 	return
 }
 
-type EdbInfoSmmExistCheckResp struct {
-	EdbInfoExistCheckResp
-	ExistAll bool `description:"是否全部重复"`
+// BaseRefreshEdbInfo
+// @Description: 刷新配置的基础指标信息结构体
+type BaseRefreshEdbInfo struct {
+	EdbInfoId       int
+	ClassifyId      int    `description:"钢联化工指标分类id"`
+	IndexCode       string `description:"指标编码"`
+	IndexName       string `description:"指标名称"`
+	EndDate         string `description:"最新日期"`
+	EndValue        string `description:"最新值"`
+	SysUserId       int    `description:"创建人id"`
+	SysUserRealName string `description:"创建人姓名"`
+	Frequency       string `description:"频度"`
+	IsStop          int    `description:"是否停更:1:停更,0:未停更"`
+	TerminalCode    string `description:"终端编码"`
+	RefreshTime     string `description:"刷新时间"`
 }
 
 // GetEdbBaseInfoList

+ 0 - 146
models/data_manage/gl_data.go

@@ -1,146 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type GlClassify struct {
-	BreedShortName string `orm:"column(BREED_SHORT_NAME)" description:"分类名称"`
-}
-
-func GetGlSurveyClassify() (items []*GlClassify, err error) {
-	sql := ` SELECT CASE WHEN BREED_SHORT_NAME IS NULL THEN '无' ELSE BREED_SHORT_NAME END BREED_SHORT_NAME  FROM mb_index_main_info GROUP BY BREED_SHORT_NAME ORDER BY BREED_SHORT_NAME ASC `
-	err = global.DmSQL["gl"].Raw(sql).Find(&items).Error
-	return
-}
-
-type GlFrequency struct {
-	Frequency string `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
-}
-
-func GetGlFrequencyByClassifyId(breedShortName string) (items []*GlFrequency, err error) {
-	if breedShortName == "无" {
-		sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
-		err = global.DmSQL["gl"].Raw(sql).Find(&items).Error
-		return
-	} else {
-		sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME=? GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
-		err = global.DmSQL["gl"].Raw(sql, breedShortName).Find(&items).Error
-		return
-	}
-}
-
-type GlIndex struct {
-	Id            int    `orm:"column(ID)"`
-	IndexCode     string `orm:"column(INDEX_CODE)"`
-	IndexName     string `orm:"column(INDEX_NAME)"`
-	UnitName      string `orm:"column(UNIT_NAME)"`
-	FrequencyName string `orm:"column(FREQUENCY_NAME)"`
-	UpdateTime    string `orm:"column(UPDATE_TIME)"`
-}
-
-func GetGlIndex(breedShortName, frequency string) (items []*GlIndex, err error) {
-	if breedShortName == "无" {
-		sql := ` SELECT * FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL AND FREQUENCY_NAME=? ORDER BY INDEX_CODE ASC `
-		err = global.DmSQL["gl"].Raw(sql, frequency).Find(&items).Error
-		return
-	} else {
-		sql := ` SELECT * FROM mb_index_main_info WHERE BREED_SHORT_NAME=? AND FREQUENCY_NAME=? ORDER BY INDEX_CODE ASC `
-		err = global.DmSQL["gl"].Raw(sql, breedShortName, frequency).Find(&items).Error
-		return
-	}
-}
-
-func GetGlFrequency(productName string) (items []*string, err error) {
-	sql := `SELECT DISTINCT FREQUENCY_NAME FROM mb_index_main_info WHERE BREED_SHORT_NAME=? ORDER BY FIELD(FREQUENCY_NAME,'日度','周度','旬度','月度','季度','半年','年度') `
-	err = global.DmSQL["gl"].Raw(sql, productName).Find(&items).Error
-	return
-}
-
-type GlIndexList struct {
-	Id            int                `orm:"column(ID)"`
-	IndexCode     string             `orm:"column(INDEX_CODE)"`
-	IndexName     string             `orm:"column(INDEX_NAME)"`
-	UnitName      string             `orm:"column(UNIT_NAME)"`
-	FrequencyName string             `orm:"column(FREQUENCY_NAME)"`
-	UpdateTime    string             `orm:"column(UPDATE_TIME)"`
-	Paging        *paging.PagingItem `description:"分页数据"`
-	DataList      []*GlIndexData
-}
-
-type GlIndexData struct {
-	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
-}
-
-func GetGlIndexData(indexCode string, startSize, pageSize int) (items []*GlIndexData, err error) {
-	sql := ` SELECT * FROM (
-	SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
-	ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC 
-	)AS t
-	GROUP BY t.DATA_DATE
-	ORDER BY t.DATA_DATE DESC LIMIT ?,? `
-	err = global.DmSQL["gl"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
-	return
-}
-
-func GetGlIndexByCode(indexCode string) (items *GlIndex, err error) {
-	sql := ` SELECT *  FROM mb_index_main_info WHERE INDEX_CODE=? `
-	err = global.DmSQL["gl"].Raw(sql, indexCode).First(&items).Error
-	return
-}
-
-func GetGlIndexDataCount(indexCode string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM (
-			SELECT * FROM (
-				SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
-				ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC
-				)AS t
-				GROUP BY t.DATA_DATE
-				ORDER BY t.DATA_DATE DESC
-			)AS n `
-	err = global.DmSQL["gl"].Raw(sql, indexCode).Scan(&count).Error
-	return
-}
-
-type GlSearchIndex struct {
-	Id             int    `orm:"column(ID)"`
-	IndexCode      string `orm:"column(INDEX_CODE)"`
-	IndexName      string `orm:"column(INDEX_NAME)"`
-	UnitName       string `orm:"column(UNIT_NAME)"`
-	FrequencyName  string `orm:"column(FREQUENCY_NAME)"`
-	UpdateTime     string `orm:"column(UPDATE_TIME)"`
-	BreedShortName string `orm:"column(BREED_SHORT_NAME)"`
-}
-
-// GetGlItemList 模糊查询隆众数据库指标列表
-func GetGlItemList(keyword string) (items []*GlSearchIndex, err error) {
-	sql := "SELECT * FROM mb_index_main_info WHERE CONCAT(INDEX_NAME,INDEX_CODE) LIKE ? "
-	err = global.DmSQL["gl"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
-	return
-
-}
-
-func GetGlDataMaxCount(classifyName string) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM mb_index_main_info AS a
-				INNER JOIN mb_index_main_data AS b ON a.INDEX_CODE=b.INDEX_CODE
-				WHERE a.BREED_SHORT_NAME=?
-				GROUP BY a.INDEX_CODE
-			)AS t `
-	err = global.DmSQL["gl"].Raw(sql, classifyName).Scan(&count).Error
-	return
-}
-
-func GetGlDataByCode(indexCode string) (items []*GlIndexData, err error) {
-	sql := `SELECT
-		* 
-	FROM
-		( SELECT * FROM mb_index_main_data WHERE INDEX_CODE = ? GROUP BY UPDATE_TIME DESC, DATA_DATE DESC ) a 
-	GROUP BY
-		a.DATA_DATE DESC `
-	err = global.DmSQL["gl"].Raw(sql, indexCode).Find(&items).Error
-	return
-}

+ 0 - 147
models/data_manage/jiayue_index.go

@@ -1,147 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-// DictIndex 嘉悦指标表
-type DictIndex struct {
-	Id                int       `description:"主键"`
-	Code              string    `description:"指标编码"`
-	Name              string    `description:"指标名称"`
-	Unit              string    `description:"单位"`
-	Frequency         string    `description:"更新频率"`
-	Description       string    `description:"描述"`
-	TableName         string    `description:"指标数据存储库表"`
-	SourceType        string    `description:"指标来源,如:wind:万德;manual:手工导入;formula:公式;webisite:网页爬取"`
-	SourceCode        string    `description:"来源编码"`
-	SourceDescription string    `description:"来源说明"`
-	Industry          string    `description:"品种板块"`
-	Type              string    `description:"指标类型"`
-	Commodity         string    `description:"商品名称"`
-	SjbId             int       `description:"SJB_ID"`
-	UserId            int       `description:"所属用户"`
-	RowsCount         int       `description:"指标数据数量"`
-	DateFirst         time.Time `description:"指标开始时间"`
-	DateLast          time.Time `description:"指标最新时间"`
-	TimeLastUpdate    time.Time `description:"最新更新时间"`
-	TimeLastRequest   time.Time `description:"下次更新时间"`
-	Priority          int       `description:"更新优先级"`
-	Status            int       `description:"指标状态"`
-	ShortName         string    `description:"指标简称"`
-	UpdateDescription string    `description:"更新说明"`
-	ForecastFlag      int       `description:"预测标识"`
-	ManualFlag        int       `description:"手动标识"`
-	VariableFlag      int       `description:"有效标识"`
-	MarketDataFlag    int       `description:"市场价标识"`
-	CreateUser        int       `description:"创建用户"`
-	CreateTime        time.Time `description:"创建时间"`
-	UpdateUser        int       `description:"更新用户"`
-	UpdateTime        time.Time `description:"更新时间"`
-}
-
-// BridgeJiaYueIndexParams 桥接服务-获取嘉悦指标入参
-type BridgeJiaYueIndexParams struct {
-	IndexCode         string `json:"index_code" form:"index_code" description:"指标编码"`
-	SourceExtend      string `json:"source_extend" form:"source_extend" description:"来源"`
-	IndexCodeRequired int    `json:"index_code_required" form:"index_code_required" description:"指标编码是否必填: 0-否; 1-是"`
-}
-
-// BridgeJiaYueIndexDataParams 桥接服务-获取嘉悦指标数据入参
-type BridgeJiaYueIndexDataParams struct {
-	BridgeJiaYueIndexParams
-	StartDate string `json:"start_date" form:"start_date" description:"开始日期"`
-	EndDate   string `json:"end_date" form:"end_date" description:"结束日期"`
-}
-
-// BridgeJiaYueResultIndexData 桥接服务-获取嘉悦指标数据响应体
-type BridgeJiaYueResultIndexData struct {
-	Code int                      `json:"code" description:"状态码"`
-	Msg  string                   `json:"msg" description:"提示信息"`
-	Data BridgeJiaYueIndexAndData `json:"data" description:"返回数据"`
-}
-
-// BridgeJiaYueIndexAndData 桥接服务-嘉悦指标和数据
-type BridgeJiaYueIndexAndData struct {
-	Id             int                     `description:"指标自增ID" json:"id"`
-	IndexCode      string                  `description:"指标编码" json:"index_code"`
-	IndexName      string                  `description:"指标名称" json:"index_name"`
-	Unit           string                  `description:"单位" json:"unit"`
-	Frequency      string                  `description:"频度" json:"frequency"`
-	LastDate       time.Time               `description:"指标最新时间" json:"last_date"`
-	LastUpdateTime time.Time               `description:"最新更新时间" json:"last_update_time"`
-	Status         int                     `description:"指标状态" json:"status"`
-	IndexData      []BridgeJiaYueIndexData `description:"指标数据" json:"index_data"`
-}
-
-// BridgeJiaYueIndexData 桥接服务-嘉悦指标数据
-type BridgeJiaYueIndexData struct {
-	Val        float64   `json:"val"`
-	DataTime   time.Time `json:"data_time"`
-	UpdateTime time.Time `json:"update_time"`
-}
-
-// BridgeJiaYueResultFrequencyList 桥接服务-频度列表响应体
-type BridgeJiaYueResultFrequencyList struct {
-	Code int      `json:"code" description:"状态码"`
-	Msg  string   `json:"msg" description:"提示信息"`
-	Data []string `json:"data" description:"返回数据"`
-}
-
-// BridgeJiaYueResultIndexPageList 桥接服务-指标分页列表响应体
-type BridgeJiaYueResultIndexPageList struct {
-	Code int                       `json:"code" description:"状态码"`
-	Msg  string                    `json:"msg" description:"提示信息"`
-	Data BridgeJiaYuePageIndexResp `json:"data" description:"返回数据"`
-}
-
-// BridgeJiaYuePageIndexReq 桥接服务-指标分页列表请求体
-type BridgeJiaYuePageIndexReq struct {
-	SourceExtend string `json:"source_extend" form:"source_extend" description:"来源"`
-	Keyword      string `json:"keyword" form:"keyword" description:"关键词"`
-	Frequency    string `json:"frequency" form:"frequency" description:"频度"`
-	PageIndex    int    `json:"page_index" form:"page_index" description:"当前页码"`
-	PageSize     int    `json:"page_size" form:"page_size" description:"每页数据量"`
-	SortField    int    `json:"sort_field" form:"sort_field" description:"排序字段: 1-指标开始时间; 2-指标最新时间; 3-更新时间"`
-	SortRule     int    `json:"sort_rule" form:"sort_rule" description:"排序方式: 1-正序; 2-倒序"`
-}
-
-// BridgeJiaYuePageIndexResp 桥接服务-指标分页列表响应体
-type BridgeJiaYuePageIndexResp struct {
-	Total int         `description:"数据总量"`
-	List  []DictIndex `description:"列表数据"`
-}
-
-// JiaYueIndexPageListResp 指标分页列表响应体
-type JiaYueIndexPageListResp struct {
-	List   []*DictIndexItem
-	Paging *paging.PagingItem `description:"分页数据"`
-}
-
-// DictIndexItem 指标信息
-type DictIndexItem struct {
-	Id             int    `description:"主键"`
-	Code           string `description:"指标编码"`
-	Name           string `description:"指标名称"`
-	Unit           string `description:"单位"`
-	Frequency      string `description:"频度"`
-	DateFirst      string `description:"指标开始时间"`
-	DateLast       string `description:"指标最新时间"`
-	TimeLastUpdate string `description:"最新更新时间"`
-}
-
-// FormatDictIndex2Item 格式化数据宝指标信息
-func FormatDictIndex2Item(origin DictIndex) (item *DictIndexItem) {
-	item = new(DictIndexItem)
-	item.Id = origin.Id
-	item.Code = origin.SourceCode
-	item.Name = origin.Name
-	item.Unit = origin.Unit
-	item.Frequency = origin.Frequency
-	item.DateFirst = utils.TimeTransferString(utils.FormatDate, origin.DateFirst)
-	item.DateLast = utils.TimeTransferString(utils.FormatDate, origin.DateLast)
-	item.TimeLastUpdate = utils.TimeTransferString(utils.FormatDateTime, origin.TimeLastUpdate)
-	return
-}

+ 0 - 98
models/data_manage/lz_data.go

@@ -1,98 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"time"
-)
-
-type LzClassify struct {
-	BreedId   int    `description:"分类id"`
-	BreedName string `description:"分类名称"`
-}
-
-func GetLzSurveyClassify() (items []*LzClassify, err error) {
-	sql := ` SELECT breed_id,breed_name FROM longzhong_survey_product GROUP BY breed_name ORDER BY breed_name DESC `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
-
-type LzFrequency struct {
-	Frequency int `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
-}
-
-func GetLzFrequencyByClassifyId(breedId int) (items []*LzFrequency, err error) {
-	sql := ` SELECT frequency  FROM longzhong_survey_product WHERE breed_id=? GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, breedId).Find(&items).Error
-	return
-}
-
-type LongzhongSurveyProduct struct {
-	SurveyProductId      int `orm:"column(survey_product_id);pk" gorm:"primaryKey" `
-	ProjectQuotaId       int64
-	BreedId              string
-	BreedName            string
-	QuotaId              string
-	QuotaName            string
-	UnitId               string
-	UnitName             string
-	SampleType           int64
-	SampleId             string
-	SampleName           string
-	DeviceId             string
-	Device               string
-	ProductCraftId       string
-	ProductCraft         string
-	ProductLine          string
-	InputMode            int64
-	Frequency            int64
-	InputValue           string
-	TaskShouldFinishTime int
-	CustomId             string
-	CustomType           int64
-	Custom               string
-	QuotaSampleId        int64
-	StartDate            string
-	EndDate              string
-	ModifyTime           time.Time
-	LzCode               string
-}
-
-func GetLongzhongSurveyProduct(breedId, frequency int) (items []*LongzhongSurveyProduct, err error) {
-	sql := ` SELECT *  FROM longzhong_survey_product WHERE breed_id=? AND frequency=? ORDER BY survey_product_id ASC `
-	err = global.DmSQL["data"].Raw(sql, breedId, frequency).Find(&items).Error
-	return
-}
-
-type LzProductList struct {
-	SurveyProductId int    `orm:"column(survey_product_id);pk" gorm:"primaryKey" `
-	BreedName       string `description:"品种名称"`
-	QuotaName       string `description:"指标名称"`
-	UnitName        string `description:"单位"`
-	SampleType      int64  `description:"样本类型 0-空 1-企业 2-港口 3-运距 4-区域/国家 99-不确定"`
-	SampleName      string `description:"样本名称"`
-	Device          string `description:"设备"`
-	Frequency       int64  `description:"频度"`
-	Custom          string `description:"扩展字段"`
-	StartDate       string `description:"开始日期"`
-	EndDate         string `description:"结束日期"`
-	ModifyTime      string `description:"修改时间"`
-	LzCode          string `description:"指标编码"`
-	DataList        []*LzProductData
-}
-
-type LzProductData struct {
-	InputValue string `description:"日期"`
-	DataTime   string `description:"值"`
-}
-
-func GetLongzhongSurveyProductData(surveyProductId int) (items []*LzProductData, err error) {
-	sql := ` SELECT *  FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, surveyProductId).Find(&items).Error
-	return
-}
-
-func GetLongzhongSurveyProductByCode(lzCode string) (items *LongzhongSurveyProduct, err error) {
-	sql := ` SELECT *  FROM longzhong_survey_product WHERE lz_code=? `
-	err = global.DmSQL["data"].Raw(sql, lzCode).First(&items).Error
-	return
-}

+ 0 - 248
models/data_manage/mysteel_chemical_classify.go

@@ -1,248 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-// BaseFromMysteelChemicalClassify 钢联化工分类表
-type BaseFromMysteelChemicalClassify struct {
-	BaseFromMysteelChemicalClassifyId int       `orm:"column(base_from_mysteel_chemical_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:"英文分类名称"`
-}
-
-// AddBaseFromMysteelChemicalClassify 添加钢联化工分类
-func AddBaseFromMysteelChemicalClassify(item *BaseFromMysteelChemicalClassify) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalClassifyCount
-// @Description: 获取中文分类名称的个数
-// @author: Roc
-// @datetime 2024-04-16 16:37:43
-// @param classifyName string
-// @param parentId int
-// @return count int
-// @return err error
-func GetBaseFromMysteelChemicalClassifyCount(classifyName string, parentId int) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name=? AND parent_id=? `
-	err = global.DmSQL["data"].Raw(sql, classifyName, parentId).Scan(&count).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalClassifyEnCount
-// @Description:  获取英文分类名称的个数
-// @author: Roc
-// @datetime 2024-04-16 16:28:14
-// @param classifyNameEn string
-// @param parentId int
-// @return count int
-// @return err error
-func GetBaseFromMysteelChemicalClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name_en = ? AND parent_id=? `
-	err = global.DmSQL["data"].Raw(sql, classifyNameEn, parentId).Scan(&count).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalClassifyById 通过分类id的获取分类信息
-func GetBaseFromMysteelChemicalClassifyById(classifyId int) (item *BaseFromMysteelChemicalClassify, err error) {
-	sql := `SELECT * FROM base_from_mysteel_chemical_classify WHERE base_from_mysteel_chemical_classify_id=? `
-	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
-	return
-}
-
-// EditBaseFromMysteelChemicalClassify 修改钢联化工分类
-func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (err error) {
-	sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name=?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyName, classifyId).Error
-	return
-}
-
-// EditBaseFromMysteelChemicalClassifyEn
-// @Description: 修改钢联化工英文分类名称
-// @author: Roc
-// @datetime 2024-04-16 16:34:53
-// @param classifyId int
-// @param classifyNameEn string
-// @return err error
-func EditBaseFromMysteelChemicalClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name_en = ?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyNameEn, classifyId).Error
-	return
-}
-
-type BaseFromMysteelChemicalIndexResp struct {
-	List []*BaseFromMysteelChemicalClassifyItems
-}
-type BaseFromMysteelChemicalClassifyItems struct {
-	BaseFromMysteelChemicalClassifyId int                                        `gorm:"primaryKey"`
-	BaseFromMysteelChemicalIndexId    int                                        `orm:"column(base_from_mysteel_chemical_index_id)"`
-	IndexCode                         string                                     `description:"指标编码"`
-	ClassifyName                      string                                     `description:"分类名称"`
-	ClassifyNameEn                    string                                     `description:"英文分类名称"`
-	ParentId                          int                                        `description:"父级id"`
-	SysUserId                         int                                        `description:"创建人id"`
-	SysUserRealName                   string                                     `description:"创建人姓名"`
-	Level                             int                                        `description:"层级"`
-	Sort                              int                                        `description:"排序字段,越小越靠前,默认值:10"`
-	UniqueCode                        string                                     `description:"唯一编码"`
-	ModifyTime                        time.Time                                  `description:"修改时间"`
-	CreateTime                        time.Time                                  `description:"创建时间"`
-	Button                            BaseFromMysteelChemicalClassifyItemsButton `gorm:"-" description:"操作权限"`
-	Children                          []*BaseFromMysteelChemicalClassifyItems    `gorm:"-" description:"下级"`
-}
-
-type BaseFromMysteelChemicalClassifyItemsButton struct {
-	AddButton    bool `description:"是否可添加"`
-	OpButton     bool `description:"是否可编辑"`
-	DeleteButton bool `description:"是否可删除"`
-	MoveButton   bool `description:"是否可移动"`
-}
-
-// GetBaseFromMysteelChemicalClassifyByParentId 根据上级id获取当下的分类列表数据
-func GetBaseFromMysteelChemicalClassifyByParentId(parentId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id=? order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	err = global.DmSQL["data"].Raw(sql, parentId).Find(&items).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalClassifyByIds 根据id获取当下的分类列表数据
-func GetBaseFromMysteelChemicalClassifyByIds(classifyIds []int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id > 0 and base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	err = global.DmSQL["data"].Raw(sql, classifyIds).Find(&items).Error
-	return
-}
-
-// GetAllBaseFromMysteelChemicalClassify 获取所有的分类列表数据
-func GetAllBaseFromMysteelChemicalClassify() (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id <> 0 order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
-
-type DeleteBaseFromMysteelChemicalClassifyReq struct {
-	ClassifyId int `description:"分类id"`
-	EdbInfoId  int `description:"指标id"`
-}
-
-type BaseFromMysteelChemicalClassifyListResp struct {
-	AllNodes      []*BaseFromMysteelChemicalClassifyItems
-	CanOpClassify bool `description:"是否允许操作分类"`
-}
-
-type BaseFromMysteelChemicalClassifySimplify struct {
-	ClassifyId   int    `description:"分类id"`
-	ClassifyName string `description:"分类名称"`
-	ParentId     int
-}
-
-// GetFirstBaseFromMysteelChemicalClassify 获取当前分类下,且排序数相同 的排序第一条的数据
-func GetFirstBaseFromMysteelChemicalClassify() (item *BaseFromMysteelChemicalClassify, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_classify order by sort asc,base_from_mysteel_chemical_classify_id asc limit 1`
-	err = global.DmSQL["data"].Raw(sql).First(&item).Error
-	return
-}
-
-// UpdateBaseFromMysteelChemicalClassifySortByClassifyId 根据分类id更新排序
-func UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	sql := ` update base_from_mysteel_chemical_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	if classifyId > 0 {
-		sql += ` or ( base_from_mysteel_chemical_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	}
-	err = global.DmSQL["data"].Exec(sql, parentId, nowSort).Error
-	return
-}
-
-// Update 更新分类基础信息
-func (BaseFromMysteelChemicalClassify *BaseFromMysteelChemicalClassify) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(BaseFromMysteelChemicalClassify).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalClassifyMaxSort 获取分类下最大的排序数
-func GetBaseFromMysteelChemicalClassifyMaxSort(parentId int) (sort int, err error) {
-	sql := `SELECT Max(sort) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
-	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
-	return
-}
-
-// DeleteMysteelChemicalByClassifyId 根据分类id删除对应的指标分类、指标、指标数据
-func DeleteMysteelChemicalByClassifyId(classifyIdList []int, mysteelChemicalIndexIdList []int) (err error) {
-	to := global.DmSQL["data"].Begin()
-
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-
-	sql := `DELETE FROM base_from_mysteel_chemical_classify  WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = to.Exec(sql, classifyIdList).Error
-	if err != nil {
-		return
-	}
-
-	sql = `DELETE FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = to.Exec(sql, classifyIdList).Error
-	if err != nil {
-		return
-	}
-
-	//删除指标数据
-	indexNum := len(mysteelChemicalIndexIdList)
-	if indexNum > 0 {
-		sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(indexNum) + `) `
-		err = to.Exec(sql, mysteelChemicalIndexIdList).Error
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-// DeleteMysteelChemical 根据指标id删除对应的指标指标、指标数据
-func DeleteMysteelChemical(mysteelChemicalIndexId int) (err error) {
-	to := global.DmSQL["data"].Begin()
-
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	//删除指标
-	sql := `DELETE FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id = ? `
-	err = to.Exec(sql, mysteelChemicalIndexId).Error
-	if err != nil {
-		return
-	}
-
-	sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id = ? `
-	err = to.Exec(sql, mysteelChemicalIndexId).Error
-	if err != nil {
-		return
-	}
-
-	return
-}

+ 0 - 626
models/data_manage/mysteel_chemical_index.go

@@ -1,626 +0,0 @@
-package data_manage
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-// BaseFromMysteelChemicalIndex 钢联化工指标表
-type BaseFromMysteelChemicalIndex struct {
-	BaseFromMysteelChemicalIndexId    int       `orm:"column(base_from_mysteel_chemical_index_id);pk" gorm:"primaryKey" `
-	BaseFromMysteelChemicalClassifyId int       `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
-	IndexCode                         string    `description:"指标编码"`
-	IndexName                         string    `description:"指标名称"`
-	Unit                              string    `description:"单位"`
-	Source                            string    `description:"数据来源"`
-	Frequency                         string    `description:"频度"`
-	StartDate                         string    `description:"开始日期"`
-	EndDate                           string    `description:"结束日期"`
-	Describe                          string    `description:"指标描述"`
-	UpdateWeek                        string    `description:"更新周期"`
-	UpdateTime                        string    `description:"更新时间1"`
-	UpdateTime2                       string    `description:"更新时间2"`
-	SysUserId                         int       `description:"创建人id"`
-	SysUserRealName                   string    `description:"创建人姓名"`
-	ModifyTime                        time.Time `description:"修改时间"`
-	CreateTime                        time.Time `description:"创建时间"`
-	Sort                              int       `description:"排序字段"`
-	MergeFilePath                     string    `description:"合并文件"`
-	TerminalCode                      string    `description:"终端编码"`
-	IsStop                            int       `description:"是否停更:1:停更,0:未停更"`
-	EndValue                          float64   `description:"指标的最新值"`
-	IsSupplierStop                    int       `description:"是否供应商停更:1:停更,0:未停更"`
-}
-
-type BaseFromMysteelChemicalIndexItem struct {
-	BaseFromMysteelChemicalIndexId int64  `orm:"column(base_from_mysteel_chemical_index_id);pk" gorm:"primaryKey" `
-	IndexCode                      string `description:"指标编码"`
-	IndexName                      string `description:"指标名称"`
-	Unit                           string `description:"单位"`
-	Frequency                      string `description:"频度"`
-	Source                         int    `description:"数据来源"`
-	StartDate                      string `description:"开始日期"`
-	EndDate                        string `description:"结束日期"`
-	CreateTime                     string `description:"创建时间"`
-	ModifyTime                     string `description:"修改时间"`
-	EdbInfoId                      int    `description:"eta指标库的id"`
-	EdbUniqueCode                  string `description:"指标库唯一编码"`
-	EdbClassifyId                  int    `description:"指标库分类ID"`
-	IsStop                         int    `description:"是否停更:1:停更,0:未停更"`
-	EdbExist                       int    `description:"指标库是否已添加:0-否;1-是"`
-}
-
-var BaseFromMysteelChemicalIndexCols = struct {
-	BaseFromMysteelChemicalIndexId string
-	IndexCode                      string
-	IndexName                      string
-	Unit                           string
-	Frequency                      string
-	Source                         string
-	StartDate                      string
-	EndDate                        string
-	CreateTime                     string
-	ModifyTime                     string
-}{
-	BaseFromMysteelChemicalIndexId: "base_from_mysteel_chemical_index_id",
-	IndexCode:                      "index_code",
-	IndexName:                      "index_name",
-	Unit:                           "unit",
-	Frequency:                      "frequency",
-	Source:                         "source",
-	StartDate:                      "start_date",
-	EndDate:                        "end_date",
-	CreateTime:                     "create_time",
-	ModifyTime:                     "modify_time",
-}
-
-// Update 更新钢联化工指标基础信息
-func (item *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
-	err = global.DmSQL["data"].Select(cols).Updates(item).Error
-	return
-}
-func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars []interface{}, limitSize int) (items []*BaseFromMysteelChemicalIndexItem, err error) {
-	if pars == nil {
-		pars = make([]interface{}, 0)
-	}
-
-	sql := `select a.*,b.edb_info_id,b.unique_code as edb_unique_code,b.classify_id as edb_classify_id FROM base_from_mysteel_chemical_index AS a LEFT JOIN edb_info b on a.index_code=b.edb_code AND b.source=? WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` order by a.base_from_mysteel_chemical_index_id desc `
-
-	if limitSize > 0 {
-		sql += " limit ? "
-		pars = append(pars, limitSize)
-	}
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)...).Find(&items).Error
-	return
-}
-
-// AddBaseFromMysteelChemicalIndex 添加钢联化工指标
-func AddBaseFromMysteelChemicalIndex(item *BaseFromMysteelChemicalIndex) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	return
-}
-
-// AddBaseFromMysteelChemicalIndex 添加钢联化工指标
-func BatchAddBaseFromMysteelChemicalIndex(items []*BaseFromMysteelChemicalIndex) (lastId int64, err error) {
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-// BaseFromMysteelChemicalData 钢联化工指标数据表
-type BaseFromMysteelChemicalData struct {
-	BaseFromMysteelChemicalDataId  int       `orm:"column(base_from_mysteel_chemical_data_id);pk" gorm:"primaryKey" `
-	BaseFromMysteelChemicalIndexId int       `orm:"column(base_from_mysteel_chemical_index_id)" description:"钢联化工指标id"`
-	IndexCode                      string    `description:"指标编码"`
-	DataTime                       time.Time `description:"数据日期"`
-	Value                          float64   `description:"数据值"`
-	ModifyTime                     time.Time `description:"修改时间"`
-	CreateTime                     time.Time `description:"创建时间"`
-}
-
-// MysteelChemicalFrequency 钢联化工频度
-type MysteelChemicalFrequency struct {
-	Frequency string `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
-}
-
-// GetMysteelChemicalIndexByClassifyId 用于分类展示
-func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
-	        sys_user_id,sys_user_real_name,sort,index_code
-	       FROM base_from_mysteel_chemical_index where base_from_mysteel_chemical_classify_id=? ORDER BY sort asc, create_time ASC `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
-	return
-}
-
-// GetMysteelChemicalFrequency 获取钢联化工频度数据列表
-func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []*MysteelChemicalFrequency, err error) {
-	sql := ` SELECT frequency FROM base_from_mysteel_chemical_index WHERE 1=1 AND frequency != "" `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-// MysteelChemicalList 钢联化工指标列表
-type MysteelChemicalList struct {
-	Id                                int                    `orm:"column(base_from_mysteel_chemical_index_id)"`
-	BaseFromMysteelChemicalClassifyId int                    `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
-	ParentClassifyId                  int                    `description:"钢联化工指标父级分类id"`
-	IndexCode                         string                 `description:"指标编码"`
-	IndexName                         string                 `description:"指标名称"`
-	UnitName                          string                 `orm:"column(unit)"`
-	UniqueCode                        string                 `description:"唯一编码"`
-	FrequencyName                     string                 `orm:"column(frequency)"`
-	EdbInfoId                         int                    `description:"指标库的id"`
-	UpdateTime                        string                 `orm:"column(modify_time)"`
-	IsStop                            int                    `description:"是否停更:1:停更,0:未停更"`
-	IsSupplierStop                    int                    `description:"是否供应商停更:1:停更,0:未停更"`
-	Paging                            *paging.PagingItem     `description:"分页数据"`
-	DataList                          []*MysteelChemicalData `gorm:"-"`
-}
-
-// MysteelChemicalData 钢联化工数据列表
-type MysteelChemicalData struct {
-	InputValue string `orm:"column(value)" description:"值"`
-	DataTime   string `orm:"column(data_time)" description:"日期"`
-}
-
-// GetMysteelChemicalIndex 根据分类id获取钢联化工频度数据列表
-func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*MysteelChemicalList, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-// GetMysteelChemicalIndexData 根据指标code获取钢联化工数据列表
-func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (items []*MysteelChemicalData, err error) {
-	sql := ` SELECT * FROM (
-	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
-	ORDER BY data_time DESC
-	)AS t
-	GROUP BY t.data_time
-	ORDER BY t.data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
-	return
-}
-
-// GetMysteelChemicalIndexDataCount 根据指标code获取钢联化工数据列表 获取钢联数据总数
-func GetMysteelChemicalIndexDataCount(indexCode string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM (
-			SELECT * FROM (
-	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
-	ORDER BY data_time DESC
-	)AS t
-	GROUP BY t.data_time
-	ORDER BY t.data_time DESC
-			)AS n `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalIndexByIndexId 根据指标id获取指标信息
-func GetBaseFromMysteelChemicalIndexByIndexId(indexId int) (item *BaseFromMysteelChemicalIndex, err error) {
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id=? `
-	err = global.DmSQL["data"].Raw(sql, indexId).First(&item).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalIndexByCode 根据指标code获取指标信息
-func GetBaseFromMysteelChemicalIndexByCode(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalIndexByCodeList 根据指标code获取指标信息
-func GetBaseFromMysteelChemicalIndexByCodeList(indexCodeList []string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	if len(indexCodeList) <= 0 {
-		return
-	}
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code IN (%s) `
-	holder := make([]string, 0)
-	for range indexCodeList {
-		holder = append(holder, "?")
-	}
-	sql = fmt.Sprintf(sql, strings.Join(holder, ","))
-	err = global.DmSQL["data"].Raw(sql, indexCodeList).Find(&items).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalIndexListByClassifyIdList 根据指标分类id集合获取指标列表信息
-func GetBaseFromMysteelChemicalIndexListByClassifyIdList(classifyIdList []int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
-	return
-}
-
-// GetBaseFromMysteelChemicalDataMaxCount 获取分类下指标的最大数量
-func GetBaseFromMysteelChemicalDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_mysteel_chemical_index AS a
-				INNER JOIN base_from_mysteel_chemical_data AS b ON a.base_from_mysteel_chemical_index_id=b.base_from_mysteel_chemical_index_id
-				WHERE a.base_from_mysteel_chemical_classify_id=?
-				GROUP BY a.base_from_mysteel_chemical_index_id
-			)AS t `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
-	return
-}
-
-// GetMysteelChemicalIndexDataByCode 通过钢联化工指标code获取所有数据列表
-func GetMysteelChemicalIndexDataByCode(indexCode string) (items []*MysteelChemicalData, err error) {
-	sql := ` SELECT * FROM (
-	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
-	ORDER BY data_time DESC
-	)AS t
-	GROUP BY t.data_time
-	ORDER BY t.data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
-	return
-}
-
-// MoveBaseFromMysteelChemicalIndex 移动钢联化工指标分类
-func MoveBaseFromMysteelChemicalIndex(chartInfoId, classifyId int) (err error) {
-	sql := ` UPDATE base_from_mysteel_chemical_index
-			SET
-			  base_from_mysteel_chemical_classify_id = ?
-			WHERE base_from_mysteel_chemical_index_id = ?`
-	err = global.DmSQL["data"].Exec(sql, classifyId, chartInfoId).Error
-	return
-}
-
-// UpdateBaseFromMysteelChemicalIndexByClassifyId 根据指标id更新排序
-func UpdateBaseFromMysteelChemicalIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	sql := ` update base_from_mysteel_chemical_index set sort = ` + updateSort + ` WHERE base_from_mysteel_chemical_classify_id=? AND  `
-	if prevIndexInfoId > 0 {
-		sql += ` ( sort > ? or (base_from_mysteel_chemical_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	}
-	err = global.DmSQL["data"].Exec(sql, classifyId, nowSort).Error
-	return
-}
-
-// GetFirstBaseFromMysteelChemicalIndexByClassifyId 获取当前分类下,且排序数相同 的排序第一条的数据
-func GetFirstBaseFromMysteelChemicalIndexByClassifyId(classifyId int) (item *BaseFromMysteelChemicalIndex, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id=? order by sort asc,base_from_mysteel_chemical_index_id asc limit 1`
-	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
-	return
-}
-
-// GetMysteelChemicalIndexCount 根据条件获取钢联化工数据
-func GetMysteelChemicalIndexCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-	return
-}
-
-// GetMysteelChemicalIndexList 根据分类id获取钢联化工频度数据列表
-func GetMysteelChemicalIndexList(condition string, pars []interface{}, startSize, pageSize int, orderDesc string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
-
-	if condition != "" {
-		sql += condition
-	}
-
-	if orderDesc == `` {
-		orderDesc = ` ASC `
-	}
-	sql += ` ORDER BY base_from_mysteel_chemical_index_id `
-	sql += orderDesc
-	sql += ` LIMIT ?,? `
-
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-// GetMysteelChemicalIndexListByIndexId
-// @Description: 根据指标id列表获取列表信息
-// @param edbIdList
-// @return items
-// @return err
-func GetMysteelChemicalIndexListByIndexId(edbIdList []string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	num := len(edbIdList)
-	if num <= 0 {
-		return
-	}
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, edbIdList).Find(&items).Error
-	return
-}
-
-// GetMysteelChemicalIndexListByUserId
-// @Description: 根据用户id列表获取列表信息
-// @param userIdList
-// @return items
-// @return err
-func GetMysteelChemicalIndexListByUserId(userIdList []int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	num := len(userIdList)
-	if num <= 0 {
-		return
-	}
-	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, userIdList).Find(&items).Error
-	return
-}
-
-// ModifyMysteelChemicalIndexUserIdByCodeList 根据指标code列表修改创建人
-func ModifyMysteelChemicalIndexUserIdByCodeList(edbIdList []string, userId int, userName string) (err error) {
-	num := len(edbIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Exec(sql, userId, userName, edbIdList).Error
-	return
-}
-
-// ModifyMysteelChemicalIndexUserIdByOldUserId
-// @Description: 根据旧用户id修改新用户id
-// @author: Roc
-// @datetime 2024-03-25 17:59:08
-// @param oldUserId int
-// @param userId int
-// @param userName string
-// @return err error
-func ModifyMysteelChemicalIndexUserIdByOldUserId(oldUserIdList []int, userId int, userName string) (err error) {
-	num := len(oldUserIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `)  `
-	err = global.DmSQL["data"].Exec(sql, userId, userName, oldUserIdList).Error
-	return
-}
-
-// GetMysteelChemicalIndexAdminList 获取所有指标创建人
-func GetMysteelChemicalIndexAdminList() (list []int, err error) {
-	sql := ` SELECT sys_user_id FROM base_from_mysteel_chemical_index GROUP BY sys_user_id `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return
-}
-
-type TerminalNum struct {
-	TerminalCode string `description:"terminal_code"`
-	Num          int    `description:"num"`
-}
-
-// GetMysteelChemicalGroupTerminalNum 获取钢联化工指标的终端分布
-func GetMysteelChemicalGroupTerminalNum() (items []*TerminalNum, err error) {
-	sql := ` SELECT terminal_code,count(1) num FROM base_from_mysteel_chemical_index GROUP BY terminal_code ORDER BY num ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
-
-// BaseRefreshEdbInfo
-// @Description: 刷新配置的基础指标信息结构体
-type BaseRefreshEdbInfo struct {
-	EdbInfoId       int
-	ClassifyId      int    `description:"钢联化工指标分类id"`
-	IndexCode       string `description:"指标编码"`
-	IndexName       string `description:"指标名称"`
-	EndDate         string `description:"最新日期"`
-	EndValue        string `description:"最新值"`
-	SysUserId       int    `description:"创建人id"`
-	SysUserRealName string `description:"创建人姓名"`
-	Frequency       string `description:"频度"`
-	IsStop          int    `description:"是否停更:1:停更,0:未停更"`
-	TerminalCode    string `description:"终端编码"`
-	RefreshTime     string `description:"刷新时间"`
-}
-
-// RefreshBaseEdbInfoResp
-// @Description: 刷新数据源的数据返回
-type RefreshBaseEdbInfoResp struct {
-	Paging *paging.PagingItem
-	List   []*BaseRefreshEdbInfo
-}
-
-// GetMysteelChemicalBaseInfoList
-// @Description: 获取钢联化工数据列表
-// @author: Roc
-// @datetime 2024-01-10 14:28:35
-// @param condition string
-// @param pars []interface{}
-// @param orderBy string
-// @param startSize int
-// @param pageSize int
-// @return total int
-// @return items []*BaseRefreshEdbInfo
-// @return err error
-func GetMysteelChemicalBaseInfoList(condition string, pars []interface{}, orderBy string, startSize, pageSize int) (total int, items []*BaseRefreshEdbInfo, err error) {
-	totalSql := ` SELECT count(1) FROM base_from_mysteel_chemical_index WHERE 1=1 `
-	if condition != "" {
-		totalSql += condition
-	}
-	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
-	if err != nil {
-		return
-	}
-	sql := ` SELECT base_from_mysteel_chemical_index_id as edb_info_id, base_from_mysteel_chemical_classify_id as classify_id,index_code,index_name,end_date,end_value,sys_user_id,sys_user_real_name,frequency,is_stop,terminal_code FROM base_from_mysteel_chemical_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-
-	if orderBy != "" {
-		sql += ` ORDER BY ` + orderBy
-	} else {
-		sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	}
-	sql += `  LIMIT ?,? `
-
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-// ModifyMysteelChemicalUpdateStatus
-// @Description:  修改钢联化工数据停更状态
-// @author: Roc
-// @datetime 2024-01-08 16:23:31
-// @param edbIdList []int
-// @param indexCodeList []string
-// @param isStop int
-// @return err error
-func ModifyMysteelChemicalUpdateStatus(edbIdList []int, indexCodeList []string, isStop int) (err error) {
-	idNum := len(edbIdList)
-	if idNum <= 0 {
-		return
-	}
-
-	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-	err = global.DmSQL["data"].Exec(sql, isStop, edbIdList).Error
-	if err != nil {
-		return
-	}
-
-	codeNum := len(indexCodeList)
-	if codeNum <= 0 {
-		// 需要通过指标id列表查找code列表
-		sql := ` SELECT index_code FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-		err = global.DmSQL["data"].Raw(sql, edbIdList).Find(&indexCodeList).Error
-		if err != nil {
-			return
-		}
-
-	}
-
-	codeNum = len(indexCodeList)
-	// 查出来的编码是空的话,那么就直接返回了
-	if codeNum <= 0 {
-		return
-	}
-
-	// 更改指标的更新状态
-	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_code IN (` + utils.GetOrmInReplace(codeNum) + `) `
-	err = global.DmSQL["data"].Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, indexCodeList).Error
-	if err != nil {
-		return
-	}
-	return
-}
-
-// ModifyMysteelChemicalUpdateStatusByEdbInfoId
-// @Description:  修改单个钢联化工指标停更状态,同时停更依赖于该指标的计算指标
-// @author: Roc
-// @datetime 2024-01-08 16:23:31
-// @param edbIdList []int
-// @param indexCodeList []string
-// @param isStop int
-// @return err error
-func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode string, calculateEdbInfoIds []int) (err error) {
-	to := global.DmSQL["data"].Begin()
-
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	// 更改数据源的更新状态
-	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code = ? `
-	err = to.Exec(sql, isStop, edbCode).Error
-	if err != nil {
-		return
-	}
-
-	// 更改指标的更新状态
-	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_info_id=? `
-	err = to.Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, edbInfoId).Error
-	if err != nil {
-		return
-	}
-
-	if len(calculateEdbInfoIds) > 0 {
-		// 批量更新相关联的指标ID
-		sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		err = to.Exec(sql, isStop, calculateEdbInfoIds).Error
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int, edbCodes []string, calculateEdbInfoIds []int) (err error) {
-	to := global.DmSQL["data"].Begin()
-
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	// 更改数据源的更新状态
-	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) `
-	err = to.Exec(sql, isStop, edbCodes).Error
-	if err != nil {
-		return
-	}
-
-	// 更改指标的更新状态
-	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	err = to.Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, edbInfoIds).Error
-	if err != nil {
-		return
-	}
-
-	if len(calculateEdbInfoIds) > 0 {
-		// 批量更新相关联的指标ID
-		sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		err = to.Exec(sql, isStop, calculateEdbInfoIds).Error
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-// GetNotIsSupplierStopIndexByCodeList
-// @Description: 获取未被供应商停更的指标
-// @author: Roc
-// @datetime 2024-08-28 18:15:03
-// @param codeList []string
-// @param isStop int
-// @return items []*BaseFromMysteelChemicalIndex
-// @return err error
-func GetNotIsSupplierStopIndexByCodeList(codeList []string, isStop int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	num := len(codeList)
-	if num <= 0 {
-		return
-	}
-
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE is_supplier_stop = ? AND index_code in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["data"].Raw(sql, isStop, codeList).Find(&items).Error
-	return
-}

+ 0 - 91
models/data_source/base_from_sci99.go

@@ -1,91 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-// BaseFromSci99Classify 代表卓创资讯-原始指标分类表的结构
-type BaseFromSci99Classify struct {
-	BaseFromSciClassifyId int       `gorm:"primaryKey;column:base_from_sci_classify_id;type:int(10) unsigned;not null"` // 分类ID
-	ClassifyName          string    `gorm:"column:classify_name;type:varchar(255);not null;default:''"`                 // 分类名称
-	Sort                  int       `gorm:"column:sort;type:int(10) unsigned;not null;default:0"`                       // 排序
-	CreateTime            time.Time `gorm:"column:create_time;type:datetime"`                                           // 创建时间
-	ModifyTime            time.Time `gorm:"column:modify_time;type:datetime"`                                           // 修改时间
-}
-
-type BaseFromSci99DataItem struct {
-	BaseFromSciDataId  int     `gorm:"primaryKey;column:base_from_sci_data_id;type:int(10) unsigned;not null"`
-	BaseFromSciIndexId int     `gorm:"index:idx_index_id;column:base_from_sci_index_id;type:int(10) unsigned;not null"` // 指标id
-	IndexCode          string  `gorm:"index:idx_index_code;column:index_code;type:varchar(128);not null;default:''"`    // 指标编码
-	DataTime           string  `gorm:"column:data_time;type:date"`                                                      // 数据日期
-	Value              float64 `gorm:"column:value;type:double"`                                                        // 数据值
-	CreateTime         string  `gorm:"column:create_time;type:datetime"`                                                // 创建时间
-	ModifyTime         string  `gorm:"column:modify_time;type:datetime"`                                                // 修改时间
-}
-
-type BaseFromSci99IndexList struct {
-	BaseFromSciIndexId int                      `gorm:"primaryKey;column:base_from_sci_index_id;type:int(10) unsigned;not null"`
-	IndexCode          string                   `gorm:"index:idx_index_code;column:index_code;type:varchar(128);not null;default:''"` // 指标编码
-	IndexName          string                   `gorm:"column:index_name;type:varchar(255);not null;default:''"`                      // 指标名称
-	ClassifyId         int                      `gorm:"column:classify_id;type:int(10) unsigned;not null;default:0"`                  // 分类ID
-	Unit               string                   `gorm:"column:unit;type:varchar(32);not null;default:''"`                             // 单位
-	Frequency          string                   `gorm:"column:frequency;type:varchar(32);not null;default:''"`                        // 频度
-	Describe           string                   `gorm:"column:describe;type:varchar(255);not null;default:''"`                        // 指标描述
-	CreateTime         string                   `gorm:"column:create_time;type:datetime"`                                             // 创建时间
-	ModifyTime         string                   `gorm:"column:modify_time;type:datetime"`                                             // 修改时间
-	DataList           []*BaseFromSci99DataItem `gorm:"-"`
-	Paging             *paging.PagingItem       `description:"分页数据" gorm:"-"`
-}
-
-func GetBaseFromSci99Classify() (list []*BaseFromSci99Classify, err error) {
-	sql := `SELECT * FROM base_from_sci99_classify `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return
-}
-
-func GetSci99Index(condition string, pars []interface{}) (items []*BaseFromSci99IndexList, err error) {
-	sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY base_from_sci_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-func GetSci99IndexDataCount(indexCode string) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci99_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-	return
-}
-
-func GetSci99IndexData(indexCode string, startSize, pageSize int) (items []*BaseFromSci99DataItem, err error) {
-	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
-	return
-}
-
-func GetSci99DataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
-				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
-				WHERE a.base_from_icpi_classify_id=?
-				GROUP BY a.base_from_icpi_index_id
-			)AS t `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
-	return
-}
-
-func GetSci99IndexDataByCode(indexCode string) (items []*BaseFromSci99DataItem, err error) {
-	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
-	return
-}
-
-func GetSci99IndexLatestDate(indexCode string) (ModifyTime string, err error) {
-	sql := ` SELECT modify_time FROM base_from_sci99_data WHERE index_code=? ORDER BY modify_time DESC limit 1 `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&ModifyTime).Error
-	return
-}

+ 0 - 131
models/data_source/guagnzhouqihuo.go

@@ -1,131 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/global"
-	"time"
-)
-
-type BaseFromTradeGuangzhouClassify struct {
-	BaseFromTradeGuangzhouClassifyId int       `gorm:"primaryKey;column:base_from_trade_guangzhou_classify_id;type:int(11);not null"`
-	ClassifyName                     string    `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
-	ClassifyCode                     string    `gorm:"column:classify_code;type:varchar(100);default:''"`          // 分类编码
-	ParentId                         int       `gorm:"column:parent_id;type:int(11) unsigned;default:0"`           // 上级id
-	ModifyTime                       time.Time `gorm:"column:modify_time;type:datetime"`                           // 修改时间
-	CreateTime                       time.Time `gorm:"column:create_time;type:datetime"`                           // 创建时间
-}
-
-type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `gorm:"primaryKey;column:base_from_trade_guangzhou_index_id;type:int(11);not null"`
-	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id/指标id
-	BaseFromTradeGuangzhouContractId int       `gorm:"column:base_from_trade_guangzhou_contract_id;type:int(11);default:0"` // 合约id
-	IndexCode                        string    `gorm:"unique;column:index_code;type:varchar(100);default:''"`               // 指标编码
-	IndexName                        string    `gorm:"column:index_name;type:varchar(100);default:''"`                      // 指标名称
-	Frequency                        string    `gorm:"column:frequency;type:varchar(30);default:''"`                        // 频度
-	Unit                             string    `gorm:"column:unit;type:varchar(20);default:''"`                             // 单位
-	StartDate                        string    `gorm:"column:start_date;type:date"`                                         // 开始日期
-	EndDate                          string    `gorm:"column:end_date;type:date"`                                           // 结束日期
-	CreateTime                       time.Time `gorm:"column:create_time;type:datetime"`                                    // 创建时间
-	ModifyTime                       time.Time `gorm:"column:modify_time;type:datetime"`                                    // 修改日期
-	Value                            float64   `gorm:"column:value;type:double;default:0"`                                  // 数据值
-}
-
-type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `gorm:"primaryKey;index:idx_index_id;column:base_from_trade_guangzhou_data_id;type:int(10) unsigned;not null"`
-	BaseFromTradeGuangzhouIndexId int       `gorm:"column:base_from_trade_guangzhou_index_id;type:int(11) unsigned;not null;default:0"`                     // 指标ID
-	IndexCode                     string    `gorm:"uniqueIndex:idx_code_time;index:idx_index_code;column:index_code;type:varchar(128);not null;default:''"` // 指标编码
-	DataTime                      string    `gorm:"uniqueIndex:idx_code_time;index:idx_data_time;column:data_time;type:date"`                               // 数据日期
-	Value                         float64   `gorm:"column:value;type:double;not null;default:0"`                                                            // 数据值
-	QtySub                        float64   `gorm:"column:qty_sub;type:double;default:0"`                                                                   // 增减
-	CreateTime                    time.Time `gorm:"column:create_time;type:datetime"`                                                                       // 创建时间
-	ModifyTime                    time.Time `gorm:"column:modify_time;type:datetime"`                                                                       // 更新时间
-}
-
-type BaseFromTradeGuangzhouClassifyView struct {
-	BaseFromTradeGuangzhouClassifyId int                                   `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);not null"`
-	ClassifyName                     string                                `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
-	ClassifyCode                     string                                `gorm:"column:classify_code;type:varchar(100);default:''"`          // 分类编码
-	ParentId                         int                                   `gorm:"column:parent_id;type:int(11) unsigned;default:0"`           // 上级id
-	Children                         []*BaseFromTradeGuangzhouClassifyView `gorm:"-"`
-}
-
-type BaseFromTradeGuangzhouContract struct {
-	BaseFromTradeGuangzhouContractId int    `gorm:"primaryKey;column:base_from_trade_guangzhou_contract_id;type:int(11);not null"`
-	BaseFromTradeGuangzhouClassifyId int    `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id
-	ClassifyCode                     string `gorm:"column:classify_code;type:varchar(100);default:''"`                   // 分类编码
-	Contract                         string `gorm:"index:idx_contract;column:contract;type:varchar(20);default:''"`      // 合约代码
-	TradeDate                        string `gorm:"index:idx_trade_date;column:trade_date;type:varchar(20);default:''"`  // 合约日期
-}
-
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassifyView, err error) {
-	sql := `SELECT * FROM base_from_trade_guangzhou_classify`
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return list, err
-}
-
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouMaxDate() (max_date string, err error) {
-	sql := ` SELECT MAX(a.end_date) AS max_date FROM base_from_trade_guangzhou_index AS a `
-	err = global.DmSQL["data"].Raw(sql).Scan(&max_date).Error
-	return max_date, err
-}
-
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouContract(classifyId int, tradeDate string) (list []*BaseFromTradeGuangzhouContract, err error) {
-	sql := ` SELECT * FROM base_from_trade_guangzhou_contract AS a WHERE base_from_trade_guangzhou_classify_id=? AND trade_date=? `
-	err = global.DmSQL["data"].Raw(sql, classifyId, tradeDate).Find(&list).Error
-	return
-}
-
-type BaseFromTradeGuangzhouIndexView struct {
-	BaseFromTradeGuangzhouIndexId    int     `gorm:"column:base_from_trade_guangzhou_index_id;type:int(11);not null"`
-	BaseFromTradeGuangzhouClassifyId int     `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id/指标id
-	IndexCode                        string  `gorm:"unique;column:index_code;type:varchar(100);default:''"`               // 指标编码
-	IndexName                        string  `gorm:"column:index_name;type:varchar(100);default:''"`                      // 指标名称
-	Frequency                        string  `gorm:"column:frequency;type:varchar(30);default:''"`                        // 频度
-	Unit                             string  `gorm:"column:unit;type:varchar(20);default:''"`                             // 单位
-	StartDate                        string  `gorm:"column:start_date;type:date"`                                         // 开始日期
-	EndDate                          string  `gorm:"column:end_date;type:date"`                                           // 结束日期
-	Value                            float64 `gorm:"column:value;type:double;default:0"`                                  // 数据值
-}
-
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}, baseFromTradeGuangzhouContractId int) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	if baseFromTradeGuangzhouContractId <= 0 {
-		sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
- FROM base_from_trade_guangzhou_data AS a
-INNER JOIN base_from_trade_guangzhou_index AS b ON a.base_from_trade_guangzhou_index_id=b.base_from_trade_guangzhou_index_id
-LEFT JOIN base_from_trade_guangzhou_contract AS c ON b.base_from_trade_guangzhou_classify_id=c.base_from_trade_guangzhou_classify_id
-WHERE `
-		if condition != "" {
-			sql += condition
-		}
-		sql += ` ORDER BY a.index_code ASC `
-		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
-		return
-	} else {
-		condition += ` AND a.base_from_trade_guangzhou_contract_id=? `
-		pars = append(pars, baseFromTradeGuangzhouContractId)
-
-		sql := ` SELECT a.*,b.value 
- FROM base_from_trade_guangzhou_index AS a
-INNER JOIN base_from_trade_guangzhou_data AS b ON a.base_from_trade_guangzhou_index_id=b.base_from_trade_guangzhou_index_id
-WHERE `
-
-		if condition != "" {
-			sql += condition
-		}
-		sql += ` ORDER BY a.index_code ASC `
-		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
-		return
-	}
-}
-
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndexDetail(condition string, pars []interface{}) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	sql := ` SELECT a.*
- FROM base_from_trade_guangzhou_index AS a
-WHERE `
-
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY a.index_code ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
-	return
-}

+ 0 - 109
models/data_source/icpi.go

@@ -1,109 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `gorm:"primaryKey;column:base_from_icpi_index_id;type:int(11);not null"`
-	BaseFromIcpiClassifyId int       `gorm:"column:base_from_icpi_classify_id;type:int(11);default:0"` // 分类
-	IndexCode              string    `gorm:"unique;column:index_code;type:varchar(100);default:''"`    // 指标编码
-	IndexName              string    `gorm:"column:index_name;type:varchar(100);default:''"`           // 指标名称
-	Frequency              string    `gorm:"column:frequency;type:varchar(20);default:''"`             // 频度
-	Unit                   string    `gorm:"column:unit;type:varchar(20);default:''"`                  // 单位
-	StartDate              time.Time `gorm:"column:start_date;type:date"`                              // 开始日期
-	EndDate                time.Time `gorm:"column:end_date;type:date"`                                // 结束日期
-	CreateTime             time.Time `gorm:"column:create_time;type:datetime"`                         // 创建时间
-	ModifyTime             time.Time `gorm:"column:modify_time;type:datetime"`                         // 修改时间
-}
-
-type BaseFromIcpiData struct {
-	BaseFromIcpiDataId  int       `gorm:"primaryKey;column:base_from_icpi_data_id;type:int(11);not null"`
-	BaseFromIcpiIndexId int       `gorm:"index:idx_base_from_icpi_index_id;column:base_from_icpi_index_id;type:int(11);default:0"`        // 指标id
-	IndexCode           string    `gorm:"uniqueIndex:idex_code_date;index:idx_index_code;column:index_code;type:varchar(100);default:''"` // 指标编码
-	DataTime            string    `gorm:"uniqueIndex:idex_code_date;column:data_time;type:date"`                                          // 数据日期
-	Value               float64   `gorm:"column:value;type:double"`                                                                       // 数据值
-	CreateTime          time.Time `gorm:"column:create_time;type:datetime"`                                                               // 创建时间
-	ModifyTime          time.Time `gorm:"column:modify_time;type:datetime"`                                                               // 修改时间
-}
-
-type BaseFromIcpiClassify struct {
-	BaseFromIcpiClassifyId int    `gorm:"primaryKey;column:base_from_icpi_classify_id;type:int(11);not null"`
-	ClassifyName           string `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
-	ClassifyNameEn         string `gorm:"column:classify_name_en;type:varchar(255);default:''"`       // 英文名称
-	ParentId               int    `gorm:"column:parent_id;type:int(11) unsigned;default:0"`           // 上级id
-	ModifyTime             string `gorm:"column:modify_time;type:datetime"`                           // 修改时间
-	CreateTime             string `gorm:"column:create_time;type:datetime"`                           // 创建时间
-}
-
-func (obj *BaseFromIcpiIndex) GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	sql := `SELECT * FROM base_from_icpi_classify `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return
-}
-
-type BaseFromIcpiDataView struct {
-	BaseFromIcpiDataId  int       `gorm:"primaryKey;column:base_from_icpi_data_id;type:int(11);not null"`
-	BaseFromIcpiIndexId int       `gorm:"index:idx_base_from_icpi_index_id;column:base_from_icpi_index_id;type:int(11);default:0"`        // 指标id
-	IndexCode           string    `gorm:"uniqueIndex:idex_code_date;index:idx_index_code;column:index_code;type:varchar(100);default:''"` // 指标编码
-	DataTime            string    `gorm:"uniqueIndex:idex_code_date;column:data_time;type:date"`                                          // 数据日期
-	Value               string    `gorm:"column:value;type:double"`                                                                       // 数据值
-	CreateTime          time.Time `gorm:"column:create_time;type:datetime"`                                                               // 创建时间
-	ModifyTime          time.Time `gorm:"column:modify_time;type:datetime"`                                                               // 修改时间
-}
-
-type BaseFromIcpiIndexView struct {
-	BaseFromIcpiIndexId    int                     `gorm:"primaryKey;column:base_from_icpi_index_id;type:int(11);not null"`
-	BaseFromIcpiClassifyId int                     `gorm:"column:base_from_icpi_classify_id;type:int(11);default:0"` // 分类
-	IndexCode              string                  `gorm:"unique;column:index_code;type:varchar(100);default:''"`    // 指标编码
-	IndexName              string                  `gorm:"column:index_name;type:varchar(100);default:''"`           // 指标名称
-	Frequency              string                  `gorm:"column:frequency;type:varchar(20);default:''"`             // 频度
-	Unit                   string                  `gorm:"column:unit;type:varchar(20);default:''"`                  // 单位
-	StartDate              string                  `gorm:"column:start_date;type:date"`                              // 开始日期
-	EndDate                string                  `gorm:"column:end_date;type:date"`                                // 结束日期
-	CreateTime             string                  `gorm:"column:create_time;type:datetime"`                         // 创建时间
-	ModifyTime             string                  `gorm:"column:modify_time;type:datetime"`                         // 修改时间
-	DataList               []*BaseFromIcpiDataView `gorm:"-"`
-	Paging                 *paging.PagingItem      `description:"分页数据" gorm:"-"`
-}
-
-func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars []interface{}) (items []*BaseFromIcpiIndexView, err error) {
-	sql := ` SELECT * FROM base_from_icpi_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY base_from_icpi_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-func (obj *BaseFromIcpiIndex) GetIcpiIndexDataCount(indexCode string) (count int, err error) {
-	sql := ` SELECT COUNT(1) AS count  FROM base_from_icpi_data WHERE index_code=? `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
-	return
-}
-
-func (obj *BaseFromIcpiIndex) GetIcpiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromIcpiDataView, err error) {
-	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
-	return
-}
-
-func (obj *BaseFromIcpiIndex) GetIcpiDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
-				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
-				WHERE a.base_from_icpi_classify_id=?
-				GROUP BY a.base_from_icpi_index_id
-			)AS t `
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
-	return
-}
-
-func (obj *BaseFromIcpiIndex) GetIcpiIndexDataByCode(indexCode string) (items []*BaseFromIcpiDataView, err error) {
-	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
-	return
-}

+ 0 - 178
models/data_source/longzhong.go

@@ -1,178 +0,0 @@
-package data_source
-
-import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-type Longzhonginfo struct {
-	LongzhonginfoId int    `gorm:"primaryKey;column:longzhonginfo_id;type:int(11);not null"`
-	TradeCode       string `gorm:"unique;column:trade_code;type:varchar(32);default:''"` // 指标唯一编码
-	SecName         string `gorm:"unique;column:sec_name;type:varchar(180);default:''"`  // 指标名称
-	Unit            string `gorm:"column:unit;type:varchar(100);default:''"`             // 单位
-	Frequency       string `gorm:"column:frequency;type:varchar(20);default:''"`         // 频度
-	LastModifyDate  string `gorm:"column:last_modify_date;type:date"`                    // 最后更新时间
-}
-
-func GetLongzhonginfoByClassifyId(classifyId int) (items []*Longzhonginfo, err error) {
-	sql := `SELECT * FROM longzhonginfo WHERE classify_id=? ORDER BY longzhonginfo_id ASC `
-	err = global.DmSQL["edb"].Raw(sql, classifyId).Find(&items).Error
-	return
-}
-
-func GetLongzhongDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM longzhonginfo AS a
-				INNER JOIN longzhongdata AS b ON a.longzhonginfo_id=b.longzhonginfo_id
-				WHERE a.classify_id=?
-				GROUP BY a.longzhonginfo_id
-			)AS t `
-	err = global.DmSQL["edb"].Raw(sql, classifyId).Scan(&count).Error
-	return
-}
-
-type Longzhongdata struct {
-	LongzhongdataId int       `gorm:"primaryKey;column:longzhongdata_id;type:int(11);not null"`
-	LongzhonginfoId int       `gorm:"uniqueIndex:idx_longzhonginfo_id;column:longzhonginfo_id;type:int(11);default:0"`
-	TradeCode       string    `gorm:"uniqueIndex:idx_trade_code_dt;column:trade_code;type:varchar(32);default:''"`
-	Dt              string    `gorm:"uniqueIndex:idx_trade_code_dt;uniqueIndex:idx_longzhonginfo_id;column:dt;type:date"`
-	Close           float64   `gorm:"column:close;type:double"`
-	CreateTime      time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP"`
-	ModifyTime      time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP"`
-	UnitDesc        string    `gorm:"column:unit_desc;type:varchar(255);default:''"` // 描述
-	UpdTime         string    `gorm:"column:upd_time;type:varchar(20);default:''"`   // 更新时间
-	DisplayTime     string    `gorm:"column:display_time;type:varchar(30);default:''"`
-}
-
-func GetLongzhongDataById(lzInfoId int) (items []*Longzhongdata, err error) {
-	sql := `SELECT * FROM longzhongdata WHERE longzhonginfo_id=? ORDER BY dt DESC `
-	err = global.DmSQL["edb"].Raw(sql, lzInfoId).Find(&items).Error
-	return
-}
-
-func GetLongzhongSurveyDataMaxCount(classifyName string) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
-				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
-				WHERE a.breed_name=?
-				GROUP BY a.survey_product_id
-			)AS t `
-	err = global.DmSQL["edb"].Raw(sql, classifyName).Scan(&count).Error
-	return
-}
-
-func GetLongzhongSurveyDataMaxCountByFrequency(classifyName string, frequency int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
-				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
-				WHERE a.breed_name=? AND a.frequency=?
-				GROUP BY a.survey_product_id
-			)AS t `
-	err = global.DmSQL["edb"].Raw(sql, classifyName, frequency).Scan(&count).Error
-	return
-}
-
-type ExportLzSurveyDataMaxCount struct {
-	Count   int `description:"最大数据量" gorm:"column:count"`
-	BreedId int `description:"品种ID" gorm:"column:breed_id"`
-}
-
-func GetExportLzSurveyDataMaxCount(breedIds []string) (items []ExportLzSurveyDataMaxCount, err error) {
-	if len(breedIds) == 0 {
-		return
-	}
-	sql := ` SELECT
-				MAX(t.num) AS count,
-				t.breed_id
-			FROM
-				(
-					SELECT
-						COUNT(1) AS num,
-						a.breed_id AS breed_id
-					FROM
-						longzhong_survey_product AS a
-					INNER JOIN longzhong_survey_data AS b ON a.survey_product_id = b.survey_product_id
-					WHERE
-						a.breed_id IN (` + utils.GetOrmInReplace(len(breedIds)) + `)
-					GROUP BY
-						a.survey_product_id
-				) AS t
-			GROUP BY
-				t.breed_id `
-	err = global.DmSQL["edb"].Raw(sql, breedIds).Find(&items).Error
-	return
-}
-
-func GetExportLzSurveyDataByBreedIds(breedIds []string) (items []*LongzhongSurveyData, err error) {
-	if len(breedIds) == 0 {
-		return
-	}
-	fields := ` survey_product_id, breed_id, input_value, data_time `
-	sql := `SELECT ` + fields + ` FROM longzhong_survey_data WHERE breed_id IN (` + utils.GetOrmInReplace(len(breedIds)) + `) ORDER BY breed_id ASC, survey_product_id ASC, data_time DESC `
-	err = global.DmSQL["edb"].Raw(sql, breedIds).Find(&items).Error
-	return
-}
-
-type LongzhongSurveyData struct {
-	SurveyDataId         int     `gorm:"primaryKey;column:survey_data_id;type:int(11);not null"`
-	SurveyProductId      int     `gorm:"column:survey_product_id;type:int(11)"`                    // 本地指标id
-	ProjectQuotaId       int64   `gorm:"column:project_quota_id;type:int(11)"`                     // 调研指标id
-	BreedId              string  `gorm:"column:breed_id;type:varchar(20);default:''"`              // 品种id
-	BreedName            string  `gorm:"column:breed_name;type:varchar(100);default:''"`           // 品种名称
-	QuotaId              string  `gorm:"column:quota_id;type:varchar(20);default:''"`              // 指标id
-	QuotaName            string  `gorm:"column:quota_name;type:varchar(255);default:''"`           // 指标名称
-	UnitId               string  `gorm:"column:unit_id;type:varchar(20);default:''"`               // 单位id
-	UnitName             string  `gorm:"column:unit_name;type:varchar(100);default:''"`            // 单位(例如:吨)
-	SampleType           int64   `gorm:"column:sample_type;type:int(11);default:0"`                // 样本类型 0-空 1-企业 2-港口 3-运距 4-区域/国家 99-不确定
-	SampleId             string  `gorm:"column:sample_id;type:varchar(50);default:''"`             // 样本id
-	SampleName           string  `gorm:"column:sample_name;type:varchar(100);default:''"`          // 样本名称
-	DeviceId             string  `gorm:"column:device_id;type:varchar(50);default:''"`             // 设备id
-	Device               string  `gorm:"column:device;type:varchar(100);default:''"`               // 设备
-	ProductCraftId       string  `gorm:"column:product_craft_id;type:varchar(50);default:''"`      // 工艺id
-	ProductCraft         string  `gorm:"column:product_craft;type:varchar(100);default:''"`        // 工艺
-	ProductLine          string  `gorm:"column:product_line;type:varchar(100);default:''"`         // 产线
-	InputMode            int64   `gorm:"column:input_mode;type:int(11);default:0"`                 // 录入方式 1-采集 2-计算 99-行业求和
-	Frequency            int64   `gorm:"column:frequency;type:int(11);default:0"`                  // 频率1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率
-	InputValue           float64 `gorm:"column:input_value;type:double"`                           // 调研结果
-	TaskShouldFinishTime int64   `gorm:"column:task_should_finish_time;type:bigint(11);default:0"` // 调研数据完成时间
-	CustomId             int64   `gorm:"column:custom_id;type:int(11);default:0"`                  // 扩展属性id
-	CustomType           int64   `gorm:"column:custom_type;type:int(11);default:0"`                // 扩展属性类型0未设置,1规格,2标准,3用户,4包装,5生产工艺6装置,8行业,9企业分类,10企业隶属关系
-	Custom               string  `gorm:"column:custom;type:varchar(200);default:''"`               // 扩展属性内容
-	QuotaSampleId        int64   `gorm:"column:quota_sample_id;type:int(11)"`                      // 调研指标配置样本id
-	TaskActualFinishTime int64   `gorm:"column:task_actual_finish_time;type:bigint(11)"`           // 调研数据实际完成时间
-	AreaName             string  `gorm:"column:area_name;type:varchar(100);default:''"`            // 区域名称
-	ProvinceName         string  `gorm:"column:province_name;type:varchar(100);default:''"`        // 省份名称
-	ResearchStartData    int64   `gorm:"column:research_start_data;type:int(11)"`                  // 调研开始日期
-	ResearchStopData     int64   `gorm:"column:research_stop_data;type:int(11)"`                   // 调研截止日期
-	DataTime             string  `gorm:"column:data_time;type:date"`                               // 调研数据实际完成日期
-}
-
-func GetLongzhongSurveyDataById(lzInfoId int) (items []*LongzhongSurveyData, err error) {
-	sql := `SELECT * FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
-	err = global.DmSQL["edb"].Raw(sql, lzInfoId).Find(&items).Error
-	return
-}
-
-// GetLzItemList 模糊查询隆众数据库指标列表
-func GetLzItemList(keyword string) (items []*data_manage.LongzhongSurveyProduct, err error) {
-	sql := "SELECT * FROM longzhong_survey_product WHERE CONCAT(sample_name,breed_name,custom,quota_name,lz_code) LIKE ? "
-	err = global.DmSQL["edb"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
-	return
-
-}
-
-// GetLzProductIdByCode 根据code查询隆众数据列表
-func GetLzProductIdByCode(lzCode string) (productId int, err error) {
-	sql := "SELECT survey_product_id FROM longzhong_survey_product WHERE lz_code=?"
-	err = global.DmSQL["edb"].Raw(sql, lzCode).Scan(&productId).Error
-	return
-}
-
-// GetLzSurveyDataMaxCountByProductId 根据code查询隆众数据列表
-func GetLzSurveyDataMaxCountByProductId(surveyProductId int) (productId int, err error) {
-	sql := "SELECT COUNT(1) FROM longzhong_survey_data WHERE survey_product_id=?"
-	err = global.DmSQL["edb"].Raw(sql, surveyProductId).Scan(&productId).Error
-	return
-}

+ 0 - 114
models/data_stat/edb_info_delete_log.go

@@ -1,114 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-type EdbInfoDeleteLog struct {
-	Id                 int     `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"`    // 自增id
-	EdbInfoId          int     `gorm:"column:edb_info_id;type:int(11);not null"`                         // 指标id
-	EdbInfoType        int     `gorm:"column:edb_info_type;type:tinyint(9) unsigned;not null;default:0"` // 指标类型,0:普通指标,1:预测指标
-	SourceName         string  `gorm:"column:source_name;type:varchar(100)"`                             // 来源名称
-	Source             int     `gorm:"column:source;type:tinyint(4)"`                                    // 来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众,11:有色,12:环比值,13:环差值,14:变频,15:钢联
-	EdbCode            string  `gorm:"column:edb_code;type:varchar(255);not null;default:''"`            // 指标编码
-	EdbName            string  `gorm:"column:edb_name;type:varchar(255);default:''"`                     // 指标名称
-	EdbNameSource      string  `gorm:"column:edb_name_source;type:varchar(255);default:''"`              // 指标名称_来源
-	Frequency          string  `gorm:"column:frequency;type:varchar(20);default:''"`                     // 频度
-	Unit               string  `gorm:"column:unit;type:varchar(20);default:''"`                          // 单位
-	StartDate          string  `gorm:"column:start_date;type:date"`                                      // 更新开始日期
-	EndDate            string  `gorm:"column:end_date;type:date"`                                        // 更新结束日期
-	SysUserId          int     `gorm:"column:sys_user_id;type:int(11)"`                                  // 创建人
-	SysUserRealName    string  `gorm:"column:sys_user_real_name;type:varchar(100)"`                      // 创建人姓名
-	EdbCreateTime      string  `gorm:"column:edb_create_time;type:datetime"`                             // 指标创建时间
-	EdbModifyTime      string  `gorm:"column:edb_modify_time;type:datetime"`                             // 指标修改时间
-	UniqueCode         string  `gorm:"column:unique_code;type:varchar(50);default:''"`                   // 唯一编码
-	MinValue           float64 `gorm:"column:min_value;type:double;default:0"`                           // 最小值
-	MaxValue           float64 `gorm:"column:max_value;type:double;default:0"`                           // 最大值
-	CalculateFormula   string  `gorm:"column:calculate_formula;type:varchar(255);default:''"`            // 计算公式,N数值移动
-	EdbType            int     `gorm:"column:edb_type;type:tinyint(4);default:1"`                        // 指标类型:1:基础指标,2:计算指标
-	LatestDate         string  `gorm:"column:latest_date;type:date"`                                     // 数据最新日期
-	LatestValue        float64 `gorm:"column:latest_value;type:double"`                                  // 数据最新值
-	MoveType           int     `gorm:"column:move_type;type:tinyint(4);default:1"`                       // 移动方式:1:领先(默认),2:滞后
-	MoveFrequency      string  `gorm:"column:move_frequency;type:varchar(20);default:''"`                // 移动频度
-	NoUpdate           int8    `gorm:"column:no_update;type:tinyint(4);default:0"`                       // 是否停止更新,0:继续更新;1:停止更新
-	EdbNameEn          string  `gorm:"column:edb_name_en;type:varchar(255);default:''"`                  // 英文指标名称
-	UnitEn             string  `gorm:"column:unit_en;type:varchar(20);default:''"`                       // 英文单位
-	ChartImage         string  `gorm:"column:chart_image;type:varchar(255);default:''"`                  // 图表图片
-	Calendar           string  `gorm:"column:calendar;type:varchar(16);default:公历"`                      // 公历/农历
-	DataDateType       string  `gorm:"column:data_date_type;type:varchar(32);default:交易日"`               // 数据日期类型,枚举值:交易日、自然日
-	ManualSave         int     `gorm:"column:manual_save;type:tinyint(4);not null;default:0"`            // 是否手动保存过上下限:0-否;1-是
-	TerminalCode       string  `gorm:"column:terminal_code;type:varchar(255);default:''"`                // 终端编码,用于配置在机器上
-	CreateTime         string  `gorm:"index:create_time_idx;column:create_time;type:datetime"`           // 创建时间
-	DelSysUserId       int     `gorm:"column:del_sys_user_id;type:int(11);not null;default:0"`           // 删除人
-	DelSysUserRealName string  `gorm:"column:del_sys_user_real_name;type:varchar(100);not null"`         // 删除人姓名
-	DataUpdateTime     string  `gorm:"column:data_update_time;type:datetime"`                            // 最近一次数据发生变化的时间
-	ErDataUpdateDate   string  `gorm:"column:er_data_update_date;type:date"`                             // 本次更新,数据发生变化的最早日期
-}
-
-type EdbInfoDeleteLogItem struct {
-	Id                 int     `orm:"column(id);"`
-	EdbInfoId          int     `description:"指标ID"`
-	EdbInfoType        int     `description:"指标类型,0:普通指标,1:预测指标"`
-	SourceName         string  `description:"来源名称"`
-	Source             int     `description:"来源id"`
-	EdbCode            string  `description:"指标编码"`
-	EdbName            string  `description:"指标名称"`
-	EdbNameEn          string  `description:"英文指标名称"`
-	EdbNameSource      string  `description:"指标名称来源"`
-	Frequency          string  `description:"频率"`
-	Unit               string  `description:"单位"`
-	StartDate          string  `description:"起始日期"`
-	EndDate            string  `description:"终止日期"`
-	SysUserId          int     `description:"创建人ID"`
-	SysUserRealName    string  `description:"创建人姓名"`
-	EdbCreateTime      string  `description:"指标创建时间"`
-	CreateTime         string  `description:"创建时间即删除时间"`
-	LatestDate         string  `description:"数据最新日期"`
-	LatestValue        float64 `description:"数据最新值"`
-	TerminalCode       string  `description:"终端编码,用于配置在机器上"`
-	DelSysUserId       int     `description:"删除人ID"`
-	DelSysUserRealName string  `description:"删除人姓名"`
-	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   string  `description:"本次更新,数据发生变化的最早日期"`
-}
-
-func AddEdbDeleteLog(item *EdbInfoDeleteLog) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	lastId = int64(item.Id)
-	return
-}
-
-type GetEdbDeleteLogResp struct {
-	List   []*EdbInfoDeleteLogItem
-	Paging *paging.PagingItem
-}
-
-func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoDeleteLog, err error) {
-	sql := ` SELECT * FROM edb_info_delete_log WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	if orderStr != "" {
-		sql += orderStr
-	} else {
-		sql += ` ORDER BY create_time DESC, id DESC `
-	}
-
-	sql += ` LIMIT ?,? `
-
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-// GetEdbDeleteLogCount
-func GetEdbDeleteLogCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT count(*) FROM edb_info_delete_log WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-	return
-}

+ 0 - 70
models/data_stat/edb_info_stat_column.go

@@ -1,70 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/global"
-)
-
-type EdbInfoStatColumn struct {
-	Id           int    `gorm:"primaryKey;column:id;type:int(11) unsigned;not null"` // 自增id
-	ColumnName   string `gorm:"column:column_name;type:varchar(100);not null"`       // 字段名称
-	ColumnKey    string `gorm:"column:column_key;type:varchar(100);not null"`        // 字段
-	CreateTime   string `gorm:"column:create_time;type:datetime"`                    // 创建时间
-	ModifyTime   string `gorm:"column:modify_time;type:datetime"`                    // 修改时间
-	Type         int    `gorm:"column:type;type:tinyint(4);not null;default:0"`      // 列表类型:1数据源明细表,2数据源统计表,3删除指标列表,4指标信息变更表
-	Sort         int    `gorm:"column:sort;type:int(11);not null;default:0"`         // 列排序
-	IsMust       int    `gorm:"column:is_must;type:tinyint(4);not null;default:1"`   // 是否必选列 1必须,0非必选
-	IsSort       int    `gorm:"column:is_sort;type:tinyint(4);not null"`             // 是否是允许排序的列,0否,1是
-	IsShow       int    `gorm:"column:is_show;type:tinyint(4);not null;default:1"`   // 是否展示:1展示,0不展示
-	ColumnNameEn string `gorm:"column:column_name_en;type:varchar(100);not null"`    // 英文字段名称
-}
-
-type EdbInfoStatColumnListItem struct {
-	Id           int    `description:"自增id"`
-	ColumnName   string `description:"字段名称"`
-	ColumnKey    string `description:"字段"`
-	Type         int    `description:"列表类型:1数据源明细表,2数据源统计表,3删除指标列表,4指标信息变更表"`
-	IsMust       int    `description:"是否必选列: 0非必选 1必须"`
-	IsSort       int    `description:"是否是允许排序的列,0否,1是"`
-	IsShow       int    `description:"是否展示:1展示,0不展示"`
-	ColumnNameEn string `description:"英文字段名称"`
-}
-
-type StatColumnList struct {
-	List []*EdbInfoStatColumnListItem
-}
-
-type EditStatColumnReq struct {
-	List []*EdbInfoStatColumnListReq
-}
-type EdbInfoStatColumnListReq struct {
-	Id     int `description:"自增id"`
-	IsShow int `description:"是否展示:1展示,0不展示"`
-}
-
-// GetStatColumn 获取自定义列
-func GetStatColumn(columnType int) (list []EdbInfoStatColumn, err error) {
-	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc, id asc `
-	err = global.DmSQL["data"].Raw(sql, columnType).Find(&list).Error
-	return
-}
-
-// GetAllStatColumn 获取所有自定义列
-func GetAllStatColumn() (list []EdbInfoStatColumn, err error) {
-	sql := `SELECT * FROM edb_info_stat_column ORDER BY sort asc, id asc  `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return
-}
-
-// UpdateStatColumn 批量更新自定义列
-func UpdateStatColumn(list []*EdbInfoStatColumn) (err error) {
-	tx := global.DmSQL["data"].Begin()
-	for _, v := range list {
-		err = tx.Exec("UPDATE edb_info_stat_column SET is_show = ?, sort=? WHERE id = ?", v.IsShow, v.Sort, v.Id).Error
-		if err != nil {
-			tx.Rollback()
-			return
-		}
-	}
-	tx.Commit()
-	return
-}

+ 0 - 105
models/data_stat/edb_info_update_log.go

@@ -1,105 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type EdbInfoUpdateLog struct {
-	Id                     uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
-	EdbInfoId              int       `gorm:"column:edb_info_id;type:int(11);not null"`                      // 指标id
-	SourceName             string    `gorm:"column:source_name;type:varchar(100)"`                          // 来源名称
-	Source                 int       `gorm:"column:source;type:tinyint(4)"`                                 // 来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众,11:有色,12:环比值,13:环差值,14:变频,15:钢联
-	EdbCode                string    `gorm:"column:edb_code;type:varchar(255);not null;default:''"`         // 指标编码
-	EdbName                string    `gorm:"column:edb_name;type:varchar(255);default:''"`                  // 指标名称
-	EdbNameSource          string    `gorm:"column:edb_name_source;type:varchar(255);default:''"`           // 指标名称_来源
-	Frequency              string    `gorm:"column:frequency;type:varchar(20);default:''"`                  // 频度
-	Unit                   string    `gorm:"column:unit;type:varchar(20);default:''"`                       // 单位
-	StartDate              string    `gorm:"column:start_date;type:date"`                                   // 更新开始日期
-	EndDate                string    `gorm:"column:end_date;type:date"`                                     // 更新结束日期
-	SysUserId              int       `gorm:"column:sys_user_id;type:int(11)"`                               // 创建人
-	SysUserRealName        string    `gorm:"column:sys_user_real_name;type:varchar(100)"`                   // 创建人姓名
-	UpdateSysUserId        int       `gorm:"column:update_sys_user_id;type:int(11)"`                        // 变更人
-	UpdateSysUserRealName  string    `gorm:"column:update_sys_user_real_name;type:varchar(100)"`            // 变更人姓名
-	EdbCreateTime          time.Time `gorm:"column:edb_create_time;type:datetime"`                          // 指标创建时间
-	EdbModifyTime          time.Time `gorm:"column:edb_modify_time;type:datetime"`                          // 指标修改时间
-	UniqueCode             string    `gorm:"column:unique_code;type:varchar(50);default:''"`                // 唯一编码
-	LatestDate             string    `gorm:"column:latest_date;type:date"`                                  // 数据最新日期
-	LatestValue            float64   `gorm:"column:latest_value;type:double"`                               // 数据最新值
-	TerminalCode           string    `gorm:"column:terminal_code;type:varchar(255);default:''"`             // 终端编码,用于配置在机器上
-	CreateTime             time.Time `gorm:"index:create_time_idx;column:create_time;type:datetime"`        // 创建时间,即指标刷新/更新操作时间点
-	DataUpdateTime         string    `gorm:"column:data_update_time;type:datetime"`                         // 最近一次数据发生变化的时间
-	ErDataUpdateDate       string    `gorm:"column:er_data_update_date;type:date"`                          // 本次更新,数据发生变化的最早日期
-	UpdateResult           int       `gorm:"column:update_result;type:int(11)"`                             // 本次刷新操作结果:1成功,2失败
-	UpdateFailedReason     string    `gorm:"column:update_failed_reason;type:varchar(255)"`                 // 刷新失败原因
-	DataUpdateResult       int       `gorm:"column:data_update_result;type:int(11);not null;default:0"`     // 数据更新结果:1成功,2失败,
-	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason;type:varchar(255)"`            // 数据未正常更新原因,
-	IsSourceRefresh        int       `gorm:"column:is_source_refresh;type:int(11);not null;default:0"`      // 是否为终端刷新到数据源的刷新操作:0否,1是
-	UpdateType             int       `gorm:"column:update_type;type:tinyint(4);not null;default:0"`         // 变更类型,0:数据明细变更,1:基础信息变更, 2:新增指标
-}
-
-type EdbInfoUpdateLogItem struct {
-	Id                    uint64 `orm:"column(id);pk"`
-	EdbInfoId             int    `description:"指标ID"`
-	SourceName            string `description:"来源名称"`
-	Source                int    `description:"来源id"`
-	EdbCode               string `description:"指标编码"`
-	EdbName               string `description:"指标名称"`
-	EdbNameSource         string `description:"指标名称来源"`
-	Frequency             string `description:"频率"`
-	Unit                  string `description:"单位"`
-	StartDate             string `description:"起始日期"`
-	EndDate               string `description:"终止日期"`
-	SysUserId             int    `description:"创建人ID"`
-	SysUserRealName       string `description:"创建人姓名"`
-	UpdateSysUserId       int    `description:"变更人ID"`
-	UpdateSysUserRealName string `description:"变更人姓名"`
-	CreateTime            string
-	UniqueCode            string  `description:"指标唯一编码"`
-	LatestDate            string  `description:"数据最新日期"`
-	LatestValue           float64 `description:"数据最新值"`
-	TerminalCode          string  `description:"终端编码,用于配置在机器上"`
-	DataUpdateTime        string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate      string  `description:"本次更新,数据发生变化的最早日期"`
-	UpdateType            int     `description:"变更类型,0:数据明细变更,1:基础信息变更, 2:新增指标"`
-}
-
-func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-	lastId = int64(item.Id)
-	return
-}
-
-type GetEdbUpdateLogResp struct {
-	List   []*EdbInfoUpdateLogItem
-	Paging *paging.PagingItem
-}
-
-func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateLog, err error) {
-	sql := ` SELECT * FROM edb_info_update_log WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	if orderStr != "" {
-		sql += orderStr
-	} else {
-		sql += ` ORDER BY create_time DESC, id DESC `
-	}
-
-	sql += ` LIMIT ?,? `
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-// GetEdbUpdateLogCount
-func GetEdbUpdateLogCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT count(*) FROM edb_info_update_log WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-	return
-}

+ 0 - 148
models/data_stat/edb_info_update_stat.go

@@ -1,148 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type EdbInfoUpdateStat struct {
-	Id                     uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
-	EdbInfoId              int       `gorm:"column:edb_info_id;type:int(11);not null"`                      // 指标id
-	SourceName             string    `gorm:"column:source_name;type:varchar(100)"`                          // 来源名称
-	Source                 int       `gorm:"column:source;type:tinyint(4)"`                                 // 来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众,11:有色,12:环比值,13:环差值,14:变频,15:钢联
-	EdbCode                string    `gorm:"column:edb_code;type:varchar(255);not null;default:''"`         // 指标编码
-	EdbName                string    `gorm:"column:edb_name;type:varchar(255);default:''"`                  // 指标名称
-	EdbNameSource          string    `gorm:"column:edb_name_source;type:varchar(255);default:''"`           // 指标名称_来源
-	Frequency              string    `gorm:"column:frequency;type:varchar(20);default:''"`                  // 频度
-	Unit                   string    `gorm:"column:unit;type:varchar(20);default:''"`                       // 单位
-	StartDate              string    `gorm:"column:start_date;type:date"`                                   // 更新开始日期
-	EndDate                string    `gorm:"column:end_date;type:date"`                                     // 更新结束日期
-	SysUserId              int       `gorm:"column:sys_user_id;type:int(11)"`                               // 创建人
-	SysUserRealName        string    `gorm:"column:sys_user_real_name;type:varchar(100)"`                   // 创建人姓名
-	EdbCreateTime          time.Time `gorm:"column:edb_create_time;type:datetime"`                          // 指标创建时间
-	EdbModifyTime          time.Time `gorm:"column:edb_modify_time;type:datetime"`                          // 指标修改时间
-	UniqueCode             string    `gorm:"column:unique_code;type:varchar(50);default:''"`                // 唯一编码
-	LatestDate             string    `gorm:"column:latest_date;type:date"`                                  // 数据最新日期
-	LatestValue            float64   `gorm:"column:latest_value;type:double"`                               // 数据最新值
-	TerminalCode           string    `gorm:"column:terminal_code;type:varchar(255);default:''"`             // 终端编码,用于配置在机器上
-	CreateTime             time.Time `gorm:"index:create_time_idx;column:create_time;type:datetime"`        // 创建时间
-	ModifyTime             time.Time `gorm:"column:modify_time;type:datetime"`                              // 修改时间
-	UpdateTime             string    `gorm:"column:update_time;type:datetime"`                              // 刷新/修改时间
-	DataUpdateTime         string    `gorm:"column:data_update_time;type:datetime"`                         // 当天数据发生变化的时间
-	ErDataUpdateDate       string    `gorm:"column:er_data_update_date;type:date"`                          // 当天数据发生变化的最早日期
-	UpdateResult           int       `gorm:"column:update_result;type:int(11)"`                             // 当天刷新结果:1成功,2失败
-	UpdateFailedReason     string    `gorm:"column:update_failed_reason;type:varchar(255)"`                 // 当天数据未正常刷新原因
-	IsAdd                  int8      `gorm:"column:is_add;type:tinyint(4);not null;default:0"`              // 是否是当日新增的指标:1是,2否
-	NeedRefresh            int8      `gorm:"column:need_refresh;type:tinyint(4);not null;default:0"`        // 今日是否需要刷新,1需要,0不需要
-	HasRefresh             int8      `gorm:"column:has_refresh;type:tinyint(4);not null;default:0"`         // 今日是否已刷新,1是,0否
-	DataUpdateResult       int       `gorm:"column:data_update_result;type:int(11);not null;default:0"`     // 数据更新结果:1成功,2失败,
-	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason;type:varchar(255)"`            // 数据未正常更新原因,
-}
-
-type EdbInfoUpdateStatItem struct {
-	Id                     uint64  `orm:"column(id);pk"`
-	EdbInfoId              int     `description:"指标ID"`
-	SourceName             string  `description:"来源名称"`
-	Source                 int     `description:"来源id"`
-	EdbCode                string  `description:"指标编码"`
-	EdbName                string  `description:"指标名称"`
-	EdbNameSource          string  `description:"指标名称来源"`
-	Frequency              string  `description:"频率"`
-	Unit                   string  `description:"单位"`
-	StartDate              string  `description:"起始日期"`
-	SysUserId              int     `description:"创建人ID"`
-	SysUserRealName        string  `description:"创建人姓名"`
-	LatestDate             string  `description:"数据最新日期"`
-	CreateTime             string  `description:"创建时间"`
-	LatestValue            float64 `description:"数据最新值"`
-	TerminalCode           string  `description:"终端编码,用于配置在机器上"`
-	ErDataUpdateDate       string  `description:"本次更新,数据发生变化的最早日期"`
-	DataUpdateResult       int     `description:"数据更新结果:1成功,2失败"`
-	DataUpdateFailedReason string  `description:"数据未正常更新原因"`
-	DataUpdateTime         string  `description:"数据更新时间"`
-	UpdateResult           int     `description:"本次刷新操作结果:1成功,2失败"`
-	UpdateFailedReason     string  `description:"刷新失败原因"`
-	UpdateTime             string  `description:"刷新时间"`
-	IsAdd                  int8    `description:"是否是当日新增的指标:1是,2否"`
-	NeedRefresh            int8    `description:"今日是否需要定时刷新,1需要,0不需要"`
-	HasRefresh             int8    `description:"今日是否已刷新,1是,0否"`
-}
-
-type EdbInfoUpdateStatItemMore struct {
-	EdbInfoUpdateStatItem
-	InitSourceName string `description:"初始数据源"`
-}
-
-type GetEdbUpdateStatResp struct {
-	List   []*EdbInfoUpdateStatItemMore
-	Paging *paging.PagingItem
-}
-
-func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateStat, err error) {
-	sql := ` SELECT * FROM edb_info_update_stat WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	if orderStr != "" {
-		sql += orderStr
-	} else {
-		sql += ` ORDER BY create_time DESC, id DESC `
-	}
-
-	sql += ` LIMIT ?,? `
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-// GetEdbUpdateStatCount
-func GetEdbUpdateStatCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT count(*) FROM edb_info_update_stat WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-	return
-}
-
-type EdbUpdateFailedList struct {
-	TerminalCode             string `description:"终端编码,用于配置在机器上"`
-	SourceUpdateFailedReason string `description:"从终端刷新到数据源的数据未正常刷新原因"`
-	Frequency                string `description:"频率"`
-	SourceUpdateResult       int    `description:"从终端刷新到数据源的刷新结果:1成功,2失败"`
-	Num                      int
-}
-
-type GetEdbUpdateFailedResp struct {
-	List             []*EdbUpdateFailedList
-	Name             string `description:"终端名称"`
-	TerminalCode     string `description:"终端编码,用于配置在机器上"`
-	DirPath          string `description:"终端存放的文件夹路径"`
-	UpdateSuccessNum int    `description:"今日已更新成功指标数"`
-	UpdateFailedNum  int    `description:"今日已更新失败指标数"`
-}
-
-func GetEdbUpdateStatFailedGroupByCondition(condition string, pars []interface{}) (item []*EdbUpdateFailedList, err error) {
-	sql := `SELECT
-	terminal_code,
-	data_update_result as source_update_result,
-	frequency,
-	data_update_failed_reason as source_update_failed_reason,
-	count(*) as num
-FROM
-	edb_info_update_stat 
-WHERE
-	data_update_result != 0`
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY
-	data_update_result,
-	frequency,
-	data_update_failed_reason
-	ORDER BY count(*) desc`
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
-	return
-}

+ 0 - 74
models/data_stat/edb_source_stat.go

@@ -1,74 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/global"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type EdbSourceStat struct {
-	Id                uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
-	SourceName        string    `gorm:"column:source_name;type:varchar(100)"`                          // 来源名称
-	Source            int       `gorm:"column:source;type:tinyint(4)"`                                 // 来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众,11:有色,12:环比值,13:环差值,14:变频,15:钢联
-	TerminalCode      string    `gorm:"column:terminal_code;type:varchar(255);default:''"`             // 终端编码,用于配置在机器上
-	EdbNum            int32     `gorm:"column:edb_num;type:int(11);not null;default:0"`                // 指标总数
-	EdbNewNum         int32     `gorm:"column:edb_new_num;type:int(11);not null;default:0"`            // 今日新增指标数
-	EdbDelNum         int32     `gorm:"column:edb_del_num;type:int(11);not null;default:0"`            // 今日删除指标数
-	NeedRefreshNum    int       `gorm:"column:need_refresh_num;type:int(11);not null;default:0"`       // 今日需刷新指标
-	HasRefreshNum     int       `gorm:"column:has_refresh_num;type:int(11);not null;default:0"`        // 今日发起刷新任务指标数
-	RefreshSuccessNum int       `gorm:"column:refresh_success_num;type:int(11);not null;default:0"`    // 今日已刷新成功指标数
-	RefreshFailedNum  int       `gorm:"column:refresh_failed_num;type:int(11);not null;default:0"`     // 今日已刷新失败指标数
-	UpdateSuccessNum  int       `gorm:"column:update_success_num;type:int(11);not null;default:0"`     // 今日已更新成功指标数
-	UpdateFailedNum   int       `gorm:"column:update_failed_num;type:int(11);not null;default:0"`      // 今日已更新失败指标数
-	CreateTime        time.Time `gorm:"index:create_time_idx;column:create_time;type:datetime"`        // 创建时间
-	ModifyTime        time.Time `gorm:"column:modify_time;type:datetime"`                              // 修改时间
-}
-
-type EdbInfoSourceStatItem struct {
-	Id                uint64 `orm:"column(id);pk"`
-	SourceName        string `description:"来源名称"`
-	Source            int    `description:"来源id"`
-	TerminalCode      string `description:"终端编码,用于配置在机器上"`
-	EdbNum            int32  `description:"指标总数"`
-	EdbNewNum         int32  `description:"今日新增指标数"`
-	EdbDelNum         int32  `description:"今日删除指标数"`
-	NeedRefreshNum    int    `description:"今日需刷新指标"`
-	HasRefreshNum     int    `description:"今日发起刷新任务指标数"`
-	UpdateSuccessNum  int    `description:"今日已更新成功指标数"`
-	UpdateFailedNum   int    `description:"今日已更新失败指标数"`
-	RefreshSuccessNum int    `description:"今日已刷新成功指标数"`
-	RefreshFailedNum  int    `description:"今日已刷新失败指标数"`
-}
-
-type GetEdbSourceStatResp struct {
-	List   []*EdbInfoSourceStatItem
-	Paging *paging.PagingItem
-}
-
-func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbSourceStat, err error) {
-	sql := ` SELECT * FROM edb_source_stat WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	if orderStr != "" {
-		sql += orderStr
-	} else {
-		sql += ` ORDER BY create_time DESC, id DESC `
-	}
-
-	sql += ` LIMIT ?,? `
-	pars = append(pars, startSize)
-	pars = append(pars, pageSize)
-	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
-	return
-}
-
-// GetEdbSourceStatCount
-func GetEdbSourceStatCount(condition string, pars []interface{}) (count int, err error) {
-	sql := ` SELECT count(*) FROM edb_source_stat WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
-	return
-}

+ 2 - 20
models/db2.go

@@ -11,7 +11,6 @@ import (
 	"eta_gn/eta_api/models/data_manage/excel"
 	future_good2 "eta_gn/eta_api/models/data_manage/future_good"
 	"eta_gn/eta_api/models/data_manage/supply_analysis"
-	"eta_gn/eta_api/models/data_stat"
 	"eta_gn/eta_api/models/fe_calendar"
 	"eta_gn/eta_api/models/report"
 	"eta_gn/eta_api/models/report_approve"
@@ -88,9 +87,6 @@ func init() {
 	// 智能研报
 	initSmartReport()
 
-	// initDataStat 数据源统计管理相关表
-	initDataStat()
-
 	// 初始化EXCEL的表
 	initExcel()
 
@@ -211,12 +207,8 @@ func initEdbData() {
 		new(data_manage.EdbInfoLog),
 		new(data_manage.EdbInfoRecord),
 		new(data_manage.EdbInfoCalculateMapping),
-		new(data_manage.PredictEdbConf),                  //预测指标配置
-		new(data_manage.BaseFromMysteelChemicalClassify), //预测指标配置
-		new(data_manage.BaseFromMysteelChemicalIndex),    //钢联化工
-		new(data_manage.PredictEdbRuleData),              //预测指标,动态规则的计算数据
-		new(data_manage.ComTradeCountry),                 //联合国商品贸易数据库的国家编码表
-		new(data_manage.ComTradeData),                    //联合国商品贸易数据表
+		new(data_manage.PredictEdbConf),     //预测指标配置
+		new(data_manage.PredictEdbRuleData), //预测指标,动态规则的计算数据
 		new(data_manage.TradePositionDalianTop),
 		new(data_manage.TradePositionZhengzhouTop),
 		new(data_manage.TradePositionCffexTop),
@@ -328,16 +320,6 @@ func initOutLink() {
 		new(OutLink)) // 外部链接表
 }
 
-// initDataStat 数据源统计管理相关表
-func initDataStat() {
-	orm.RegisterModel(
-		new(data_stat.EdbInfoDeleteLog),  // 指标删除日志表
-		new(data_stat.EdbInfoUpdateStat), // 指标更新/刷新 汇总表(数据源明细表)
-		new(data_stat.EdbInfoUpdateLog),  // 指标更新/刷新日志列表
-		new(data_stat.EdbSourceStat),     // 数据源统计表
-	)
-}
-
 // initChartFramework 图库框架相关表
 func initChartFramework() {
 	orm.RegisterModel(

+ 0 - 80
models/eta_trial/request.go

@@ -1,80 +0,0 @@
-package eta_trial
-
-import "time"
-
-type QuestionnairePopupResp struct {
-	IsPopup  int `description:"0 弹窗 1不弹"`
-	IsShow   int `description:"0 不显示 1显示"`
-	Question EtaTrialQuestionnaireResp
-}
-
-// EtaTrialQuestionnaireResp 问卷调查列表响应体
-type EtaTrialQuestionnaireResp struct {
-	List []EtaTrialQuestionnaireRespItem
-}
-
-// EtaTrialQuestionnaireRespItem 问卷调查信息
-type EtaTrialQuestionnaireRespItem struct {
-	QuestionnaireId int      `orm:"column(questionnaire_id);pk" description:"问卷题目id"`
-	Question        string   `description:"题目"`
-	Type            int      `description:"1单选 2多选 3简答题"`
-	Sort            int      `description:"排序"`
-	Option          []string `description:"选项"`
-	IsMust          int      `description:"是否必填"`
-	CreateTime      string
-}
-
-type EtaTrialQuestionnaireReq struct {
-	IsFill int `description:"0稍后再填 1已填写"`
-	List   []EtaTrialQuestionnaireReqItem
-}
-
-type EtaTrialQuestionnaireReqItem struct {
-	QuestionnaireId int    `description:"题目id"`
-	Options         string `description:"选项"`
-	Type            int    `description:"1单选 2多选 3简答题"`
-}
-
-// EtaTrialUserItem ETA试用客户
-type EtaTrialUserItem struct {
-	EtaTrialId    int    `description:"eta试用客户id"`
-	UserName      string `description:"客户名称"`
-	CompanyName   string `description:"客户公司姓名"`
-	Position      string `description:"职位"`
-	Password      string
-	Account       string
-	Mobile        string    `description:"手机号"`
-	Enabled       int       `description:"1:有效,0:禁用"`
-	ActiveTime    int       `description:"累计活跃时长"`
-	IndexNum      int       `description:"累计添加指标"`
-	ChartNum      int       `description:"累计添加图表"`
-	LoginNum      int       `description:"累计登录次数"`
-	LastLoginTime time.Time `description:"最后一次登陆时间"`
-	SellerId      int       `description:"销售id"`
-	Seller        string    `description:"销售员名称"`
-	CreateTime    time.Time
-	ModifyTime    time.Time
-}
-
-type EtaTrialQuestionnaireRecord struct {
-	RecordId        int       `description:"记录id" json:"record_id"`
-	UserName        string    `description:"用户名" json:"user_name"`
-	CompanyName     string    `description:"公司名" json:"company_name"`
-	Position        string    `description:"职位" json:"position"`
-	Options         string    `description:"选项" json:"options"`
-	Mobile          string    `description:"手机" json:"mobile"`
-	Type            int       `description:"1单选 2多选 3简答题" json:"type"`
-	QuestionnaireId int       `description:"题目id" json:"questionnaire_id"`
-	CreateTime      time.Time `json:"create_time"`
-}
-
-// UpdateUserActiveTimeReq 更新用户活跃时间请求体
-type UpdateUserActiveTimeReq struct {
-	ActiveTime int    `description:"活跃时长, 单位秒"`
-	Part       string `description:"活跃板块"`
-}
-
-// UpdateUserLoginDurationReq 更新用户登录时长请求体
-type UpdateUserLoginDurationReq struct {
-	ActiveTime int `description:"活跃时长, 单位秒"`
-}

+ 0 - 186
models/target.go

@@ -950,146 +950,6 @@ func GetEdbdataAllByTradeCode(tradeCode string) (items []*EdbdataItem, err error
 	return
 }
 
-func GetEdbdataClassifyByParentId(parentId int) (items []*EdbdataClassify, err error) {
-	sql := ` SELECT * FROM edbdata_classify WHERE parent_id=? `
-	err = global.DmSQL["edb"].Raw(sql, parentId).Find(&items).Error
-	return
-}
-
-type LzPriceClassify struct {
-	ProductName string `gorm:"column:product_name" description:"产品名称"`
-}
-
-func GetLzPriceClassify() (items []*LzPriceClassify, err error) {
-	sql := ` SELECT product_name  FROM longzhongpriceinfo GROUP BY product_name ORDER BY product_name DESC `
-	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
-	return
-}
-
-type Longzhongpriceinfo struct {
-	LongzhongpriceinfoId int    `gorm:"column:longzhongpriceinfo_id"` //`orm:"column(longzhongpriceinfo_id);pk" gorm:"primaryKey" `
-	Standard             string `gorm:"column:standard"`
-	ModelName            string `gorm:"column:model_name"`
-	Unit                 string `gorm:"column:unit"`
-	AreaName             string `gorm:"column:area_name"`
-	PriceType            string `gorm:"column:price_type"`
-	Memo                 string `gorm:"column:memo"`
-	PriceId              string `gorm:"column:price_id"`
-	ProductName          string `gorm:"column:product_name"`
-	InfoType             string `gorm:"column:info_type"`
-	InfoTypeRemark       string `gorm:"column:info_type_remark"`
-	MarketName           string `gorm:"column:market_name"`
-	ManufactureName      string `gorm:"column:manufacture_name"`
-}
-
-func GetLongzhongpriceinfoByClassifyName(productName string) (items []*Longzhongpriceinfo, err error) {
-	sql := `SELECT * FROM longzhongpriceinfo WHERE product_name=? ORDER BY longzhongpriceinfo_id ASC `
-	err = global.DmSQL["edb"].Raw(sql, productName).Find(&items).Error
-	return
-}
-
-func GetLongzhongPriceDataMaxCount(productName string) (count int, err error) {
-	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
-				SELECT COUNT(1) AS num  FROM longzhongpriceinfo AS a
-				INNER JOIN longzhongpricedata AS b ON a.longzhongpriceinfo_id=b.longzhongpriceinfo_id
-				WHERE a.product_name=?
-				GROUP BY a.product_name
-			)AS t `
-	err = global.DmSQL["edb"].Raw(sql, productName).Scan(&count).Error
-	return
-}
-
-type LongzhongpricedataItems struct {
-	LongzhongpricedataId int     `gorm:"column:longzhongpricedata_id"` //`orm:"column(longzhongpricedata_id);pk" gorm:"primaryKey" `
-	LongzhongpriceinfoId int     `gorm:"column:longzhongpriceinfo_id"`
-	PriceDate            string  `gorm:"column:price_date"`
-	Memo                 string  `gorm:"column:memo"`
-	Price                float64 `gorm:"column:price"`
-	CnyPrice             float64 `gorm:"column:cny_price"`
-	ZsyPrice             float64 `gorm:"column:zsy_price"`
-	ZshPrice             float64 `gorm:"column:zsh_price"`
-	LowPrice             float64 `gorm:"column:low_price"`
-	HighPrice            float64 `gorm:"column:high_price"`
-	RisePrice            float64 `gorm:"column:rise_price"`
-	TonPrice             float64 `gorm:"column:ton_price"`
-	PriceType            string  `gorm:"column:price_type"`
-	UpdateDate           string  `gorm:"column:update_date"`
-}
-
-func GetLongzhongPriceDataById(lzPriceInfoId int) (items []*LongzhongpricedataItems, err error) {
-	sql := ` SELECT DISTINCT a.longzhongpriceinfo_id,a.price_date,a.memo,a.price,a.cny_price,a.zsy_price,a.zsh_price,a.low_price,a.high_price,a.rise_price,a.ton_price,a.price_type,a.update_date  
-			 FROM longzhongpricedata AS a
-			 WHERE longzhongpriceinfo_id=? ORDER BY price_date DESC `
-	err = global.DmSQL["edb"].Raw(sql, lzPriceInfoId).Find(&items).Error
-	return
-}
-
-func GetLzSurveyClassify() (items []*LzPriceClassify, err error) {
-	sql := ` SELECT breed_name AS product_name  FROM longzhong_survey_product GROUP BY breed_name ORDER BY breed_name DESC `
-	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
-	return
-}
-
-// LongzhongSurveyProduct 结构体
-type LongzhongSurveyProduct struct {
-	SurveyProductId      int    `gorm:"column:survey_product_id;primaryKey;autoIncrement:true;not null" description:"调查产品ID"`
-	ProjectQuotaId       int64  `gorm:"column:project_quota_id" description:"项目配额ID"`
-	BreedId              string `gorm:"column:breed_id" description:"品种ID"`
-	BreedName            string `gorm:"column:breed_name" description:"品种名称"`
-	QuotaId              string `gorm:"column:quota_id" description:"配额ID"`
-	QuotaName            string `gorm:"column:quota_name" description:"配额名称"`
-	UnitId               string `gorm:"column:unit_id" description:"单位ID"`
-	UnitName             string `gorm:"column:unit_name" description:"单位名称"`
-	SampleType           int64  `gorm:"column:sample_type" description:"样本类型"`
-	SampleId             string `gorm:"column:sample_id" description:"样本ID"`
-	SampleName           string `gorm:"column:sample_name" description:"样本名称"`
-	DeviceId             string `gorm:"column:device_id" description:"设备ID"`
-	Device               string `gorm:"column:device" description:"设备名称"`
-	ProductCraftId       string `gorm:"column:product_craft_id" description:"工艺ID"`
-	ProductCraft         string `gorm:"column:product_craft" description:"工艺名称"`
-	ProductLine          string `gorm:"column:product_line" description:"生产线"`
-	InputMode            int64  `gorm:"column:input_mode" description:"输入模式"`
-	Frequency            int64  `gorm:"column:frequency" description:"频率"`
-	InputValue           string `gorm:"column:input_value" description:"输入值"`
-	TaskShouldFinishTime int    `gorm:"column:task_should_finish_time" description:"任务应完成时间"`
-	CustomId             string `gorm:"column:custom_id" description:"自定义ID"`
-	CustomType           int64  `gorm:"column:custom_type" description:"自定义类型"`
-	Custom               string `gorm:"column:custom" description:"自定义名称"`
-	QuotaSampleId        int64  `gorm:"column:quota_sample_id" description:"配额样本ID"`
-	StartDate            string `gorm:"column:start_date" description:"开始日期"`
-	EndDate              string `gorm:"column:end_date" description:"结束日期"`
-	LzCode               string `gorm:"column:lz_code" description:"龙种代码"`
-}
-
-func GetLongzhongSurveyProductByClassifyName(productName string) (items []*LongzhongSurveyProduct, err error) {
-	sql := `SELECT * FROM longzhong_survey_product WHERE breed_name=? ORDER BY survey_product_id ASC `
-	err = global.DmSQL["edb"].Raw(sql, productName).Find(&items).Error
-	return
-}
-
-func GetLzSurveyProductByNameAndFrequency(productName string, frequency int) (items []*LongzhongSurveyProduct, err error) {
-
-	sql := `SELECT * FROM longzhong_survey_product WHERE breed_name=? AND frequency=? ORDER BY survey_product_id ASC `
-	err = global.DmSQL["edb"].Raw(sql, productName, frequency).Find(&items).Error
-	return
-}
-
-func GetExportLzSurveyProductByBreedIds(breedIds []string) (items []*LongzhongSurveyProduct, err error) {
-	if len(breedIds) == 0 {
-		return
-	}
-	field := ` survey_product_id, breed_id, breed_name, sample_name, custom, quota_name, lz_code, frequency, unit_name, end_date, input_value `
-	sql := `SELECT ` + field + ` FROM longzhong_survey_product WHERE breed_id IN (` + utils.GetOrmInReplace(len(breedIds)) + `) ORDER BY breed_id ASC, frequency ASC, survey_product_id ASC `
-	err = global.DmSQL["edb"].Raw(sql, breedIds).Find(&items).Error
-	return
-}
-
-func GetLzFrequency(productName string) (items []*int, err error) {
-	sql := `SELECT DISTINCT frequency FROM longzhong_survey_product WHERE breed_name=? ORDER BY frequency`
-	err = global.DmSQL["edb"].Raw(sql, productName).Find(&items).Error
-	return
-}
-
 // EdbInfoItem
 type EdbInfoItem struct {
 	TradeCode    string     `gorm:"column:TRADE_CODE;primaryKey;type:varchar(255)" orm:"column(TRADE_CODE);pk" gorm:"primaryKey"  description:"指标code"`
@@ -1321,58 +1181,12 @@ func ModifyEdbinfoUserIdByCodeList(edbCodeList []string, userId int, userName st
 	return
 }
 
-// ModifyEdbinfoUserIdByOldUserId
-// @Description:  根据旧用户id修改新用户id
-// @author: Roc
-// @datetime 2024-03-25 17:59:32
-// @param oldUserId int
-// @param userId int
-// @return err error
-func ModifyEdbinfoUserIdByOldUserId(oldUserIdList []int, userId int) (err error) {
-	num := len(oldUserIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `UPDATE edbinfo SET user_id=? WHERE user_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["edb"].Exec(sql, userId, oldUserIdList).Error
-	return
-}
-
 func GetEdbInfoAdminList() (list []int, err error) {
 	sql := `SELECT user_id FROM edbinfo GROUP BY user_id `
 	err = global.DmSQL["edb"].Raw(sql).Find(&list).Error
 	return
 }
 
-// GetAllChildManualEdbClassify
-// @Description: 获取手工数据中所有的子分类
-// @author: Roc
-// @datetime 2024-07-16 13:27:28
-// @return items []*EdbdataClassify
-// @return err error
-func GetAllChildManualEdbClassify() (items []*EdbdataClassify, err error) {
-	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id > 0 `
-	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
-	return
-}
-
-// GetChildManualEdbClassifyByIdList
-// @Description: 获取手工数据中所有的子分类
-// @author: Roc
-// @datetime 2024-07-16 13:33:57
-// @param idList []int
-// @return items []*EdbdataClassify
-// @return err error
-func GetChildManualEdbClassifyByIdList(idList []int) (items []*EdbdataClassify, err error) {
-	num := len(idList)
-	if num <= 0 {
-		return
-	}
-	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE classify_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = global.DmSQL["edb"].Raw(sql, idList).Find(&items).Error
-	return
-}
-
 // EdbinfoMaxMinDate
 // @Description: 手工指标的最小最大日期
 type EdbinfoMaxMinDate struct {

+ 0 - 549
routers/commentsRouter.go

@@ -3580,87 +3580,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "AddMysteelChemical",
-			Router:           `/mysteel_chemical/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "AddMysteelChemicalClassify",
-			Router:           `/mysteel_chemical/classify/add`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "DeleteMysteelChemicalClassify",
-			Router:           `/mysteel_chemical/classify/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "EditMysteelChemicalClassify",
-			Router:           `/mysteel_chemical/classify/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "MoveMysteelChemicalClassify",
-			Router:           `/mysteel_chemical/classify/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "DeleteMysteelChemical",
-			Router:           `/mysteel_chemical/del`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "EditMysteelChemical",
-			Router:           `/mysteel_chemical/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "MysteelChemicalExport",
-			Router:           `/mysteel_chemical/export/dataList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbClassifyController"],
-		beego.ControllerComments{
-			Method:           "MoveMysteelChemical",
-			Router:           `/mysteel_chemical/move`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbCollectClassifyController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_manage:EdbCollectClassifyController"],
 		beego.ControllerComments{
 			Method:           "Add",
@@ -3778,33 +3697,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:           "ComTradeCountryList",
-			Router:           `/com_trade/country/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:           "ComTradeDataList",
-			Router:           `/com_trade/data/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:           "ComTradeList",
-			Router:           `/com_trade/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:           "EdbChartAdminList",
@@ -4255,222 +4147,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:           "ExportGlList",
-			Router:           `/export/glList`,
-			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:           "ExportLzList",
-			Router:           `/export/lzList`,
-			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:           "ExportLzQuotasData",
-			Router:           `/export/lzQuotasData`,
-			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",
-			Router:           `/gl/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:           "GlData",
-			Router:           `/gl/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:           "GlFrequency",
-			Router:           `/gl/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:           "GlSearchList",
-			Router:           `/gl/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:           "GlSingleData",
-			Router:           `/gl/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:           "LzClassify",
-			Router:           `/lz/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:           "LzData",
-			Router:           `/lz/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:           "LzFrequency",
-			Router:           `/lz/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:           "LzSearchList",
-			Router:           `/lz/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:           "BatchAdd",
-			Router:           `/mysteel_chemical/batch_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:           "MysteelChemicalBatchSearch",
-			Router:           `/mysteel_chemical/batch_search`,
-			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:           "MysteelChemicalClassify",
-			Router:           `/mysteel_chemical/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:           "MysteelChemicalData",
-			Router:           `/mysteel_chemical/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:           "MysteelChemicalDetail",
-			Router:           `/mysteel_chemical/detail`,
-			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:           "Add",
-			Router:           `/mysteel_chemical/edb_info/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:           "AddCheck",
-			Router:           `/mysteel_chemical/edb_info/add_check`,
-			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:           "MysteelChemicalFrequency",
-			Router:           `/mysteel_chemical/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:           "MysteelChemicalIndexList",
-			Router:           `/mysteel_chemical/index/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:           "NameCheck",
-			Router:           `/mysteel_chemical/name_check`,
-			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:           "MysteelChemicalRefresh",
-			Router:           `/mysteel_chemical/refresh`,
-			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:           "MysteelChemicalSearch",
-			Router:           `/mysteel_chemical/search`,
-			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:           "WindClassify",
@@ -5182,186 +4858,6 @@ func init() {
 			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",
-			Router:           `/gfex/classify/list`,
-			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:           "GfexContract",
-			Router:           `/gfex/contract`,
-			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:           "GfexIndexDetail",
-			Router:           `/gfex/index/detail`,
-			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:           "ExportGfexIndexDetail",
-			Router:           `/gfex/index/detail/export`,
-			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:           "GfexIndexData",
-			Router:           `/gfex/index_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:           "GfexMaxDate",
-			Router:           `/gfex/max/date`,
-			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:           "IcpiClassifyList",
-			Router:           `/icpi/classify/list`,
-			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:           "ExportIcpiDataList",
-			Router:           `/icpi/export/icpiDataList`,
-			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:           "IcpiData",
-			Router:           `/icpi/index/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:           "Sci99ClassifyList",
-			Router:           `/sci99/classify/list`,
-			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:           "ExportSci99DataList",
-			Router:           `/sci99/export/sci99DataList`,
-			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:           "Sci99Data",
-			Router:           `/sci99/index/data`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbDeleteLog",
-			Router:           `/edb_delete_log`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbUpdateLog",
-			Router:           `/edb_update_log`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbUpdateStat",
-			Router:           `/edb_update_stat`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbUpdateFailedList",
-			Router:           `/edb_update_stat/failed`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbUpdateFailedDetailList",
-			Router:           `/edb_update_stat/failed/detail`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "Column",
-			Router:           `/source_column`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EditColumn",
-			Router:           `/source_column/edit`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbSourceStatController"],
-		beego.ControllerComments{
-			Method:           "EdbSourceStat",
-			Router:           `/source_stat`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbTerminalController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/data_stat:EdbTerminalController"],
 		beego.ControllerComments{
 			Method:           "TerminalCodeList",
@@ -9295,33 +8791,6 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"],
-		beego.ControllerComments{
-			Method:           "ExportLongzhong",
-			Router:           `/export/longzhong`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"],
-		beego.ControllerComments{
-			Method:           "ExportLongzhongPrice",
-			Router:           `/export/longzhong/price`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
-	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"],
-		beego.ControllerComments{
-			Method:           "ExportLongzhongSurvey",
-			Router:           `/export/longzhong/survey`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
-
 	beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:TargetCommonController"],
 		beego.ControllerComments{
 			Method:           "EdbTemplateDownload",
@@ -9628,15 +9097,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:           "CoalSearchList",
-			Router:           `/data/coalMineData/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:           "CoalSingleData",
@@ -9781,15 +9241,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:           "ExportCoalList",
-			Router:           `/export/coalList`,
-			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 - 7
routers/router.go

@@ -21,7 +21,6 @@ import (
 	"eta_gn/eta_api/controllers/data_manage/line_feature"
 	"eta_gn/eta_api/controllers/data_manage/range_analysis"
 	"eta_gn/eta_api/controllers/data_manage/supply_analysis"
-	"eta_gn/eta_api/controllers/data_source"
 	"eta_gn/eta_api/controllers/data_stat"
 	"eta_gn/eta_api/controllers/english_report"
 	"eta_gn/eta_api/controllers/eta_trial"
@@ -302,7 +301,6 @@ func init() {
 		),
 		web.NSNamespace("/data_stat/",
 			web.NSInclude(
-				&data_stat.EdbSourceStatController{},
 				&data_stat.EdbTerminalController{},
 			),
 		),
@@ -343,11 +341,6 @@ func init() {
 				&biapprove.BiApproveController{},
 			),
 		),
-		web.NSNamespace("/data_source",
-			web.NSInclude(
-				&data_source.DataSourceController{},
-			),
-		),
 		web.NSNamespace("/permission",
 			web.NSInclude(
 				&controllers.ChartPermissionController{},

+ 0 - 167
services/data/data_manage_permission/data_move.go

@@ -50,52 +50,6 @@ func GetEdbChartClassifyList(source, subSource int) (resp data_manage.EdbChartCl
 			resp.List = append(resp.List, &item)
 		}
 
-	case 2: //钢联化工数据库
-		rootList, e := data_manage.GetBaseFromMysteelChemicalClassifyByParentId(0)
-		if e != nil && !utils.IsErrNoRow(e) {
-			err = e
-			return
-		}
-
-		classifyAll, e := data_manage.GetAllBaseFromMysteelChemicalClassify()
-		if e != nil && !utils.IsErrNoRow(e) {
-			err = e
-			return
-		}
-
-		rootChildMap := make(map[int][]*data_manage.BaseFromMysteelChemicalClassifyItems)
-		for _, v := range classifyAll {
-			rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		}
-		nodeAll := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-
-		for _, v := range rootList {
-			if existItems, ok := rootChildMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-				v.Children = existItems
-			} else {
-				items := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-				v.Children = items
-			}
-			nodeAll = append(nodeAll, v)
-		}
-
-		for _, v := range nodeAll {
-			item := data_manage.EdbChartClassify{
-				ClassifyId:   v.BaseFromMysteelChemicalClassifyId,
-				ClassifyName: v.ClassifyName,
-				ParentId:     v.ParentId,
-			}
-			for _, v2 := range v.Children {
-				child := data_manage.EdbChartClassify{
-					ClassifyId:   v2.BaseFromMysteelChemicalClassifyId,
-					ClassifyName: v2.ClassifyName,
-					ParentId:     v2.ParentId,
-				}
-				item.Child = append(item.Child, &child)
-			}
-			resp.List = append(resp.List, &item)
-		}
-
 	case 3, 7:
 		// 这里拆分指标库和计算指标
 		classifyType := utils.EdbClassifyTypeBase
@@ -258,42 +212,6 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
 				})
 			}
 		}
-
-	case 2: //钢联化工数据库
-		if keyword != `` {
-			condition += " AND (index_name like ? OR index_code like ? OR sys_user_real_name like ? ) "
-			pars = utils.GetLikeKeywordPars(pars, keyword, 3)
-		}
-		if userId > 0 {
-			condition += ` AND sys_user_id = ? `
-			pars = append(pars, userId)
-		}
-
-		if classify != "" {
-			condition += ` AND base_from_mysteel_chemical_classify_id IN (` + classify + `) `
-		}
-
-		total, err = data_manage.GetMysteelChemicalIndexCount(condition, pars)
-		if err != nil {
-			return
-		}
-		tmpList, tmpErr := data_manage.GetMysteelChemicalIndexList(condition, pars, startSize, pageSize, "DESC")
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		for _, v := range tmpList {
-			list = append(list, data_manage.MoveEdbChartList{
-				DataId: strconv.Itoa(v.BaseFromMysteelChemicalIndexId),
-				Code:   v.IndexCode,
-				Name:   v.IndexName,
-				NameEn: v.IndexName,
-				//ClassifyName: v.,
-				CreateUserId:   v.SysUserId,
-				CreateUserName: v.SysUserRealName,
-			})
-		}
 	case 3, 4, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标、指标加工
 		if keyword != `` {
 			condition += " AND (edb_code like ? OR edb_name like ? OR edb_name_en like ? OR sys_user_real_name like ? ) "
@@ -567,41 +485,6 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 				go afterMoveManualEdb(tmpList, adminInfo, opUserId, opUserName)
 			}
 		}
-
-	case 2: //钢联化工数据库
-		content += `(钢联化工数据库)`
-		tmpList, tmpErr := data_manage.GetMysteelChemicalIndexListByIndexId(dataId)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		if len(tmpList) > 0 {
-			for _, v := range tmpList {
-				//if v.SysUserId == newUserId {
-				//	errMsg = "新创建人不可和原创建人一致"
-				//	err = errors.New(errMsg)
-				//	return
-				//}
-				// 操作记录
-				dataPermissionMoveRecordList = append(dataPermissionMoveRecordList, &data_manage_permission.DataPermissionMoveRecord{
-					DataPermissionMoveRecordId: 0,
-					Source:                     int32(source),
-					SubSource:                  int32(subSource),
-					OpUniqueCode:               uniqueCode,
-					DataId:                     fmt.Sprint(v.BaseFromMysteelChemicalIndexId),
-					DataCode:                   v.IndexCode,
-					DataName:                   v.IndexName,
-					OriginalUserId:             int32(v.SysUserId),
-					OriginalUserName:           v.SysUserRealName,
-					NewUserId:                  int32(adminInfo.AdminId),
-					NewUserName:                adminInfo.RealName,
-					CreateTime:                 time.Now(),
-				})
-			}
-			// 修改创建人
-			err = data_manage.ModifyMysteelChemicalIndexUserIdByCodeList(dataId, adminInfo.AdminId, adminInfo.RealName)
-		}
-
 	case 3, 4, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
 		if source == 3 {
 			content += `(数据查看)`
@@ -836,39 +719,6 @@ func MoveAllEdbChart(sourceList, oldUserIdList []int, userId, opUserId int) (err
 				isMoveManual = true
 			}
 
-		case 2: //钢联化工数据库
-			sourceStrList = append(sourceStrList, "钢联化工数据库")
-			tmpList, tmpErr := data_manage.GetMysteelChemicalIndexListByUserId(oldUserIdList)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			if len(tmpList) > 0 {
-				for _, v := range tmpList {
-					//if v.SysUserId == newUserId {
-					//	errMsg = "新创建人不可和原创建人一致"
-					//	err = errors.New(errMsg)
-					//	return
-					//}
-					// 操作记录
-					dataPermissionMoveRecordList = append(dataPermissionMoveRecordList, &data_manage_permission.DataPermissionMoveRecord{
-						DataPermissionMoveRecordId: 0,
-						Source:                     int32(source),
-						SubSource:                  0,
-						OpUniqueCode:               uniqueCode,
-						DataId:                     fmt.Sprint(v.BaseFromMysteelChemicalIndexId),
-						DataCode:                   v.IndexCode,
-						DataName:                   v.IndexName,
-						OriginalUserId:             int32(v.SysUserId),
-						OriginalUserName:           v.SysUserRealName,
-						NewUserId:                  int32(adminInfo.AdminId),
-						NewUserName:                adminInfo.RealName,
-						CreateTime:                 time.Now(),
-					})
-				}
-				isMoveMysteelChemical = true
-			}
-
 		case 3: //ETA指标库
 			sourceStrList = append(sourceStrList, "ETA指标库")
 			edbInfoType := 0
@@ -1066,23 +916,6 @@ func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err err
 		sourceMap[1] = total
 	}
 
-	{
-		// 钢联化工数据库
-		var condition string
-		var pars []interface{}
-		if userId > 0 {
-			condition += ` AND sys_user_id = ? `
-			pars = append(pars, userId)
-		}
-
-		total, tmpErr := data_manage.GetMysteelChemicalIndexCount(condition, pars)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		sourceMap[2] = total
-	}
-
 	{
 		// 基础指标
 		var condition string

+ 0 - 3
services/data/edb_classify.go

@@ -8,7 +8,6 @@ import (
 	"eta_gn/eta_api/models/data_manage/excel"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data/data_manage_permission"
-	"eta_gn/eta_api/services/data_stat"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strconv"
@@ -875,8 +874,6 @@ func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, reque
 			}
 		}
 
-		go data_stat.AddEdbDeleteLog(edbInfo, sysUser)
-
 		// 删除指标后的操作
 		go handleByDelEdbInfo(edbInfo)
 

+ 0 - 14
services/data/edb_info.go

@@ -1692,12 +1692,6 @@ func GetEdbChartAdminList(source int) (list []int, err error) {
 			return
 		}
 
-	case 2: //钢联化工数据库
-		list, err = data_manage.GetMysteelChemicalIndexAdminList()
-		if err != nil {
-			return
-		}
-
 	case 3: //ETA指标库
 		list, err = data_manage.GetEdbInfoAdminList(0)
 		if err != nil {
@@ -2068,14 +2062,6 @@ func handleByDelEdbInfo(edbInfo *data_manage.EdbInfo) {
 // @param edbCode string
 // @return isSupplierStop int
 func GetIsSupplierStop(source int, edbCode string) (isSupplierStop int) {
-	switch source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
-		item, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(edbCode)
-		if err != nil {
-			return
-		}
-		isSupplierStop = item.IsSupplierStop
-	}
 
 	return
 }

+ 1 - 52
services/data/edb_info_refresh.go

@@ -423,59 +423,8 @@ func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequen
 		isStop = 0
 	}
 
-	fmt.Println(source, subSource, classifyId, terminalCode, sysUserId, frequency, keyword, status, startSize, pageSize, sortParam, sortType)
+	//fmt.Println(source, subSource, classifyId, terminalCode, sysUserId, frequency, keyword, status, startSize, pageSize, sortParam, sortType)
 	switch source {
-	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
-		if classifyId != `` {
-			classifyIdSlice := strings.Split(classifyId, ",")
-			condition += ` AND base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(len(classifyIdSlice)) + `)`
-			pars = append(pars, classifyIdSlice)
-		}
-		if terminalCode != `` {
-			condition += " AND terminal_code = ? "
-			pars = append(pars, terminalCode)
-		}
-		if sysUserId != `` {
-			sysUserIdSlice := strings.Split(sysUserId, ",")
-			condition += ` AND sys_user_id IN (` + utils.GetOrmInReplace(len(sysUserIdSlice)) + `)`
-			pars = append(pars, sysUserIdSlice)
-		}
-		if frequency != `` {
-			frequencySlice := strings.Split(frequency, ",")
-			condition += ` AND frequency IN (` + utils.GetOrmInReplace(len(frequencySlice)) + `)`
-			pars = append(pars, frequencySlice)
-		}
-		if keyword != `` {
-			keywordSlice := strings.Split(keyword, " ")
-			if len(keywordSlice) > 0 {
-				tmpConditionSlice := make([]string, 0)
-				tmpConditionSlice = append(tmpConditionSlice, ` index_name like ? or index_code like ? `)
-				pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-
-				for _, v := range keywordSlice {
-					if v == ` ` || v == `` {
-						continue
-					}
-					tmpConditionSlice = append(tmpConditionSlice, ` index_name like ? or index_code like ? `)
-					pars = utils.GetLikeKeywordPars(pars, v, 2)
-				}
-				condition += ` AND (` + strings.Join(tmpConditionSlice, " or ") + `)`
-
-			} else {
-				condition += ` index_name like ? or index_code like ? `
-				pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-			}
-		}
-
-		if isStop >= 0 {
-			condition += " AND is_stop = ? "
-			pars = append(pars, isStop)
-		}
-		sortStr := ``
-		if sortParam != `` {
-			sortStr = fmt.Sprintf("%s %s,base_from_mysteel_chemical_index_id desc ", sortParam, sortType)
-		}
-		total, list, err = data_manage.GetMysteelChemicalBaseInfoList(condition, pars, sortStr, startSize, pageSize)
 	default:
 		fmt.Println("line 530")
 		condition += ` AND source = ? AND sub_source = ? `

+ 0 - 862
services/data/mysteel_chemical.go

@@ -1,862 +0,0 @@
-package data
-
-import (
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/rdlucklib/rdluck_tools/http"
-)
-
-// AddMysteelChemicalClassify 添加钢联化工分类
-func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId int, sysUserName, lange string) (classifyInfo *data_manage.BaseFromMysteelChemicalClassify, err error, errMsg string) {
-	// 校验分类名称相同的数量
-	{
-		var count int
-		switch lange {
-		case utils.EnLangVersion:
-			count, err = data_manage.GetBaseFromMysteelChemicalClassifyEnCount(classifyName, parentId)
-		default:
-			count, err = data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, parentId)
-		}
-		if err != nil {
-			errMsg = `判断名称是否已存在失败`
-			return
-		}
-		if count > 0 {
-			errMsg = `分类名称:` + classifyName + ` 已存在,请重新输入`
-			err = errors.New(errMsg)
-			return
-		}
-	}
-	//获取该层级下最大的排序数
-	maxSort, err := data_manage.GetBaseFromMysteelChemicalClassifyMaxSort(parentId)
-
-	classifyInfo = &data_manage.BaseFromMysteelChemicalClassify{
-		//BaseFromMysteelChemicalClassifyId: 0,
-		ClassifyName:    classifyName,
-		ClassifyNameEn:  classifyName,
-		ParentId:        parentId,
-		SysUserId:       sysUserId,
-		SysUserRealName: sysUserName,
-		Sort:            maxSort + 1,
-		Level:           level + 1,
-		ModifyTime:      time.Now(),
-		CreateTime:      time.Now(),
-	}
-	classifyId, err := data_manage.AddBaseFromMysteelChemicalClassify(classifyInfo)
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-	classifyInfo.BaseFromMysteelChemicalClassifyId = int(classifyId)
-	return
-}
-
-// EditMysteelChemicalClassify 编辑钢联化工分类
-func EditMysteelChemicalClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
-	item, err := data_manage.GetBaseFromMysteelChemicalClassifyById(classifyId)
-	if err != nil {
-		errMsg = `保存失败`
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, item.SysUserId)
-	if !button.OpButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	switch lang {
-	case utils.EnLangVersion:
-		// 名字相同,那么就直接返回
-		if item.ClassifyNameEn == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyEnCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromMysteelChemicalClassifyEn(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	default:
-		// 名字相同,那么就直接返回
-		if item.ClassifyName == classifyName {
-			return
-		}
-
-		// 判断名称是否已存在
-		count, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, item.ParentId)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = "判断名称是否已存在失败"
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在,请重新输入"
-			err = errors.New(errMsg)
-			return
-		}
-
-		// 修改数据
-		err = data_manage.EditBaseFromMysteelChemicalClassify(classifyId, classifyName)
-		if err != nil {
-			errMsg = "保存失败"
-		}
-	}
-
-	return
-}
-
-// MoveMysteelChemicalClassify 移动钢联化工分类
-func MoveMysteelChemicalClassify(classifyId, parentClassifyId, prevClassifyId, nextClassifyId int, sysUser *system.Admin) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromMysteelChemicalClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, classifyInfo.SysUserId)
-	if !button.MoveButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	updateCol := make([]string, 0)
-
-	//判断上级id是否一致,如果不一致的话,那么需要移动该分类层级
-	if classifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
-		parentClassifyInfo, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyById(parentClassifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上级分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		classifyInfo.ParentId = parentClassifyInfo.BaseFromMysteelChemicalClassifyId
-		classifyInfo.Level = parentClassifyInfo.Level + 1
-		classifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
-	}
-
-	//如果有传入 上一个兄弟节点分类id
-	if prevClassifyId > 0 {
-		prevClassify, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyById(prevClassifyId)
-		if tmpErr != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-
-		//如果是移动在两个兄弟节点之间
-		if nextClassifyId > 0 {
-			//下一个兄弟节点
-			nextClassify, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyById(nextClassifyId)
-			if tmpErr != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + tmpErr.Error())
-				return
-			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的,那么需要将下一个兄弟(以及下个兄弟的同样排序权重)的排序权重+2,自己变成上一个兄弟的排序权重+1
-			if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == classifyInfo.Sort {
-				//变更兄弟节点的排序
-				updateSortStr := `sort + 2`
-				_ = data_manage.UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentClassifyId, prevClassify.BaseFromMysteelChemicalClassifyId, prevClassify.Sort, updateSortStr)
-			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层,那么需要再加一层了
-				if nextClassify.Sort-prevClassify.Sort == 1 {
-					//变更兄弟节点的排序
-					updateSortStr := `sort + 1`
-					_ = data_manage.UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentClassifyId, 0, prevClassify.Sort, updateSortStr)
-				}
-			}
-		}
-
-		classifyInfo.Sort = prevClassify.Sort + 1
-		classifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-	} else {
-		firstClassify, tmpErr := data_manage.GetFirstBaseFromMysteelChemicalClassify()
-		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
-			errMsg = "移动失败"
-			err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-
-		//如果该分类下存在其他分类,且第一个其他分类的排序等于0,那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
-			updateSortStr := ` sort + 1 `
-			_ = data_manage.UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentClassifyId, firstClassify.BaseFromMysteelChemicalClassifyId-1, 0, updateSortStr)
-		}
-
-		classifyInfo.Sort = 0 //那就是排在第一位
-		classifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-	}
-
-	//更新
-	if len(updateCol) > 0 {
-		err = classifyInfo.Update(updateCol)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("修改失败,Err:" + err.Error())
-			return
-		}
-	}
-	return
-}
-
-// DelMysteelChemicalClassify 删除钢联化工分类
-func DelMysteelChemicalClassify(classifyId int, sysUser *system.Admin) (err error, errMsg string) {
-	//判断分类是否存在
-	classifyInfo, err := data_manage.GetBaseFromMysteelChemicalClassifyById(classifyId)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, classifyInfo.SysUserId)
-	if !button.DeleteButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	// 需要删除的分类id集合
-	classifyIdList := make([]int, 0)
-	classifyIdList = append(classifyIdList, classifyId)
-	mysteelChemicalIndexIdList := make([]int, 0)
-	indexCodeList := make([]string, 0)
-	// 查找所有的子集id
-	if classifyInfo.ParentId <= 0 {
-		childrenClassifyInfoList, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyByParentId(classifyId)
-		if tmpErr != nil {
-			errMsg = "删除失败"
-			err = errors.New("获取分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-		for _, v := range childrenClassifyInfoList {
-			classifyIdList = append(classifyIdList, v.BaseFromMysteelChemicalClassifyId)
-		}
-
-	}
-
-	// 获取分类下的所有指标
-	baseFromMysteelChemicalIndexList, err := data_manage.GetBaseFromMysteelChemicalIndexListByClassifyIdList(classifyIdList)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-
-	for _, v := range baseFromMysteelChemicalIndexList {
-		mysteelChemicalIndexIdList = append(mysteelChemicalIndexIdList, v.BaseFromMysteelChemicalIndexId)
-		indexCodeList = append(indexCodeList, v.IndexCode)
-	}
-
-	// 获取已经加入到EDB指标库的钢联化工指标
-	edbInfoList, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, indexCodeList)
-	if err != nil {
-		errMsg = "删除失败"
-		err = errors.New("获取分类下的指标信息失败,Err:" + err.Error())
-		return
-	}
-	if len(edbInfoList) > 0 {
-		errMsg = "该分类下存在指标加入到ETA图库,无法删除"
-		return
-	}
-
-	// 删除对应的分类和指标
-	err = data_manage.DeleteMysteelChemicalByClassifyId(classifyIdList, mysteelChemicalIndexIdList)
-	if err != nil {
-		return
-	}
-
-	// 删除指标服务的excel表
-	go func(list []*data_manage.BaseFromMysteelChemicalIndex) {
-		for _, v := range list {
-			CurlDelMysteelChemicalData(v.IndexCode, v.UpdateWeek)
-		}
-	}(baseFromMysteelChemicalIndexList)
-	return
-}
-
-// BatchAddMysteelChemicalIndex 批量添加钢联化工指标
-func BatchAddMysteelChemicalIndex(items []*data_manage.BaseFromMysteelChemicalIndex, lang string) (baseFromMysteelChemicalIndexs []*data_manage.BaseFromMysteelChemicalIndex, err error, errMsg string) {
-	indexCodeList := make([]string, 0)
-	for _, v := range items {
-		indexCodeList = append(indexCodeList, v.IndexCode)
-	}
-
-	baseFromMysteelChemicalIndexs, err = data_manage.GetBaseFromMysteelChemicalIndexByCodeList(indexCodeList)
-	if err != nil && !utils.IsErrNoRow(err) {
-		errMsg = `获取数据失败`
-		return
-	}
-	err = nil
-	// 过滤已存在的指标
-	filterMap := make(map[string]struct{})
-	if len(baseFromMysteelChemicalIndexs) > 0 {
-		existIndexCodeList := make([]string, 0)
-		for _, v := range baseFromMysteelChemicalIndexs {
-			existIndexCodeList = append(existIndexCodeList, v.IndexCode)
-			filterMap[v.IndexCode] = struct{}{}
-		}
-		if lang == utils.EnLangVersion {
-			errMsg = fmt.Sprintf(`Metric ID: %s already exists, please re-enter.`, strings.Join(existIndexCodeList, ","))
-		} else {
-			errMsg = fmt.Sprintf(`指标ID: %s 已存在,请重新输入`, strings.Join(existIndexCodeList, ","))
-		}
-		return
-	}
-
-	terminal := getEdbTerminal(utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-	addItems := make([]*data_manage.BaseFromMysteelChemicalIndex, 0)
-	preAddIndexCodeItems := make([]string, 0)
-	for _, v := range items {
-		if _, ok := filterMap[v.IndexCode]; ok {
-			continue
-		}
-		v.TerminalCode = terminal.TerminalCode
-		addItems = append(addItems, v)
-		preAddIndexCodeItems = append(preAddIndexCodeItems, v.IndexCode)
-	}
-
-	_, err = data_manage.BatchAddBaseFromMysteelChemicalIndex(addItems)
-	if err != nil {
-		errMsg = "保存分类失败"
-		return
-	}
-	baseFromMysteelChemicalIndexs, err = data_manage.GetBaseFromMysteelChemicalIndexByCodeList(preAddIndexCodeItems)
-	if err != nil {
-		errMsg = "获取数据失败"
-		return
-	}
-	return
-}
-
-type HandleMysteelChemicalIndexReq struct {
-	List []*data_manage.BaseFromMysteelChemicalIndex
-}
-
-func BatchAddMysteelChemicalData(items []*data_manage.BaseFromMysteelChemicalIndex, lang string) (resp *models.BaseResponse, err error) {
-	url := utils.EDB_LIB_URL + "mysteel_chemical/handle/api/mysteel/index"
-
-	req := new(HandleMysteelChemicalIndexReq)
-	req.List = items
-	postData, err := json.Marshal(req)
-	if err != nil {
-		return
-	}
-	body, err := HttpPost(url, string(postData), lang)
-	if err != nil {
-		return
-	}
-	if err = json.Unmarshal(body, &resp); err != nil {
-		return
-	}
-	return
-}
-
-type MysteelChemicalIndexSource2EdbReq struct {
-	EdbCode       string
-	EdbName       string
-	Frequency     string
-	Unit          string
-	ClassifyId    int
-	AdminId       int
-	AdminRealName string
-}
-
-// MysteelChemicalIndexSource2Edb 新增钢联化工数据源到指标库
-func MysteelChemicalIndexSource2Edb(req MysteelChemicalIndexSource2EdbReq, 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("MysteelChemicalIndexSource2Edb新增失败, Err: %s", err.Error())
-			fmt.Println(tips)
-			utils.FileLog.Info(tips)
-		}
-	}()
-	source := utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-
-	// 是否新增过指标
-	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
-}
-
-// AddMysteelChemicalIndex 添加钢联化工指标
-func AddMysteelChemicalIndex(classifyId int, indexCode, updateWeek, updateTimeStr string, sysUserId int, sysUserName, lang string) (baseFromMysteelChemicalIndex *data_manage.BaseFromMysteelChemicalIndex, err error, errMsg string) {
-	baseFromMysteelChemicalIndex, err = data_manage.GetBaseFromMysteelChemicalIndexByCode(indexCode)
-	if err != nil && !utils.IsErrNoRow(err) {
-		errMsg = `获取数据失败`
-		return
-	}
-	if baseFromMysteelChemicalIndex != nil {
-		if lang == utils.EnLangVersion {
-			errMsg = `Metric ID:` + indexCode + ` already exists, please re-enter.`
-		} else {
-			errMsg = `指标ID:` + indexCode + ` 已存在,请重新输入`
-		}
-		return
-	}
-	// 更新时间切割
-	var updateTime1, updateTime2 string
-	if updateTimeStr != `` {
-		updateTimeList := strings.Split(updateTimeStr, ",")
-		updateTime1 = updateTimeList[0]
-		if len(updateTimeList) > 1 {
-			updateTime2 = updateTimeList[1]
-		}
-	}
-
-	edbTerminal := getEdbTerminal(utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
-	if edbTerminal == nil {
-		errMsg = `钢联终端信息未配置`
-		err = errors.New(errMsg)
-		return
-	}
-
-	baseFromMysteelChemicalIndex = &data_manage.BaseFromMysteelChemicalIndex{
-		//BaseFromMysteelChemicalIndexId:    0,
-		BaseFromMysteelChemicalClassifyId: classifyId,
-		IndexCode:                         indexCode,
-		IndexName:                         "",
-		Unit:                              "",
-		Source:                            "",
-		Frequency:                         "",
-		StartDate:                         "",
-		EndDate:                           "",
-		Describe:                          "",
-		UpdateWeek:                        updateWeek,
-		UpdateTime:                        updateTime1,
-		UpdateTime2:                       updateTime2,
-		SysUserId:                         sysUserId,
-		SysUserRealName:                   sysUserName,
-		ModifyTime:                        time.Now(),
-		CreateTime:                        time.Now(),
-		TerminalCode:                      edbTerminal.TerminalCode, // 终端编码
-	}
-	_, err = data_manage.AddBaseFromMysteelChemicalIndex(baseFromMysteelChemicalIndex)
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-
-	return
-}
-
-// EditMysteelChemicalIndex 编辑钢联化工指标
-func EditMysteelChemicalIndex(indexId, classifyId int, updateWeek, updateTimeStr string, sysUser *system.Admin) (baseFromMysteelChemicalIndex *data_manage.BaseFromMysteelChemicalIndex, err error, errMsg string) {
-	baseFromMysteelChemicalIndex, err = data_manage.GetBaseFromMysteelChemicalIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, baseFromMysteelChemicalIndex.SysUserId)
-	if !button.OpButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	oldUpdateWeek := baseFromMysteelChemicalIndex.UpdateWeek
-
-	// 更新时间切割
-	var updateTime1, updateTime2 string
-	if updateTimeStr != `` {
-		updateTimeList := strings.Split(updateTimeStr, ",")
-		updateTime1 = updateTimeList[0]
-		if len(updateTimeList) > 1 {
-			updateTime2 = updateTimeList[1]
-		}
-	}
-
-	baseFromMysteelChemicalIndex.BaseFromMysteelChemicalClassifyId = classifyId
-	baseFromMysteelChemicalIndex.UpdateWeek = updateWeek
-	baseFromMysteelChemicalIndex.UpdateTime = updateTime1
-	baseFromMysteelChemicalIndex.UpdateTime2 = updateTime2
-	baseFromMysteelChemicalIndex.ModifyTime = time.Now()
-	err = baseFromMysteelChemicalIndex.Update([]string{"BaseFromMysteelChemicalClassifyId", "UpdateWeek", "UpdateTime", "UpdateTime2", "ModifyTime"})
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-
-	go func(oldUpdateWeek string, indexInfo *data_manage.BaseFromMysteelChemicalIndex) {
-		// 先删除excel表
-		CurlDelMysteelChemicalData(indexInfo.IndexCode, oldUpdateWeek)
-	}(oldUpdateWeek, baseFromMysteelChemicalIndex)
-
-	return
-}
-
-// DelMysteelChemical 删除钢联化工指标
-func DelMysteelChemical(indexId int, sysUser *system.Admin) (err error, errMsg string) {
-	baseFromMysteelChemicalIndex, err := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, baseFromMysteelChemicalIndex.SysUserId)
-	if !button.DeleteButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	// 获取已经加入到EDB指标库的钢联化工指标
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, baseFromMysteelChemicalIndex.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.DeleteMysteelChemical(indexId)
-	if err != nil {
-		return
-	}
-
-	// 删除指标服务的excel表
-	go CurlDelMysteelChemicalData(baseFromMysteelChemicalIndex.IndexCode, baseFromMysteelChemicalIndex.UpdateWeek)
-	return
-}
-
-// MoveMysteelChemical 移动钢联化工指标
-func MoveMysteelChemical(indexId, classifyId, prevIndexId, nextIndexId int, sysUser *system.Admin) (err error, errMsg string) {
-	//分类信息
-	baseFromMysteelChemicalIndex, err := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(indexId)
-	if err != nil {
-		errMsg = `获取数据失败`
-		if utils.IsErrNoRow(err) {
-			errMsg = `该指标未入库`
-			err = nil
-		}
-		return
-	}
-
-	// 操作权限校验
-	button := GetMysteelChemicalOpButton(sysUser, baseFromMysteelChemicalIndex.SysUserId)
-	if !button.MoveButton {
-		errMsg = "无权限操作"
-		return
-	}
-
-	//判断分类是否存在
-	_, err = data_manage.GetBaseFromMysteelChemicalClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		if utils.IsErrNoRow(err) {
-			errMsg = "找不到该分类"
-			err = nil
-		}
-		return
-	}
-
-	//如果改变了分类,那么移动该图表数据
-	if baseFromMysteelChemicalIndex.BaseFromMysteelChemicalClassifyId != classifyId {
-		tmpErr := data_manage.MoveBaseFromMysteelChemicalIndex(indexId, classifyId)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("移动失败,Err:" + tmpErr.Error())
-			return
-		}
-	}
-
-	//移动排序
-	updateCol := make([]string, 0)
-	//如果有传入 上一个兄弟节点分类id
-	if prevIndexId > 0 {
-		prevIndex, tmpErr := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(prevIndexId)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点指标信息失败,Err:" + tmpErr.Error())
-			return
-		}
-
-		//如果是移动在两个兄弟节点之间
-		if nextIndexId > 0 {
-			//下一个兄弟节点
-			nextIndex, tmpErr := data_manage.GetBaseFromMysteelChemicalIndexByIndexId(nextIndexId)
-			if err != nil {
-				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点指标信息失败,Err:" + tmpErr.Error())
-				return
-			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的,那么需要将下一个兄弟(以及下个兄弟的同样排序权重)的排序权重+2,自己变成上一个兄弟的排序权重+1
-			if prevIndex.Sort == nextIndex.Sort || prevIndex.Sort == baseFromMysteelChemicalIndex.Sort {
-				//变更兄弟节点的排序
-				updateSortStr := `sort + 2`
-				_ = data_manage.UpdateBaseFromMysteelChemicalIndexByClassifyId(prevIndex.BaseFromMysteelChemicalClassifyId, prevIndex.Sort, prevIndex.BaseFromMysteelChemicalIndexId, updateSortStr)
-			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层,那么需要再加一层了
-				if nextIndex.Sort-prevIndex.Sort == 1 {
-					//变更兄弟节点的排序
-					updateSortStr := `sort + 1`
-					_ = data_manage.UpdateBaseFromMysteelChemicalIndexByClassifyId(prevIndex.BaseFromMysteelChemicalClassifyId, prevIndex.Sort, prevIndex.BaseFromMysteelChemicalIndexId, updateSortStr)
-				}
-			}
-		}
-
-		baseFromMysteelChemicalIndex.Sort = prevIndex.Sort + 1
-		baseFromMysteelChemicalIndex.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-
-	} else {
-		firstClassify, tmpErr := data_manage.GetFirstBaseFromMysteelChemicalIndexByClassifyId(classifyId)
-		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
-			errMsg = "移动失败"
-			err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
-			return
-		}
-
-		//如果该分类下存在其他分类,且第一个其他分类的排序等于0,那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
-			updateSortStr := ` sort + 1 `
-			_ = data_manage.UpdateBaseFromMysteelChemicalIndexByClassifyId(firstClassify.BaseFromMysteelChemicalClassifyId, 0, firstClassify.BaseFromMysteelChemicalIndexId-1, updateSortStr)
-		}
-
-		baseFromMysteelChemicalIndex.Sort = 0 //那就是排在第一位
-		baseFromMysteelChemicalIndex.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-	}
-
-	//更新
-	if len(updateCol) > 0 {
-		err = baseFromMysteelChemicalIndex.Update(updateCol)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("修改失败,Err:" + err.Error())
-			return
-		}
-	}
-
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("修改失败,Err:" + err.Error())
-		return
-	}
-
-	return
-}
-
-// GetMysteelChemicalOpButton 获取钢联化工的操作权限
-func GetMysteelChemicalOpButton(sysUser *system.Admin, belongUserId int) (button data_manage.BaseFromMysteelChemicalClassifyItemsButton) {
-	//2、用户对于自己添加的分类,有权限编辑、移动和删除该分类;
-	//3、ficc管理员和超管对所有分类有编辑、移动和删除权限;
-	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN || sysUser.AdminId == belongUserId || sysUser.MysteelChemicalPermission == 1 {
-		button.AddButton = true
-		button.OpButton = true
-		button.DeleteButton = true
-		button.MoveButton = true
-	}
-	return
-}
-
-// CurlDelMysteelChemicalData 请求钢联服务器删除指标
-func CurlDelMysteelChemicalData(indexCode, updateWeek string) {
-	postUrl := utils.MySteelPostUrl + `/api/index/delete`
-	paramsMap := make(map[string]interface{})
-
-	updateWeek = WeekMap[updateWeek]
-	paramsMap["IndexCode"] = indexCode
-	paramsMap["UpdateWeek"] = updateWeek
-	paramsMap["RunMode"] = utils.RunMode
-
-	paramJson, err := json.Marshal(paramsMap)
-	if err != nil {
-		fmt.Println("param json.Marshal Err:" + err.Error())
-		err = errors.New("param json.Marshal Err:" + err.Error())
-		return
-	}
-
-	utils.FileLog.Info(fmt.Sprintf("CurlDelMysteelChemicalData parms:%s", string(paramJson)))
-	result, err := http.Post(postUrl, string(paramJson), "application/json")
-	if err != nil {
-		fmt.Println("post err:" + err.Error())
-		err = errors.New("post Err:" + err.Error())
-		return
-	}
-	utils.FileLog.Info("CurlDelMysteelChemicalData Result:%s", string(result))
-}
-
-// WeekMap 中英文日期转换
-var WeekMap = map[string]string{
-	"":   "",
-	"周一": "monday",
-	"周二": "tuesday",
-	"周三": "wednesday",
-	"周四": "thursday",
-	"周五": "friday",
-	"周六": "saturday",
-	"周日": "sunday",
-}
-
-// CurlRefreshMysteelChemicalData 请求钢联服务器添加指标
-func CurlRefreshMysteelChemicalData(mergeFilePath string) {
-	postUrl := utils.MySteelPostUrl + `/api/index/refresh`
-	paramsMap := make(map[string]interface{})
-	paramsMap["MergeFilePath"] = mergeFilePath
-	paramJson, err := json.Marshal(paramsMap)
-	if err != nil {
-		fmt.Println("param json.Marshal Err:" + err.Error())
-		err = errors.New("param json.Marshal Err:" + err.Error())
-		return
-	}
-
-	utils.FileLog.Info(fmt.Sprintf("CurlRefreshMysteelChemicalData parms:%s", string(paramJson)))
-	result, err := http.Post(postUrl, string(paramJson), "application/json")
-	if err != nil {
-		fmt.Println("post err:" + err.Error())
-		err = errors.New("post Err:" + err.Error())
-		return
-	}
-	utils.FileLog.Info("CurlRefreshMysteelChemicalData Result:%s", string(result))
-}
-
-// getEdbTerminal 根据指标来源获取可用指标终端信息
-func getEdbTerminal(source int) (edbTerminal *data_manage.EdbTerminal) {
-	terminalNumList, err := data_manage.GetMysteelChemicalGroupTerminalNum()
-	if err != nil {
-		return
-	}
-
-	terminalNumMap := make(map[string]int)
-	for _, v := range terminalNumList {
-		terminalNumMap[v.TerminalCode] = v.Num
-	}
-
-	terminalList, err := data_manage.GetEdbTerminalListBySource(source)
-	if err != nil {
-		return
-	}
-
-	num := 0
-	for _, v := range terminalList {
-		tmpNum := terminalNumMap[v.TerminalCode]
-
-		if edbTerminal == nil {
-			edbTerminal = v
-			num = tmpNum
-		} else if tmpNum < num {
-			edbTerminal = v
-			num = tmpNum
-		}
-	}
-
-	return
-}
-
-// RefreshMysteelChemicalData 根据手工指标code刷新手工指标数据
-func RefreshMysteelChemicalData(edbCode string) {
-	var err error
-	var errMsg string
-	defer func() {
-		if err != nil {
-			go alarm_msg.SendAlarmMsg("根据钢联化工的code刷新指标数据失败提醒,Err"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"导入手工数据后,根据手工指标code刷新手工指标数据失败提醒", "errmsg:"+err.Error(), utils.EmailSendToUsers)
-		}
-		if errMsg != "" {
-			go alarm_msg.SendAlarmMsg("根据钢联化工的code刷新指标数据失败提醒,errMsg"+errMsg, 3)
-		}
-	}()
-
-	baseFromMysteelChemicalIndexs, err := data_manage.GetBaseFromMysteelChemicalIndexByCodeList([]string{edbCode})
-	if err != nil && !utils.IsErrNoRow(err) {
-		return
-	}
-	resp, err := BatchAddMysteelChemicalData(baseFromMysteelChemicalIndexs, "zh")
-	if err != nil {
-		return
-	}
-	if !resp.Success {
-		errMsg = resp.ErrMsg
-	}
-}
-
-// RefreshMysteelChemicalData 根据手工指标code刷新手工指标数据
-func HealthCheckMysteelChemicalApi() (isEnable bool, ErrMsg string, err error) {
-	url := utils.EDB_LIB_URL + "mysteel_chemical/handle/mysteel/api/check"
-
-	body, err := HttpPost(url, "", utils.ZhLangVersion)
-	if err != nil {
-		return
-	}
-	var resp models.BaseResponse
-	if err = json.Unmarshal(body, &resp); err != nil {
-		return
-	}
-	apiCheck, ok := resp.Data.(map[string]interface{})
-	if ok {
-		isEnable = apiCheck["IsEnable"].(bool)
-		ErrMsg = apiCheck["ErrMsg"].(string)
-	} else {
-		err = errors.New("钢联api接口不可用")
-	}
-
-	return
-}

+ 0 - 61
services/data_stat/edb_delete_log.go

@@ -1,61 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_stat"
-	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-func AddEdbDeleteLog(edbInfo *data_manage.EdbInfo, sysUser *system.Admin) (err error) {
-	if edbInfo != nil {
-		log := new(data_stat.EdbInfoDeleteLog)
-		log.EdbInfoId = edbInfo.EdbInfoId
-		log.EdbInfoType = edbInfo.EdbInfoType
-		log.SourceName = edbInfo.SourceName
-		log.Source = edbInfo.Source
-		log.EdbCode = edbInfo.EdbCode
-		log.EdbName = edbInfo.EdbName
-		log.EdbNameEn = edbInfo.EdbNameEn
-		log.EdbNameSource = edbInfo.SourceIndexName
-		log.Frequency = edbInfo.Frequency
-		log.Unit = edbInfo.Unit
-		log.UnitEn = edbInfo.UnitEn
-		log.StartDate = utils.TimeToFormatDate(edbInfo.StartDate)
-		log.EndDate = utils.TimeToFormatDate(edbInfo.EndDate)
-		log.SysUserId = edbInfo.SysUserId
-		log.SysUserRealName = edbInfo.SysUserRealName
-		log.UniqueCode = edbInfo.UniqueCode
-		log.EdbCreateTime = edbInfo.CreateTime.Format(utils.FormatDateTime)
-		log.EdbModifyTime = edbInfo.ModifyTime.Format(utils.FormatDateTime)
-		log.CreateTime = time.Now().Format(utils.FormatDateTime)
-		log.MinValue = edbInfo.MinValue
-		log.MaxValue = edbInfo.MaxValue
-		log.CalculateFormula = edbInfo.CalculateFormula
-		log.EdbType = edbInfo.EdbType
-		log.LatestDate = edbInfo.LatestDate
-		log.LatestValue = edbInfo.LatestValue
-		log.MoveType = edbInfo.MoveType
-		log.MoveFrequency = edbInfo.MoveFrequency
-		log.NoUpdate = edbInfo.NoUpdate
-		log.ChartImage = edbInfo.ChartImage
-		log.Calendar = edbInfo.Calendar
-		log.DataDateType = edbInfo.DataDateType
-		log.ManualSave = edbInfo.ManualSave
-		log.TerminalCode = edbInfo.TerminalCode
-
-		log.DelSysUserId = sysUser.AdminId
-		log.DelSysUserRealName = sysUser.RealName
-		log.DataUpdateTime = edbInfo.DataUpdateTime
-		log.ErDataUpdateDate = edbInfo.ErDataUpdateDate
-
-		_, err = data_stat.AddEdbDeleteLog(log)
-		if err != nil {
-			err = fmt.Errorf("新增指标删除日志失败,Err: %s", err)
-			return
-		}
-	}
-	return
-}

+ 0 - 57
services/data_stat/edb_info_stat.go

@@ -1,57 +0,0 @@
-package data_stat
-
-import (
-	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/data_stat"
-	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"time"
-)
-
-// AddEdbInfoUpdateLog 添加指标编辑/刷新日志
-func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason string, sysUser *system.Admin, updateType int) (err error) {
-	var edbInfo *data_manage.EdbInfo
-	if edbInfoId > 0 {
-		// 获取指标详情
-		edbInfo, err = data_manage.GetEdbInfoById(edbInfoId)
-		if err != nil {
-			err = fmt.Errorf("指标不存在")
-			return
-		}
-		nowTime := time.Now()
-		log := new(data_stat.EdbInfoUpdateLog)
-		log.EdbInfoId = edbInfo.EdbInfoId
-		log.SourceName = edbInfo.SourceName
-		log.Source = edbInfo.Source
-		log.EdbCode = edbInfo.EdbCode
-		log.EdbName = edbInfo.EdbName
-		log.EdbNameSource = edbInfo.SourceIndexName
-		log.Frequency = edbInfo.Frequency
-		log.Unit = edbInfo.Unit
-		log.StartDate = utils.TimeToFormatDate(edbInfo.StartDate)
-		log.EndDate = utils.TimeToFormatDate(edbInfo.EndDate)
-		log.SysUserId = edbInfo.SysUserId
-		log.SysUserRealName = edbInfo.SysUserRealName
-		log.UpdateSysUserId = sysUser.AdminId
-		log.UpdateSysUserRealName = sysUser.RealName
-		log.UniqueCode = edbInfo.UniqueCode
-		log.EdbCreateTime = edbInfo.CreateTime
-		log.EdbModifyTime = edbInfo.ModifyTime
-		log.CreateTime = nowTime
-		log.LatestDate = edbInfo.LatestDate
-		log.LatestValue = edbInfo.LatestValue
-		log.TerminalCode = edbInfo.TerminalCode
-		log.UpdateResult = updateResult
-		log.UpdateFailedReason = updateFailedReason
-		log.DataUpdateTime = edbInfo.DataUpdateTime
-		log.ErDataUpdateDate = edbInfo.ErDataUpdateDate
-		log.UpdateType = updateType
-		_, err = data_stat.AddEdbUpdateLog(log)
-		if err != nil {
-			err = fmt.Errorf("新增指标更新日志失败,Err: %s", err)
-			return
-		}
-	}
-	return
-}

+ 0 - 21
services/task.go

@@ -35,9 +35,6 @@ func Task() {
 	//手工数据表格导入后的指标库刷新
 	go ImportManualDataRefresh()
 
-	// 加入钢联化工指标数据之后的刷新
-	go MysteelChemicalDataAdd()
-
 	//修复用户关注标识
 	//GetWxUsersSubscribe()
 
@@ -94,24 +91,6 @@ func ImportManualDataRefresh() {
 	}
 }
 
-// MysteelChemicalDataAdd 加入钢联化工指标数据之后的刷新
-func MysteelChemicalDataAdd() {
-	defer func() {
-		if err := recover(); err != nil {
-			fmt.Println("[ImportManualDataRefresh]", err)
-		}
-	}()
-	for {
-		utils.Rc.Brpop(utils.CACHE_MYSTEEL_CHEMICAL_ADD_DATA, func(b []byte) {
-			edbCode := string(b)
-			edbCode = strings.TrimPrefix(edbCode, `"`)
-			edbCode = strings.TrimSuffix(edbCode, `"`)
-
-			data.RefreshMysteelChemicalData(edbCode)
-		})
-	}
-}
-
 //func init()  {
 //	fmt.Println("start task init")
 //	UpdateEnglishEmailLogErrMsg()

+ 0 - 1
utils/constants.go

@@ -215,7 +215,6 @@ const (
 	CACHE_CHART_INFO_DATA             = "chart:info:data:"                    //图表数据
 	CACHE_CHART_CLASSIFY              = "chart:classify"                      //图表分类数据
 	CACHE_IMPORT_MANUAL_DATA          = "import:manual:data"                  //手工数据导入后刷新
-	CACHE_MYSTEEL_CHEMICAL_ADD_DATA   = "import:mysteelchemical:data"         //钢联化工的数据源导入后刷新
 	CACHE_ACCESS_TOKEN_LOGIN          = "pc_eta_admin:login:"                 //管理后台登录
 	CACHE_ACCESS_TOKEN_LOGIN_NO_TRUST = "pc_eta_admin:login:no_trust:"        //管理后台登录(不可信登录态)
 	CACHE_ABNORMAL_LOGIN              = "pc_eta_admin:login:abnormal:"        //管理后台登录-异常登录