Merge branch 'pool/94'

controllers/base_from_mysteel_chemical.go

@@ -11,14 +11,14 @@ import (
 	"time"
 )
 
-// MySteelChemicalController 钢联化工
+// MySteelChemicalController 上海钢联
 type MySteelChemicalController struct {
 	BaseAuthController
 }
 
 // Add
-// @Title 新增钢联化工指标接口
-// @Description 新增钢联化工指标接口
+// @Title 新增上海钢联指标接口
+// @Description 新增上海钢联指标接口
 // @Success 200 {object} models.AddEdbInfoReq
 // @router /add [post]
 func (this *MySteelChemicalController) Add() {
@@ -62,8 +62,8 @@ func (this *MySteelChemicalController) Add() {
 }
 
 // Refresh
-// @Title 刷新钢联化工指标接口
-// @Description 刷新钢联化工指标接口
+// @Title 刷新上海钢联指标接口
+// @Description 刷新上海钢联指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
 // @router /refresh [post]
 func (this *MySteelChemicalController) Refresh() {
@@ -183,8 +183,8 @@ func (this *MySteelChemicalController) QueryRefresh() {
 	br.Msg = "获取成功"
 }
 
-// @Title 检查钢联化工的api是否可用
-// @Description 检查钢联化工的api是否可用
+// @Title 检查上海钢联的api是否可用
+// @Description 检查上海钢联的api是否可用
 // @Success 200 {object} models.HandleMysteelIndexResp
 // @router /handle/mysteel/api/check [post]
 func (this *MySteelChemicalController) ApiHealthCheck() {
@@ -198,7 +198,7 @@ func (this *MySteelChemicalController) ApiHealthCheck() {
 	if err != nil {
 		br.Msg = "处理失败"
 		br.ErrMsg = "处理失败,Err:" + err.Error()
-		utils.FileLog.Info("钢联化工api接口不可用，Err:", err.Error())
+		utils.FileLog.Info("上海钢联api接口不可用，Err:", err.Error())
 		return
 	}
 

models/base_from_mysteel_chemical.go

@@ -213,7 +213,7 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 	return
 }
 
-// 钢联化工指标数据
+// 上海钢联指标数据
 type BaseFromMysteelChemicalIndex struct {
 	BaseFromMysteelChemicalIndexId int64 `gorm:"column:base_from_mysteel_chemical_index_id;primaryKey"`
 	//BaseFromMysteelChemicalIndexId    int64     `orm:"column(base_from_mysteel_chemical_index_id);pk"`
@@ -467,7 +467,7 @@ type HandleMysteelIndexResp struct {
 	List []*HandleMysteelIndex
 }
 
-// 钢联化工指标数据
+// 上海钢联指标数据
 type BaseFromMysteelChemicalData struct {
 	BaseFromMysteelChemicalDataId int64 `gorm:"column:base_from_mysteel_chemical_data_id;primaryKey"`
 	//BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`

models/edb_info.go

@@ -1581,7 +1581,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 		utils.DATA_SOURCE_MANUAL:              "手工数据",
 		utils.DATA_SOURCE_LZ:                  "隆众",
 		utils.DATA_SOURCE_YS:                  "SMM",
-		utils.DATA_SOURCE_GL:                  "钢联",
+		utils.DATA_SOURCE_GL:                  "上海钢联",
 		utils.DATA_SOURCE_ZZ:                  "郑商所",
 		utils.DATA_SOURCE_DL:                  "大商所",
 		utils.DATA_SOURCE_SH:                  "上期所",
@@ -1591,7 +1591,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 		utils.DATA_SOURCE_LT:                  "路透",
 		utils.DATA_SOURCE_COAL:                "中国煤炭市场网",
 		utils.DATA_SOURCE_GOOGLE_TRAVEL:       "our world in data",
-		utils.DATA_SOURCE_MYSTEEL_CHEMICAL:    "钢联化工",
+		utils.DATA_SOURCE_MYSTEEL_CHEMICAL:    "上海钢联",
 		utils.DATA_SOURCE_EIA_STEO:            "EIA STEO报告",
 		utils.DATA_SOURCE_COM_TRADE:           "UN",
 		utils.DATA_SOURCE_SCI:                 "SCI",
@@ -1621,7 +1621,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 
 	var sourceIndexName string
 
-	// 钢联化工需要校验下信息是否完整
+	// 上海钢联需要校验下信息是否完整
 	if source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
 		indexObj := new(BaseFromMysteelChemicalIndex)
 		tmpItem, tmpErr := indexObj.GetIndexItem(req.EdbCode)

models/edb_info_relation.go

@@ -97,7 +97,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 		}
 	}
 
-	//更新数据源钢联化工指标
+	//更新数据源上海钢联指标
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql = ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`

services/base_from_mysteel_chemical.go

@@ -188,7 +188,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 			e := dataObj.ModifyMysteelIndexMaxAndMinInfo(items[0].IndexCode, mysteelIndexMaxItem)
 			if e != nil {
 				fmt.Println("ModifyMysteelIndexMaxAndMinInfo Err:" + e.Error())
-				utils.FileLog.Info("修改钢联化工的最大最小日期失败，Err:" + e.Error())
+				utils.FileLog.Info("修改上海钢联的最大最小日期失败，Err:" + e.Error())
 			}
 		}
 
@@ -541,7 +541,7 @@ type MySteelChemicalApiInfoBody struct {
 	IncludeInfo bool `json:"includeInfo"`
 }
 
-// GetEdbDataFromMySteelChemical 批量获得钢联化工的指标数据
+// GetEdbDataFromMySteelChemical 批量获得上海钢联的指标数据
 func GetEdbDataFromMySteelChemical(indexCodes []string, startTime, endTime, order string) (item *models.MySteelChemicalApiResp, err error) {
 	if utils.MysteelChemicalApiToken == "" {
 		err = errors.New("钢联接口token未配置")
@@ -576,7 +576,7 @@ func GetEdbDataFromMySteelChemical(indexCodes []string, startTime, endTime, orde
 	return
 }
 
-// GetMySteelChemicalIndexNameMap 获取钢联化工的所有指标的信息
+// GetMySteelChemicalIndexNameMap 获取上海钢联的所有指标的信息
 func GetMySteelChemicalIndexNameMap() (indexNameMap map[string]*models.MySteelChemicalApiInfoItem, err error) {
 	if utils.MysteelChemicalApiToken == "" {
 		err = errors.New("钢联接口token未配置")
@@ -674,7 +674,7 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 
 	terminal, err := GetTerminal(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, tmpIndex.TerminalCode)
 	if err != nil {
-		err = fmt.Errorf("获取钢联化工接口配置出错 Err: %s", err)
+		err = fmt.Errorf("获取上海钢联接口配置出错 Err: %s", err)
 		return
 	}
 

utils/config.go

@@ -76,8 +76,8 @@ var (
 
 	ThsDataMethod           string //同花顺数据获取的方式，app是通过终端；api是通过接口
 	ThsRefreshToken         string // 同花顺的刷新token
-	MysteelChemicalApiToken string // 钢联化工的api数据token
-	MySteelChemicalApiUrl   string // 钢联化工的api数据地址
+	MysteelChemicalApiToken string // 上海钢联的api数据token
+	MySteelChemicalApiUrl   string // 上海钢联的api数据地址
 )
 
 type WindUrlMap struct {

utils/constants.go

@@ -57,7 +57,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE                               //预测指标运算->31
 	DATA_SOURCE_PREDICT_CALCULATE_TBZ                           //预测指标 - 同比值->32
 	DATA_SOURCE_PREDICT_CALCULATE_TCZ                           //预测指标 - 同差值->33
-	DATA_SOURCE_MYSTEEL_CHEMICAL                                //钢联化工->34
+	DATA_SOURCE_MYSTEEL_CHEMICAL                                //上海钢联->34
 	DATA_SOURCE_CALCULATE_CJJX                                  //超季节性->35
 	DATA_SOURCE_EIA_STEO                                        //eia steo报告->36
 	DATA_SOURCE_CALCULATE_NHCC                                  //计算指标（拟合残差）->37
@@ -145,7 +145,7 @@ const (
 	DATA_SOURCE_NAME_CALCULATE_HBZ                        = `环比值`               //环比值->12
 	DATA_SOURCE_NAME_CALCULATE_HCZ                        = `环差值`               //环差值->13
 	DATA_SOURCE_NAME_CALCULATE_BP                         = `升频`                //变频,2023-2-10 13:56:01调整为"升频"->14
-	DATA_SOURCE_NAME_GL                                   = `钢联`                //钢联->15
+	DATA_SOURCE_NAME_GL                                   = `上海钢联`              //钢联->15
 	DATA_SOURCE_NAME_ZZ                                   = `郑商所`               //郑商所->16
 	DATA_SOURCE_NAME_DL                                   = `大商所`               //大商所->17
 	DATA_SOURCE_NAME_SH                                   = `上期所`               //上期所->18
@@ -164,7 +164,7 @@ const (
 	DATA_SOURCE_NAME_PREDICT_CALCULATE                    = `预测指标运算`            //预测指标运算->31
 	DATA_SOURCE_NAME_PREDICT_CALCULATE_TBZ                = `预测同比`              //预测指标 - 同比值->32
 	DATA_SOURCE_NAME_PREDICT_CALCULATE_TCZ                = `预测同差`              //预测指标 - 同差值->33
-	DATA_SOURCE_NAME_MYSTEEL_CHEMICAL                     = `钢联化工`              //钢联化工->34
+	DATA_SOURCE_NAME_MYSTEEL_CHEMICAL                     = `上海钢联`              //上海钢联->34
 	DATA_SOURCE_NAME_CALCULATE_CJJX                       = `超季节性`              //超季节性->35
 	DATA_SOURCE_NAME_EIA_STEO                             = `EIA STERO报告`       //eia stero报告->36
 	DATA_SOURCE_NAME_CALCULATE_NHCC                       = `拟合残差`              //计算指标（拟合残差）->37