Merge branch '11.2' into debug

# Conflicts:
#	routers/commentsRouter.go

controllers/base_from_eia_stero.go → controllers/base_from_eia_steo.go

@@ -8,17 +8,17 @@ import (
 	"time"
 )
 
-// EiaSteroController Eia Stero报告
-type EiaSteroController struct {
+// EiaSteoController Eia Steo报告
+type EiaSteoController struct {
 	BaseAuthController
 }
 
 // Add
-// @Title 新增Eia Stero指标接口
-// @Description 新增Eia Stero指标接口
+// @Title 新增Eia Steo指标接口
+// @Description 新增Eia Steo指标接口
 // @Success 200 {object} models.AddEdbInfoReq
 // @router /add [post]
-func (this *EiaSteroController) Add() {
+func (this *EiaSteoController) Add() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -26,7 +26,7 @@ func (this *EiaSteroController) Add() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	source := utils.DATA_SOURCE_EIA_STERO
+	source := utils.DATA_SOURCE_EIA_STEO
 	var req models.AddEdbInfoReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -42,10 +42,10 @@ func (this *EiaSteroController) Add() {
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		err = models.AddEdbDataFromEiaStero(req.EdbCode)
+		err = models.AddEdbDataFromEiaSteo(req.EdbCode)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
-			br.ErrMsg = "获取指标信息失败 AddEdbDataFromEiaStero，Err:" + err.Error()
+			br.ErrMsg = "获取指标信息失败 AddEdbDataFromEiaSteo，Err:" + err.Error()
 			return
 		}
 		br.Ret = 200
@@ -59,11 +59,11 @@ func (this *EiaSteroController) Add() {
 }
 
 // Refresh
-// @Title 刷新Eia Stero指标接口
-// @Description 刷新Eia Stero指标接口
+// @Title 刷新Eia Steo指标接口
+// @Description 刷新Eia Steo指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
 // @router /refresh [post]
-func (this *EiaSteroController) Refresh() {
+func (this *EiaSteoController) Refresh() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -71,7 +71,7 @@ func (this *EiaSteroController) Refresh() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	source := utils.DATA_SOURCE_EIA_STERO
+	source := utils.DATA_SOURCE_EIA_STEO
 	var req models.RefreshEdbInfoReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -106,10 +106,10 @@ func (this *EiaSteroController) Refresh() {
 	}
 
 	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-	err = models.RefreshEdbDataFromEiaStero(req.EdbInfoId, req.EdbCode, req.StartDate)
+	err = models.RefreshEdbDataFromEiaSteo(req.EdbInfoId, req.EdbCode, req.StartDate)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "刷新指标信息失败！"
-		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromEiaStero，Err:" + err.Error()
+		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromEiaSteo，Err:" + err.Error()
 		return
 	}
 	// 更新指标最大最小值

models/base_from_eia_stero.go → models/base_from_eia_steo.go

@@ -12,13 +12,13 @@ import (
 
 //钢联
 
-type EiaSteroData struct {
+type EiaSteoData struct {
 	InputValue float64 `orm:"column(value)" description:"值"`
 	DataTime   string  `orm:"column(data_time)" description:"日期"`
 }
 
-func GetEiaSteroDataByCondition(condition string, pars []interface{}) (item []*EiaSteroData, err error) {
-	sql1 := ` SELECT * FROM base_from_eia_stero_data WHERE 1=1  `
+func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*EiaSteoData, err error) {
+	sql1 := ` SELECT * FROM base_from_eia_steo_data WHERE 1=1  `
 	o := orm.NewOrm()
 	if condition != "" {
 		sql1 += condition
@@ -28,8 +28,8 @@ func GetEiaSteroDataByCondition(condition string, pars []interface{}) (item []*E
 	return
 }
 
-// AddEdbDataFromEiaStero 新增钢联指标数据
-func AddEdbDataFromEiaStero(edbCode string) (err error) {
+// AddEdbDataFromEiaSteo 新增钢联指标数据
+func AddEdbDataFromEiaSteo(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	var condition string
@@ -40,19 +40,19 @@ func AddEdbDataFromEiaStero(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 
-	EiaSteroDataList, err := GetEiaSteroDataByCondition(condition, pars)
+	EiaSteoDataList, err := GetEiaSteoDataByCondition(condition, pars)
 	if err != nil {
 		return
 	}
 
-	dataLen := len(EiaSteroDataList)
+	dataLen := len(EiaSteoDataList)
 
 	existMap := make(map[string]string)
 	if dataLen > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO edb_data_eia_stero (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_eia_steo (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for i := 0; i < dataLen; i++ {
-			item := EiaSteroDataList[i]
+			item := EiaSteoDataList[i]
 			eDate := item.DataTime
 			sValue := utils.SubFloatToString(item.InputValue, 30)
 			if sValue != "" {
@@ -81,9 +81,9 @@ func AddEdbDataFromEiaStero(edbCode string) (err error) {
 	return
 }
 
-// RefreshEdbDataFromEiaStero 刷新钢联指标数据
-func RefreshEdbDataFromEiaStero(edbInfoId int, edbCode, startDate string) (err error) {
-	source := utils.DATA_SOURCE_EIA_STERO
+// RefreshEdbDataFromEiaSteo 刷新钢联指标数据
+func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err error) {
+	source := utils.DATA_SOURCE_EIA_STEO
 	o := orm.NewOrm()
 	if err != nil {
 		return
@@ -103,7 +103,7 @@ func RefreshEdbDataFromEiaStero(edbInfoId int, edbCode, startDate string) (err e
 		pars = append(pars, startDate)
 	}
 
-	EiaSteroDataList, err := GetEiaSteroDataByCondition(condition, pars)
+	EiaSteoDataList, err := GetEiaSteoDataByCondition(condition, pars)
 
 	var existCondition string
 	var existPars []interface{}
@@ -124,10 +124,10 @@ func RefreshEdbDataFromEiaStero(edbInfoId int, edbCode, startDate string) (err e
 		existMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_eia_stero(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_eia_steo(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	addMap := make(map[string]string)
-	for _, v := range EiaSteroDataList {
+	for _, v := range EiaSteoDataList {
 		item := v
 		eDate := item.DataTime
 		sValue := utils.SubFloatToString(item.InputValue, 30)

models/edb_data_table.go

@@ -73,8 +73,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_mysteel_chemical"
 	case utils.DATA_SOURCE_CALCULATE_CJJX:
 		tableName = "edb_data_calculate_cjjx"
-	case utils.DATA_SOURCE_EIA_STERO:
-		tableName = "edb_data_eia_stero"
+	case utils.DATA_SOURCE_EIA_STEO:
+		tableName = "edb_data_eia_steo"
 	default:
 		tableName = ""
 	}

routers/router.go

@@ -130,9 +130,9 @@ func init() {
 				&controllers.PredictCalculateController{},
 			),
 		),
-		beego.NSNamespace("/eia_stero",
+		beego.NSNamespace("/eia_steo",
 			beego.NSInclude(
-				&controllers.EiaSteroController{},
+				&controllers.EiaSteoController{},
 			),
 		),
 		beego.NSNamespace("/predict",

utils/constants.go

@@ -64,7 +64,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_TCZ            //同差值->33
 	DATA_SOURCE_MYSTEEL_CHEMICAL                 //钢联化工->34
 	DATA_SOURCE_CALCULATE_CJJX                   //超季节性->35
-	DATA_SOURCE_EIA_STERO                        //eia stero报告->36
+	DATA_SOURCE_EIA_STEO                         //eia steo报告->36
 )
 
 //基础数据初始化日期