Browse Source

Merge branch 'master' of http://8.136.199.33:3000/eta_server/eta_index_lib into bzq1/lib_record

zqbao 6 months ago
parent
commit
d0304e4648

+ 266 - 0
controllers/base_from_sci_hq.go

@@ -0,0 +1,266 @@
+package controllers
+
+import (
+	"encoding/json"
+	"eta/eta_index_lib/logic"
+	"eta/eta_index_lib/models"
+	"eta/eta_index_lib/utils"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+type SciHqController struct {
+	BaseAuthController
+}
+
+// Add
+// @Title 新增卓创红期指标接口
+// @Description 新增卓创红期指标接口
+// @Success 200 {object} models.AddEdbInfoReq
+// @router /add [post]
+func (this *SciHqController) Add() {
+	br := new(models.BaseResponse).Init()
+	var cacheKey string
+	defer func() {
+		utils.Rc.Delete(cacheKey)
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.AddEdbInfoReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+	if req.EdbCode == "" {
+		br.Msg = "请输入指标编码!"
+		br.ErrMsg = "请输入指标编码,指标编码为空"
+		return
+	}
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(req.Source) + "_" + req.EdbCode
+	if !utils.Rc.IsExist(cacheKey) {
+		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+		err = models.AddEdbDataFromSciHq(req.EdbCode)
+		if err != nil {
+			br.Msg = "获取指标信息失败!"
+			br.ErrMsg = "获取指标信息失败 AddEdbDataFromSci,Err:" + err.Error()
+			return
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+	} else {
+		br.Ret = 501
+		br.Success = true
+		br.Msg = "系统处理中,请稍后重试"
+	}
+
+}
+
+// Refresh
+// @Title 刷新卓创红期指标接口
+// @Description 刷新卓创红期指标接口
+// @Success 200 {object} models.RefreshEdbInfoReq
+// @router /refresh [post]
+func (this *SciHqController) Refresh() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.RefreshEdbInfoReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+	if req.EdbCode == "" {
+		br.Msg = "请输入指标编码!"
+		br.ErrMsg = "请输入指标编码,指标编码为空"
+		return
+	}
+	if req.EdbInfoId < 0 {
+		br.Msg = "请输入指标ID!"
+		br.ErrMsg = "请输入指标ID"
+		return
+	}
+
+	// 获取指标详情
+	edbInfo, err := models.GetEdbInfoByEdbCode(req.Source, req.EdbCode)
+	if err != nil {
+		br.Msg = "指标不存在!"
+		br.ErrMsg = "指标不存在"
+		return
+	}
+	isHandling, errMsg, err := logic.RefreshBaseEdbInfo(edbInfo, req.StartDate)
+	if isHandling {
+		br.Ret = 501
+		br.Success = true
+		br.Msg = "系统处理中,请稍后重试"
+		return
+	}
+	if err != nil {
+		br.Msg = errMsg
+		br.ErrMsg = err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// HandleExcelData
+// @Title 处理卓创红期指标的接口
+// @Description 处理卓创红期指标的接口
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /handle/excel_data [post]
+func (this *SciHqController) HandleExcelData() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req []*models.HandleSciHqExcelDataReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+	indexList, err := models.GetAllBaseFromSciHqIndex()
+	if err != nil {
+		br.Msg = "获取指标列表失败!"
+		br.ErrMsg = "获取指标列表失败,Err:" + err.Error()
+		return
+	}
+	allIndexMap := make(map[string]*models.BaseFromSciHqIndex)
+	for _, v := range indexList {
+		allIndexMap[v.IndexCode] = v
+	}
+
+	addSciHqIndexList := make([]*models.BaseFromSciHqIndex, 0)
+	for _, v := range req {
+		t := new(models.BaseFromSciHqIndex)
+		if _, ok := allIndexMap[v.ExcelIndexCode]; !ok {
+			t.ClassifyId = 0
+			t.IndexName = v.IndexName
+			t.IndexCode = v.ExcelIndexCode
+			t.Frequency = v.Frequency
+			t.Unit = v.Unit
+			t.TerminalCode = v.TerminalCode
+			t.FilePath = v.FilePath
+			t.CreateTime = time.Now()
+			t.ModifyTime = time.Now()
+			addSciHqIndexList = append(addSciHqIndexList, t)
+		}
+	}
+	if len(addSciHqIndexList) > 0 {
+		err = models.BatchAddBaseFromSciHqIndex(addSciHqIndexList)
+		if err != nil {
+			br.Msg = "添加指标失败!"
+			br.ErrMsg = "添加指标失败,Err:" + err.Error()
+			return
+		}
+	}
+
+	indexList, err = models.GetAllBaseFromSciHqIndex()
+	if err != nil {
+		br.Msg = "获取指标列表失败!"
+		br.ErrMsg = "获取指标列表失败,Err:" + err.Error()
+		return
+	}
+	allIndexMap = make(map[string]*models.BaseFromSciHqIndex)
+	for _, v := range indexList {
+		allIndexMap[v.IndexCode] = v
+	}
+	for _, v := range req {
+		if indexInfo, ok := allIndexMap[v.ExcelIndexCode]; !ok {
+			utils.FileLog.Info("指标不存在,indexCode:" + v.ExcelIndexCode)
+			continue
+		} else {
+			indexDataList, err := models.GetBaseFromSciHqDataByIndexCode(indexInfo.IndexCode)
+			if err != nil {
+				br.Msg = "获取指标数据失败!"
+				br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
+				return
+			}
+			indexDataExistMap := make(map[string]*models.BaseFromSciHqData)
+			for _, indexData := range indexDataList {
+				indexDataExistMap[indexData.DataTime] = indexData
+			}
+			addSciHqDataList := make([]*models.BaseFromSciHqData, 0)
+			for dataDate, dataVal := range v.Data {
+				currDataTime, err := time.ParseInLocation(utils.FormatDate, dataDate, time.Local)
+				if err != nil {
+					utils.FileLog.Info("时间格式化失败,indexCode:" + v.ExcelIndexCode + "Err:" + err.Error())
+					continue
+				}
+				timestamp := currDataTime.UnixNano() / 1e6
+				sciHqData, ok := indexDataExistMap[dataDate]
+				if !ok {
+					tmpBaseFromSciData := &models.BaseFromSciHqData{
+						BaseFromSciHqIndexId: indexInfo.BaseFromSciHqIndexId,
+						IndexCode:            indexInfo.IndexCode,
+						DataTime:             dataDate,
+						Value:                dataVal,
+						CreateTime:           time.Now(),
+						ModifyTime:           time.Now(),
+						DataTimestamp:        timestamp,
+					}
+					addSciHqDataList = append(addSciHqDataList, tmpBaseFromSciData)
+				} else {
+					existValue := sciHqData.Value
+					if dataVal != "" && existValue != dataVal {
+						sciHqData.Value = dataVal
+						sciHqData.ModifyTime = time.Now()
+						if sciHqData.SciHqDataId > 0 {
+							err = sciHqData.Update([]string{"value", "modify_time"})
+							if err != nil {
+								utils.FileLog.Info("更新指标数据失败,indexCode:" + v.ExcelIndexCode + "Err:" + err.Error())
+								continue
+							}
+						}
+					}
+				}
+			}
+			if len(addSciHqDataList) > 0 {
+				err = models.BatchAddBaseFromSciHqData(addSciHqDataList)
+				if err != nil {
+					utils.FileLog.Info("添加指标数据失败,indexCode:" + v.ExcelIndexCode + "Err:" + err.Error())
+					continue
+				}
+			}
+
+			//修改最大最小日期
+			sciHqIndexMaxItem, err := models.GetSciHqIndexInfoMaxAndMinInfo(indexInfo.IndexCode)
+			if err == nil && sciHqIndexMaxItem != nil {
+				e := models.ModifySciHqIndexMaxAndMinInfo(indexInfo.IndexCode, sciHqIndexMaxItem)
+				if e != nil {
+					fmt.Println("ModifySciHqIndexMaxAndMinInfo Err:" + e.Error())
+				}
+			}
+			// 同步刷新ETA图库卓创红期的指标
+			{
+				// 获取指标详情
+				edbInfo, err := models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, indexInfo.IndexCode)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					utils.FileLog.Info("刷新指标异常,indexCode:" + v.ExcelIndexCode + "Err:" + err.Error())
+					continue
+				}
+
+				// 已经加入到指标库的话,那么就去更新ETA指标库吧
+				if edbInfo != nil {
+					go logic.RefreshBaseEdbInfo(edbInfo, ``)
+				}
+			}
+		}
+	}
+
+	br.Msg = "处理成功"
+	br.Success = true
+	br.Ret = 200
+}

+ 24 - 0
controllers/shanghai_smm.go

@@ -121,6 +121,30 @@ func (this *ShanghaiSmmController) RefreshData() {
 				item.ModifyTime = time.Now()
 				item.DataTimestamp = time.Now().UnixMilli()
 				addDateList = append(addDateList, item)
+			} else {
+				smmData, err := models.GetBaseFromSmmDataByCodeAndDate(indexInfo.IndexCode, v.RenewDate)
+				if err != nil {
+					fmt.Println("刷新数据失败,Err:", err.Error())
+					utils.FileLog.Info("刷新数据失败,Err:", err.Error())
+					continue
+				}
+				var smmDataValue string
+				if v.Value == "highs" {
+					smmDataValue = strconv.FormatFloat(v.Highs, 'f', -1, 64)
+				} else if v.Value == "low" {
+					smmDataValue = strconv.FormatFloat(v.Low, 'f', -1, 64)
+				} else {
+					smmDataValue = strconv.FormatFloat(v.Average, 'f', -1, 64)
+				}
+				if smmDataValue != "" && smmData.Value != smmDataValue {
+					smmData.Value = smmDataValue
+					smmData.ModifyTime = time.Now()
+					err = smmData.Update([]string{"Value", "ModifyTime"})
+					if err != nil {
+						utils.FileLog.Info("indexCode: %s,更新指标数据失败,Err:%s", v.IndexCode, err.Error())
+					}
+				}
+
 			}
 		}
 	}

+ 2 - 0
logic/base_edb_info.go

@@ -34,6 +34,8 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 	case utils.DATA_SOURCE_CCF:
 		ccfOb := new(models.BaseFromCCF)
 		err = ccfOb.Refresh(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+	case utils.DATA_SOURCE_SCI_HQ:
+		err = models.RefreshEdbDataFromSciHq(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	default:
 		return
 	}

+ 273 - 0
models/base_from_sci_hq.go

@@ -0,0 +1,273 @@
+package models
+
+import (
+	"eta/eta_index_lib/utils"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+func GetBaseFromSciHqDataByCondition(condition string, pars []interface{}) (list []*BaseFromSciHqData, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+	return
+}
+
+func GetBaseFromSciHqDataByIndexCode(indexCode string) (list []*BaseFromSciHqData, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 AND index_code=?`
+	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	return
+}
+
+// AddEdbDataFromSciHq 新增卓创红期指标数据
+func AddEdbDataFromSciHq(edbCode string) (err error) {
+	o := orm.NewOrm()
+
+	var condition string
+	var pars []interface{}
+	if edbCode != "" {
+		condition += " AND index_code=? "
+		pars = append(pars, edbCode)
+	}
+	sciBaseDataAll, err := GetBaseFromSciHqDataByCondition(condition, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	var isAdd bool
+	addSql := ` INSERT INTO edb_data_sci_hq(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	existMap := make(map[string]string)
+	for _, sv := range sciBaseDataAll {
+		eDate := sv.DataTime
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
+		if err != nil {
+			return err
+		}
+		timestamp := dataTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, ok := existMap[eDate]; !ok {
+			addSql += GetAddSql("0", edbCode, eDate, timeStr, sv.Value)
+			isAdd = true
+		}
+		existMap[eDate] = sv.Value
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		utils.FileLog.Info("addSql:" + addSql)
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}
+
+// RefreshEdbDataFromSciHq 刷新卓创红期指标数据
+func RefreshEdbDataFromSciHq(edbInfoId int, edbCode, startDate string) (err error) {
+	source := utils.DATA_SOURCE_SCI_HQ
+	subSource := utils.DATA_SUB_SOURCE_EDB
+
+	o := orm.NewOrm()
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND index_code=? "
+		pars = append(pars, edbCode)
+	}
+
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	sciDataList, err := GetBaseFromSciDataByCondition(condition, pars)
+	if err != nil {
+		return
+	}
+
+	// 真实数据的最大日期  , 插入规则配置的日期
+	var realDataMaxDate, edbDataInsertConfigDate time.Time
+	var edbDataInsertConfig *EdbDataInsertConfig
+	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
+	{
+		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return
+		}
+		if edbDataInsertConfig != nil {
+			edbDataInsertConfigDate = edbDataInsertConfig.Date
+		}
+	}
+
+	var existCondition string
+	var existPars []interface{}
+
+	existCondition += " AND edb_info_id=? "
+	existPars = append(existPars, edbInfoId)
+	if startDate != "" {
+		existCondition += " AND data_time>=? "
+		existPars = append(existPars, startDate)
+	}
+
+	existList, err := GetEdbDataByCondition(source, subSource, existCondition, existPars)
+	if err != nil {
+		return err
+	}
+	existMap := make(map[string]*EdbInfoSearchData)
+	for _, v := range existList {
+		existMap[v.DataTime] = v
+	}
+	addSql := ` INSERT INTO edb_data_sci_hq(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, v := range sciDataList {
+		item := v
+
+		eDate := item.DataTime
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
+		if err != nil {
+			return err
+		}
+		if findItem, ok := existMap[v.DataTime]; !ok {
+			sValue := item.Value
+			timestamp := dataTime.UnixNano() / 1e6
+			timeStr := fmt.Sprintf("%d", timestamp)
+
+			addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
+			isAdd = true
+		} else {
+			if findItem != nil && utils.SubFloatToString(findItem.Value, 30) != item.Value {
+				err = ModifyEdbDataById(source, subSource, findItem.EdbDataId, item.Value)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		// 下面代码主要目的是处理掉手动插入的数据判断
+		{
+			if realDataMaxDate.IsZero() || dataTime.After(realDataMaxDate) {
+				realDataMaxDate = dataTime
+			}
+			if edbDataInsertConfigDate.IsZero() || dataTime.Equal(edbDataInsertConfigDate) {
+				isFindConfigDateRealData = true
+			}
+		}
+	}
+
+	// 处理手工数据补充的配置
+	HandleConfigInsertEdbData(realDataMaxDate, edbDataInsertConfig, edbInfoId, source, subSource, existMap, isFindConfigDateRealData)
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println("RefreshEdbDataFromSci add Err", err.Error())
+			return
+		}
+	}
+	return
+}
+
+// HandleSciHqExcelDataReq 卓创红期的excel数据
+type HandleSciHqExcelDataReq struct {
+	IndexName      string
+	ExcelIndexCode string
+	Frequency      string
+	Unit           string
+	TerminalCode   string
+	FilePath       string
+	Data           map[string]string
+}
+
+type BaseFromSciHqIndex struct {
+	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk"` //序号
+	IndexCode            string    `description:"指标编码"`
+	IndexName            string    `description:"指标名称"`
+	ClassifyId           int       `description:"分类id"`
+	Frequency            string    `description:"频率"`
+	Unit                 string    `description:"单位"`
+	StartDate            string    `description:"开始日期"`
+	EndDate              string    `description:"结束日期"`
+	Sort                 int       `description:"排序"`
+	TerminalCode         string    `description:"终端编码"`
+	FilePath             string    `description:"文件路径"`
+	CreateTime           time.Time `description:"创建时间"`
+	ModifyTime           time.Time `description:"更新时间"`
+}
+
+func GetAllBaseFromSciHqIndex() (items []*BaseFromSciHqIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_sci_hq_index`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+func BatchAddBaseFromSciHqIndex(list []*BaseFromSciHqIndex) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(list), list)
+	return
+}
+
+type BaseFromSciHqData struct {
+	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk"`         //序号
+	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id)"` //指标id
+	IndexCode            string    `description:"指标编码"`
+	DataTime             string    `description:"数据时间"`
+	Value                string    `description:"数据值"`
+	CreateTime           time.Time `description:"创建时间"`
+	ModifyTime           time.Time `description:"更新时间"`
+	DataTimestamp        int64     `description:"数据时间戳"`
+}
+
+func (r *BaseFromSciHqData) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(r, cols...)
+	return
+}
+
+func BatchAddBaseFromSciHqData(list []*BaseFromSciHqData) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(500, list)
+	return
+}
+
+func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM base_from_sci_hq_data WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+
+	if err != nil {
+		return
+	}
+
+	// 获取最新值
+	var latest_value float64
+	var latestDate string
+
+	sql = ` SELECT value AS latest_value, data_time AS latest_date FROM base_from_sci_hq_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
+	err = o.Raw(sql, indexCode).QueryRow(&latest_value, &latestDate)
+	if err != nil {
+		return
+	}
+	item.LatestValue = latest_value
+	item.LatestDate = latestDate
+
+	return
+}
+
+func ModifySciHqIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE base_from_sci_hq_index SET start_date=?,end_date=?,latest_value=?,latest_date=?,modify_time=NOW() WHERE index_code=? `
+	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestDate, indexCode).Exec()
+	return
+}

+ 13 - 0
models/base_from_smm.go

@@ -21,6 +21,12 @@ type BaseFromSmmData struct {
 	DataTimestamp      int64
 }
 
+func (s *BaseFromSmmData) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(s, cols...)
+	return
+}
+
 func AddBaseFromSmmData(item []*BaseFromSmmData) (err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(500, item)
@@ -64,6 +70,13 @@ func GetBaseFromSmmDataByIds(smmDataIds []int) (list []*BaseFromSmmData, err err
 	return
 }
 
+func GetBaseFromSmmDataByCodeAndDate(indexCode string, dataTime string) (item *BaseFromSmmData, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND index_code=? AND data_time=? `
+	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	return
+}
+
 // 新增有色指标数据
 func AddEdbDataFromSmm(edbCode string, smmBaseDataAll []*BaseFromSmmData) (err error) {
 	o := orm.NewOrm()

+ 2 - 0
models/db.go

@@ -159,6 +159,8 @@ func initBaseIndex() {
 		new(BaseFromCCFIndex),
 		new(BaseFromCCFData),
 		new(CCFStockExcel),
+		new(BaseFromSciHqData),
+		new(BaseFromSciHqIndex),
 		new(BaseFromThsHfIndex),
 		new(BaseFromThsHfData),
 		new(BaseFromEdbMapping),

+ 2 - 0
models/edb_data_table.go

@@ -166,6 +166,8 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 		tableName = "edb_data_calculate_rjz"
 	case utils.DATA_SOURCE_PREDICT: // 基础预测指标->30
 		tableName = "edb_data_predict_base"
+	case utils.DATA_SOURCE_SCI_HQ: // 卓创红期
+		tableName = "edb_data_sci_hq"
 	default:
 		edbSource := EdbSourceIdMap[source]
 		if edbSource != nil {

+ 27 - 0
routers/commentsRouter.go

@@ -1258,6 +1258,33 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"],
+        beego.ControllerComments{
+            Method: "Add",
+            Router: `/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"],
+        beego.ControllerComments{
+            Method: "HandleExcelData",
+            Router: `/handle/excel_data`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:SciHqController"],
+        beego.ControllerComments{
+            Method: "Refresh",
+            Router: `/refresh`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers:ShController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:ShController"],
         beego.ControllerComments{
             Method: "Add",

+ 5 - 0
routers/router.go

@@ -277,6 +277,11 @@ func init() {
 				&controllers.ShanghaiSmmController{},
 			),
 		),
+		beego.NSNamespace("/sci_hq",
+			beego.NSInclude(
+				&controllers.SciHqController{},
+			),
+		),
 		beego.NSNamespace("/factor_edb_series",
 			beego.NSInclude(
 				&factor_edb_series.FactorEdbSeriesController{},

+ 14 - 13
utils/constants.go

@@ -98,18 +98,18 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_ZSXY                          // 预测指数修匀->73
 	DATA_SOURCE_CALCULATE_ZDYFX                                 // 自定义分析->74
 	DATA_SOURCE_CALCULATE_RJZ                                   // 日均值计算->75
-
-	DATA_SOURCE_YONYI         = 76 //涌益咨询
-	DATA_SOURCE_FENWEI        = 77 //汾渭煤炭
-	DATA_SOURCE_GFEX          = 78 // 广州期货交易所->78
-	DATA_SOURCE_ICPI          = 79 // ICPI消费价格指数->79
-	DATA_SOURCE_MTJH          = 80 // 煤炭江湖->80
-	DATA_SOURCE_CALCULATE_SUM = 81
-	DATA_SOURCE_CALCULATE_AVG = 82
-	DATA_SOURCE_BLOOMBERG     = 83 // bloomberg彭博数据
-	DATA_SOURCE_BUSINESS      = 84 // 来源于自有数据
-	DATA_SOURCE_SCI99         = 85 // 卓创资讯
-	DATA_SOURCE_CCF           = 86 // CCF化纤信息
+	DATA_SOURCE_YONYI                                = 76       //涌益咨询
+	DATA_SOURCE_FENWEI                               = 77       //汾渭煤炭
+	DATA_SOURCE_GFEX                                 = 78       // 广州期货交易所->78
+	DATA_SOURCE_ICPI                                 = 79       // ICPI消费价格指数->79
+	DATA_SOURCE_MTJH                                 = 80       // 煤炭江湖->80
+	DATA_SOURCE_CALCULATE_SUM                        = 81
+	DATA_SOURCE_CALCULATE_AVG                        = 82
+	DATA_SOURCE_BLOOMBERG                            = 83 // bloomberg彭博数据
+	DATA_SOURCE_BUSINESS                             = 84 // 来源于自有数据
+	DATA_SOURCE_SCI99                                = 85 // 卓创资讯
+	DATA_SOURCE_CCF                                  = 86 // CCF化纤信息
+	DATA_SOURCE_SCI_HQ                               = 88 // 卓创红期->88
 )
 
 // 指标来源的中文展示
@@ -195,7 +195,8 @@ const (
 	DATA_SOURCE_NAME_CALCULATE_SUM                        = `多指标求和`
 	DATA_SOURCE_NAME_CALCULATE_AVG                        = `多指标求平均`
 	DATA_SOURCE_NAME_BUSINESS                             = `自有数据`
-	DATA_SOURCE_NAME_CCF                                  = `CCF` // CCF化纤信息
+	DATA_SOURCE_NAME_CCF                                  = `CCF`  // CCF化纤信息
+	DATA_SOURCE_NAME_SCI_HQ                               = `卓创红期` // 卓创红期
 )
 
 // 基础数据初始化日期