Merge branch 'ETA_1.9.4' into debug

models/data_manage/chart_info.go

@@ -1552,6 +1552,7 @@ type SeasonRightAxis struct {
 	LineWidth     int    `description:"线条宽度"`
 	LineStyle     string `description:"线条样式"`
 	IsShow        bool   `description:"是否显示"`
+	IsAdd         bool   `description:"是否添加"`
 }
 
 // 自定义同期上下限
@@ -1560,6 +1561,7 @@ type MaxMinLimits struct {
 	Year   int    `description:"上下限取值范围"`
 	Legend string `description:"图例名称"`
 	IsShow bool   `description:"是否显示"`
+	IsAdd  bool   `description:"是否添加"`
 }
 
 // 自定义同期均线
@@ -1570,6 +1572,7 @@ type SamePeriodAverage struct {
 	LineType  string `description:"线型"`
 	LineWidth int    `description:"线宽"`
 	IsShow    bool   `description:"是否显示"`
+	IsAdd     bool   `description:"是否添加"`
 }
 
 // 自定义同期均线
@@ -1581,6 +1584,7 @@ type SamePeriodAverageResp struct {
 	LineWidth int                      `description:"线宽"`
 	IsShow    bool                     `description:"是否显示"`
 	List      []*SamePeriodAverageData `description:"自定义均线列表"`
+	IsAdd     bool                     `description:"是否添加"`
 }
 
 type SamePeriodAverageData struct {
@@ -1596,6 +1600,7 @@ type SamePeriodStandardDeviation struct {
 	Legend   string  `description:"图例名称"`
 	Multiple float64 `description:"标准差倍数"`
 	IsShow   bool    `description:"是否显示"`
+	IsAdd    bool    `description:"是否添加"`
 }
 
 type SamePeriodStandardDeviationResp struct {
@@ -1605,6 +1610,7 @@ type SamePeriodStandardDeviationResp struct {
 	Multiple float64             `description:"标准差倍数"`
 	IsShow   bool                `description:"是否显示"`
 	List     []*MaxMinLimitsData `description:"自定义标准差列表"`
+	IsAdd    bool                `description:"是否添加"`
 }
 
 type SeasonChartResp struct {
@@ -1617,7 +1623,7 @@ type SeasonChartResp struct {
 // 自定义右轴指标
 type SeasonRightAxisResp struct {
 	SeasonRightAxis
-	EdbInfoList   []*ChartEdbInfoMapping
+	EdbInfoList []*ChartEdbInfoMapping
 }
 
 type MaxMinLimitsResp struct {
@@ -1626,6 +1632,7 @@ type MaxMinLimitsResp struct {
 	Value  int                 `description:"上下限取值范围"`
 	Legend string              `description:"图例名称"`
 	IsShow bool                `description:"是否显示"`
+	IsAdd  bool                `description:"是否添加"`
 }
 
 type MaxMinLimitsData struct {

services/data/chart_info.go

@@ -3351,6 +3351,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataResp.MaxMinLimits.Color = seasonConfig.MaxMinLimits.Color
 			dataResp.MaxMinLimits.Legend = seasonConfig.MaxMinLimits.Legend
 			dataResp.MaxMinLimits.IsShow = seasonConfig.MaxMinLimits.IsShow
+			dataResp.MaxMinLimits.IsAdd = seasonConfig.MaxMinLimits.IsAdd
 		}
 
 		// 自定义同期均线
@@ -3410,6 +3411,8 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataResp.SamePeriodAverage.IsShow = seasonConfig.SamePeriodAverage.IsShow
 			dataResp.SamePeriodAverage.LineType = seasonConfig.SamePeriodAverage.LineType
 			dataResp.SamePeriodAverage.LineWidth = seasonConfig.SamePeriodAverage.LineWidth
+			dataResp.SamePeriodAverage.IsAdd = seasonConfig.SamePeriodAverage.IsAdd
+
 		}
 
 		// 自定义同期标准差
@@ -3480,6 +3483,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataResp.SamePeriodStandardDeviation.IsShow = seasonConfig.SamePeriodStandardDeviation.IsShow
 			dataResp.SamePeriodStandardDeviation.Multiple = seasonConfig.SamePeriodStandardDeviation.Multiple
 			dataResp.SamePeriodStandardDeviation.Year = seasonConfig.SamePeriodStandardDeviation.Year
+			dataResp.SamePeriodStandardDeviation.IsAdd = seasonConfig.SamePeriodStandardDeviation.IsAdd
 		}
 
 		// 自定义右轴