撤回

controllers/data_manage/chart_info.go

@@ -3518,12 +3518,7 @@ func (this *ChartInfoController) PreviewBarChartInfo() {
 		}
 		for _, reqEdb := range req.EdbInfoIdList {
 			if v.EdbInfoId == reqEdb.EdbInfoId {
-				switch this.Lang {	
-				case utils.EnLangVersion:
-					v.EdbAliasNameEn = reqEdb.Name
-				default:
-					v.EdbAliasName = reqEdb.Name
-				}
+				v.EdbAliasName = reqEdb.Name
 			}
 		}
 	}
@@ -4073,12 +4068,7 @@ func (this *ChartInfoController) PreviewRadarChartInfo() {
 	mappingList, err := data_manage.GetChartEdbMappingListByEdbInfoIdList(edbInfoIdArr)
 	for _, v := range mappingList {
 		if name, ok := edbInfoNameMap[v.EdbInfoId]; ok {
-			switch this.Lang {	
-			case utils.EnLangVersion:
-				v.EdbAliasNameEn = name
-			default:
-				v.EdbAliasName = name
-			}
+			v.EdbAliasName = name
 		}
 	}
 	// 获取图表中的指标数据

controllers/trade_analysis/warehouse.go

@@ -574,7 +574,7 @@ func (this *WarehouseController) Edit() {
 	}
 
 	// 更新图表
-	chartItem, e = tradeAnalysisService.EditWarehouseChart(req, this.Lang)
+	chartItem, e = tradeAnalysisService.EditWarehouseChart(req)
 	if e != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = fmt.Sprintf("新增持仓分析图表失败, %v", e)

models/data_manage/chart_edb_mapping.go

@@ -32,7 +32,6 @@ type ChartEdbMapping struct {
 	ChartScale        float64   `description:"参考刻度线"`
 	Source            int       `description:"1：ETA图库；2：商品价格曲线"`
 	EdbAliasName      string    `description:"中文别名"`
-	EdbAliasNameEn    string    `description:"英文别名"`
 	IsConvert         int       `description:"是否数据转换 0不转 1转"`
 	ConvertType       int       `description:"数据转换类型 1乘 2除 3对数"`
 	ConvertValue      float64   `description:"数据转换值"`

models/data_manage/chart_info.go

@@ -1022,7 +1022,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 }
 
 // EditChartInfoAndMapping 修改 ETA图库 的 图表与指标 的关系
-func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra, lang string) (err error) {
+func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra string) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	to := o.Begin()
 	if to.Error != nil {
@@ -1142,17 +1142,8 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			fmt.Println("QueryRow Err:", err.Error())
 			return err
 		}
-		var edbAliasName, edbAliasNameEn string
 		if tmpChartEdbMapping != nil && tmpChartEdbMapping.ChartEdbMappingId > 0 {
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
-			edbAliasName = tmpChartEdbMapping.EdbAliasName
-			edbAliasNameEn = tmpChartEdbMapping.EdbAliasNameEn
-			switch lang {
-			case utils.EnLangVersion:
-				edbAliasNameEn = v.EdbAliasName
-			default:
-				edbAliasName = v.EdbAliasName
-			}
 			tmpChartEdbMapping.ModifyTime = time.Now()
 			tmpChartEdbMapping.MaxData = v.MaxData
 			tmpChartEdbMapping.MinData = v.MinData
@@ -1165,22 +1156,19 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			tmpChartEdbMapping.ChartColor = v.ChartColor
 			tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
 			tmpChartEdbMapping.ChartWidth = v.ChartWidth
-			tmpChartEdbMapping.EdbAliasName = edbAliasName
-			tmpChartEdbMapping.EdbAliasNameEn = edbAliasNameEn
+			tmpChartEdbMapping.EdbAliasName = v.EdbAliasName
 			tmpChartEdbMapping.IsConvert = v.IsConvert
 			tmpChartEdbMapping.ConvertType = v.ConvertType
 			tmpChartEdbMapping.ConvertValue = v.ConvertValue
 			tmpChartEdbMapping.ConvertUnit = v.ConvertUnit
 			tmpChartEdbMapping.ConvertEnUnit = v.ConvertEnUnit
-			err = to.Select("ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName", "EdbAliasNameEn",
+			err = to.Select("ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName",
 				"IsConvert", "ConvertType", "ConvertValue", "ConvertUnit", "ConvertEnUnit").Updates(tmpChartEdbMapping).Error
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
 				return err
 			}
 		} else {
-			edbAliasNameEn = v.EdbAliasName
-			edbAliasName = v.EdbAliasName
 			mapItem := new(ChartEdbMapping)
 			mapItem.ChartInfoId = req.ChartInfoId
 			mapItem.EdbInfoId = v.EdbInfoId
@@ -1200,8 +1188,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			mapItem.PredictChartColor = v.PredictChartColor
 			mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_DEFAULT
-			mapItem.EdbAliasName = edbAliasName
-			mapItem.EdbAliasNameEn = edbAliasNameEn
+			mapItem.EdbAliasName = v.EdbAliasName
 			mapItem.IsConvert = v.IsConvert
 			mapItem.ConvertType = v.ConvertType
 			mapItem.ConvertValue = v.ConvertValue

services/data/chart_info.go

@@ -2646,7 +2646,6 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		mapItem.ChartScale = v.ChartScale
 		mapItem.Source = utils.CHART_SOURCE_DEFAULT
 		mapItem.EdbAliasName = v.EdbAliasName
-		mapItem.EdbAliasNameEn = v.EdbAliasName
 		mapItem.IsConvert = v.IsConvert
 		mapItem.ConvertType = v.ConvertType
 		mapItem.ConvertValue = v.ConvertValue
@@ -3015,7 +3014,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 		req.ChartNameEn = chartItem.ChartNameEn
 		req.UnitEn = chartItem.UnitEn
 	}
-	err = data_manage.EditChartInfoAndMapping(&req, edbInfoIdStr, calendar, dateType, disableVal, barChartConf, chartEdbInfoList, seasonExtraConfig, lang)
+	err = data_manage.EditChartInfoAndMapping(&req, edbInfoIdStr, calendar, dateType, disableVal, barChartConf, chartEdbInfoList, seasonExtraConfig)
 	if err != nil {
 		errMsg = "保存失败"
 		err = errors.New("保存失败,Err:" + err.Error())

services/data/trade_analysis/warehouse.go

@@ -161,9 +161,9 @@ func AddWarehouseChart(req data_manage.AddChartInfoReq, extraConfig tradeAnalysi
 }
 
 // EditWarehouseChart 编辑持仓分析图表
-func EditWarehouseChart(req data_manage.EditChartInfoReq, lang string) (chartItem *data_manage.ChartInfo, err error) {
+func EditWarehouseChart(req data_manage.EditChartInfoReq) (chartItem *data_manage.ChartInfo, err error) {
 	// 更新图表
-	e := data_manage.EditChartInfoAndMapping(&req, "", "公历", req.DateType, 0, ``, make([]*data_manage.ChartSaveItem, 0), "", lang)
+	e := data_manage.EditChartInfoAndMapping(&req, "", "公历", req.DateType, 0, ``, make([]*data_manage.ChartSaveItem, 0), "")
 	if e != nil {
 		err = fmt.Errorf("更新图表失败, %v", e)
 		return