fix:指标别名

models/data_manage/chart_edb_mapping.go

@@ -29,6 +29,7 @@ type ChartEdbMapping struct {
 	PredictChartColor string    `description:"预测数据的颜色"`
 	ChartWidth        float64   `description:"线条大小"`
 	Source            int       `description:"1：ETA图库；2：商品价格曲线"`
+	EdbAliasName      string    `description:"中文别名"`
 }
 
 func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {

models/data_manage/chart_info.go

@@ -174,6 +174,7 @@ type ChartSaveItem struct {
 	PredictChartColor string  `description:"预测数据的颜色"`
 	ChartWidth        float64 `description:"线条大小"`
 	Source            int     `description:"1：ETA图库；2：商品价格曲线"`
+	EdbAliasName      string  `description:"中文别名"`
 }
 
 func DeleteChartInfoAndData(chartInfoId int) (err error) {
@@ -785,7 +786,8 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			tmpChartEdbMapping.ChartColor = v.ChartColor
 			tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
 			tmpChartEdbMapping.ChartWidth = v.ChartWidth
-			_, err = to.Update(tmpChartEdbMapping, "ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth")
+			tmpChartEdbMapping.EdbAliasName = v.EdbAliasName
+			_, err = to.Update(tmpChartEdbMapping, "ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName")
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
 				return err
@@ -810,6 +812,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			mapItem.PredictChartColor = v.PredictChartColor
 			mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_DEFAULT
+			mapItem.EdbAliasName = v.EdbAliasName
 			tmpId, err := to.Insert(mapItem)
 			if err != nil {
 				fmt.Println("AddChartEdbMapping Err:" + err.Error())

services/data/chart_info.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"eta/eta_api/models/company"
 	"eta/eta_api/models/data_manage"
-	"eta/eta_api/models/data_manage/chart_theme"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
@@ -1822,24 +1821,24 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		isSendEmail = false
 		return
 	}
-	if req.ChartThemeId <= 0 {
-		errMsg = "请选择主题"
-		err = errors.New(errMsg)
-		isSendEmail = false
-		return
-	}
-
-	// 判断主题是否存在
-	_, err = chart_theme.GetChartThemeId(req.ChartThemeId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			errMsg = "主题不存在"
-			err = errors.New(errMsg)
-			return
-		}
-		errMsg = "获取主题信息失败"
-		return
-	}
+	//if req.ChartThemeId <= 0 {
+	//	errMsg = "请选择主题"
+	//	err = errors.New(errMsg)
+	//	isSendEmail = false
+	//	return
+	//}
+	//
+	//// 判断主题是否存在
+	//_, err = chart_theme.GetChartThemeId(req.ChartThemeId)
+	//if err != nil {
+	//	if err.Error() == utils.ErrNoRow() {
+	//		errMsg = "主题不存在"
+	//		err = errors.New(errMsg)
+	//		return
+	//	}
+	//	errMsg = "获取主题信息失败"
+	//	return
+	//}
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
@@ -2136,6 +2135,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		mapItem.PredictChartColor = v.PredictChartColor
 		mapItem.ChartWidth = v.ChartWidth
 		mapItem.Source = utils.CHART_SOURCE_DEFAULT
+		mapItem.EdbAliasName = v.EdbAliasName
 		mapList = append(mapList, mapItem)
 	}
 	err = data_manage.AddChartEdbMapping(mapList)
@@ -2168,24 +2168,24 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
 		isSendEmail = false
 		return
 	}
-	if req.ChartThemeId <= 0 {
-		errMsg = "请选择主题！"
-		err = errors.New(errMsg)
-		isSendEmail = false
-		return
-	}
-
-	// 判断主题是否存在
-	_, err = chart_theme.GetChartThemeId(req.ChartThemeId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			errMsg = "主题不存在"
-			err = errors.New(errMsg)
-			return
-		}
-		errMsg = "获取主题信息失败"
-		return
-	}
+	//if req.ChartThemeId <= 0 {
+	//	errMsg = "请选择主题！"
+	//	err = errors.New(errMsg)
+	//	isSendEmail = false
+	//	return
+	//}
+	//
+	//// 判断主题是否存在
+	//_, err = chart_theme.GetChartThemeId(req.ChartThemeId)
+	//if err != nil {
+	//	if err.Error() == utils.ErrNoRow() {
+	//		errMsg = "主题不存在"
+	//		err = errors.New(errMsg)
+	//		return
+	//	}
+	//	errMsg = "获取主题信息失败"
+	//	return
+	//}
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {