..

models/data_manage/excel/request/balance_table.go

@@ -2,7 +2,7 @@ package request
 
 import "eta/eta_api/models/data_manage"
 
-type AddBalanceTableChartItem struct {
+type AddBalanceTableChartEdbItem struct {
 	DateSequenceStr string   `description:"日期序列"`
 	DateSequenceVal []string `description:"日期序列的值列表"`
 	DataSequenceStr string   `description:"数据序列"`
@@ -17,6 +17,18 @@ type AddBalanceTableChartItem struct {
 	LeadUnit        string   `description:"领先单位"`
 	FromTag         string   `description:"标签"`
 	ExcelChartEdbId int
+
+	/*	ChartStyle        string  `description:"图表类型"`
+		ChartColor        string  `description:"颜色"`
+		PredictChartColor string  `description:"预测数据的颜色"`
+		ChartWidth        float64 `description:"线条大小"`
+		Source            int     `description:"1：ETA图库；2：商品价格曲线"`
+		EdbAliasName      string  `description:"中文别名"`
+		IsConvert         int     `description:"是否数据转换 0不转 1转"`
+		ConvertType       int     `description:"数据转换类型 1乘 2除 3对数"`
+		ConvertValue      float64 `description:"数据转换值"`
+		ConvertUnit       string  `description:"数据转换单位"`
+		ConvertEnUnit     string  `description:"数据转换单位"`*/
 }
 
 type AddBalanceTableChartReq struct {
@@ -41,7 +53,7 @@ type AddBalanceTableChartReq struct {
 	ExtraConfig       string                      `description:"图表额外配置信息,json字符串"`
 	ChartImage        string                      `description:"封面图" json:"-"`
 	SeasonExtraConfig data_manage.SeasonExtraItem `description:"季节性图表中的配置,json数据"`
-	StartYear         int                         `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	//StartYear         int                         `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
 	//ChartThemeId      int             `description:"图表应用主题ID"`
 	SourcesFrom string `description:"图表来源"`
 	//Instructions      string          `description:"图表说明"`
@@ -49,5 +61,5 @@ type AddBalanceTableChartReq struct {
 	//MarkersAreas      string          `description:"标识区"`
 	//Unit              string          `description:"中文单位名称"`
 	//UnitEn            string          `description:"英文单位名称"`
-	ChartEdbList []AddBalanceTableChartItem
+	ChartEdbInfoList []AddBalanceTableChartEdbItem
 }

services/data/excel/balance_table.go

@@ -29,13 +29,13 @@ func AddBalanceTableChart(req request.AddBalanceTableChartReq, sysUser *system.A
 		err = fmt.Errorf("EXCEL类型错误！")
 		return
 	}
-	if len(req.ChartEdbList) == 0 {
+	if len(req.ChartEdbInfoList) == 0 {
 		errMsg = "图表数据不能为空！"
 		err = fmt.Errorf("图表数据不能为空！%s", err.Error())
 		return
 	}
 	chartEdbList := make([]*excelModel.AddChartEdbAndDataItem, 0)
-	for _, chartEdb := range req.ChartEdbList {
+	for _, chartEdb := range req.ChartEdbInfoList {
 		excelEdb := new(excelModel.ExcelChartEdb)
 		excelEdb.EdbName = chartEdb.EdbName
 		randStr := utils.GetRandDigit(4)
@@ -76,15 +76,15 @@ func AddBalanceTableChart(req request.AddBalanceTableChartReq, sysUser *system.A
 	// todo 处理图表
 	chartInfo, err, errMsg, isSendEmail = addBalanceTableChart(req, sysUser.AdminId, sysUser.RealName)
 	if err != nil {
-		errMsg += "新增图表失败！"
-		err = fmt.Errorf("新增图表失败！%s", err.Error())
+		errMsg = "新增图表失败！"
+		err = fmt.Errorf("新增图表失败！%s, %s", errMsg, err.Error())
 		return
 	}
 	obj := new(excelModel.ExcelChartEdb)
 	err = obj.AddChartEdbAndData(chartEdbList, chartInfo)
 	if err != nil {
 		errMsg = "新增图表失败！"
-		err = fmt.Errorf("新增图表失败！%s", err.Error())
+		err = fmt.Errorf("新增图表数据失败！%s", err.Error())
 		return
 	}
 
@@ -106,7 +106,7 @@ func addBalanceTableChart(req request.AddBalanceTableChartReq, sysUserId int, sy
 	// 季节性图表额外配置信息
 	var seasonExtraConfig string
 
-	if len(req.ChartEdbList) <= 0 {
+	if len(req.ChartEdbInfoList) <= 0 {
 		errMsg = "请选择指标！"
 		err = fmt.Errorf(errMsg)
 		return