fix:移除滚动相关性图表与相关性图表强关联性

controller/chart/chart_common.go

@@ -14,7 +14,6 @@ import (
 	chartInfoModel "hongze/hongze_yb/models/tables/chart_info"
 	"hongze/hongze_yb/models/tables/chart_info_correlation"
 	"hongze/hongze_yb/models/tables/chart_info_log"
-	"hongze/hongze_yb/models/tables/multiple_graph_config_chart_mapping"
 	"hongze/hongze_yb/models/tables/yb_my_chart"
 	"hongze/hongze_yb/services/alarm_msg"
 	"hongze/hongze_yb/services/chart"
@@ -452,33 +451,13 @@ func getCorrelationChartInfoDetail(chartInfo *chartInfoModel.ChartInfoView, myCh
 			return
 		}
 	case utils.CHART_SOURCE_ROLLING_CORRELATION: // 滚动相关性图
-		multipleGraphConfigChartMapping, e := multiple_graph_config_chart_mapping.GetMultipleGraphConfigChartMappingByChartId(chartInfo.ChartInfoId)
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取滚动相关性图表的配置信息失败, Err:" + e.Error()
-			return
-		}
-		baseChartMultipleGraphConfigChartMapping, e := multiple_graph_config_chart_mapping.GetMultipleGraphConfigChartMappingByIdAndSource(multipleGraphConfigChartMapping.MultipleGraphConfigID, 2)
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取相关性图表的配置信息失败, Err:" + e.Error()
-			return
-		}
-
-		baseChartCorrelationChart := new(chart_info_correlation.ChartInfoCorrelation)
-		if e := baseChartCorrelationChart.GetItemById(baseChartMultipleGraphConfigChartMapping.ChartInfoID); e != nil {
-			msg = "获取失败"
-			errMsg = "获取基础相关性图表信息失败, Err:" + e.Error()
-			return
-		}
-
-		moveUnitDays, ok := utils.FrequencyDaysMap[baseChartCorrelationChart.CalculateUnit]
+		moveUnitDays, ok := utils.FrequencyDaysMap[correlationChart.BaseCalculateUnit]
 		if !ok {
 			msg = "错误的分析周期"
 			errMsg = "错误的分析周期"
 			return
 		}
-		startDate := time.Now().AddDate(0, 0, -baseChartCorrelationChart.CalculateValue*moveUnitDays).Format(utils.FormatDate)
+		startDate := time.Now().AddDate(0, 0, -correlationChart.BaseCalculateValue*moveUnitDays).Format(utils.FormatDate)
 		endDate := time.Now().Format(utils.FormatDate)
 		xDateTimeValue, yDataList, e = correlation.GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, correlationChart.LeadValue, correlationChart.LeadUnit, correlationChart.CalculateValue, correlationChart.CalculateUnit, startDate, endDate)
 		dataResp = chart_info.RollingCorrelationChartDataResp{

models/tables/chart_info_correlation/entity.go

@@ -4,19 +4,21 @@ import "time"
 
 // ChartInfoCorrelation 相关性图表-扩展信息
 type ChartInfoCorrelation struct {
-	CorrelationChartInfoId int       `gorm:"primaryKey;column:correlation_chart_info_id;type:int(10) unsigned;not null" json:"-"`       // 相关性图表ID（chart_info表source=3的）
-	LeadValue              int       `gorm:"column:lead_value;type:int(10) unsigned;not null;default:0" json:"leadValue"`               // 领先值
-	LeadUnit               string    `gorm:"column:lead_unit;type:varchar(16);not null;default:''" json:"leadUnit"`                     // 领先单位
-	CalculateValue         int       `gorm:"column:calculate_value;type:int(9);default:null;default:0" json:"calculateValue"`           // 计算窗口
-	CalculateUnit          string    `gorm:"column:calculate_unit;type:varchar(16);default:null;default:''" json:"calculateUnit"`       // 计算窗口的单位
-	StartDate              time.Time `gorm:"column:start_date;type:date" json:"startDate"`                                              // 开始日期
-	EndDate                time.Time `gorm:"column:end_date;type:date" json:"endDate"`                                                  // 结束日期
-	EdbInfoIdFirst         int       `gorm:"column:edb_info_id_first;type:int(10) unsigned;not null;default:0" json:"edbInfoIdFirst"`   // A指标ID
-	EdbInfoIdSecond        int       `gorm:"column:edb_info_id_second;type:int(10) unsigned;not null;default:0" json:"edbInfoIdSecond"` // B指标ID
-	PeriodData             string    `gorm:"column:period_data;type:text" json:"periodData"`                                            // X轴-期数数据
-	CorrelationData        string    `gorm:"column:correlation_data;type:text" json:"correlationData"`                                  // Y轴-相关性系数
-	CreateTime             time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`                                        // 创建时间
-	ModifyTime             time.Time `gorm:"column:modify_time;type:datetime" json:"modifyTime"`                                        // 更新时间
+	CorrelationChartInfoId int       `gorm:"primaryKey;column:correlation_chart_info_id;type:int(10) unsigned;not null" json:"-"`          // 相关性图表ID（chart_info表source=3的）
+	LeadValue              int       `gorm:"column:lead_value;type:int(10) unsigned;not null;default:0" json:"leadValue"`                  // 领先值
+	LeadUnit               string    `gorm:"column:lead_unit;type:varchar(16);not null;default:''" json:"leadUnit"`                        // 领先单位
+	CalculateValue         int       `gorm:"column:calculate_value;type:int(9);default:null;default:0" json:"calculateValue"`              // 计算窗口
+	CalculateUnit          string    `gorm:"column:calculate_unit;type:varchar(16);default:null;default:''" json:"calculateUnit"`          // 计算窗口的单位
+	BaseCalculateValue     int       `gorm:"column:base_calculate_value;type:int(9);default:null;default:0" json:"baseCalculateValue"`     // 基础计算窗口（滚动相关性的时候用到）
+	BaseCalculateUnit      string    `gorm:"column:base_calculate_unit;type:varchar(16);default:null;default:''" json:"baseCalculateUnit"` // 基础计算窗口的单位（滚动相关性的时候用到）
+	StartDate              time.Time `gorm:"column:start_date;type:date" json:"startDate"`                                                 // 开始日期
+	EndDate                time.Time `gorm:"column:end_date;type:date" json:"endDate"`                                                     // 结束日期
+	EdbInfoIdFirst         int       `gorm:"column:edb_info_id_first;type:int(10) unsigned;not null;default:0" json:"edbInfoIdFirst"`      // A指标ID
+	EdbInfoIdSecond        int       `gorm:"column:edb_info_id_second;type:int(10) unsigned;not null;default:0" json:"edbInfoIdSecond"`    // B指标ID
+	PeriodData             string    `gorm:"column:period_data;type:text" json:"periodData"`                                               // X轴-期数数据
+	CorrelationData        string    `gorm:"column:correlation_data;type:text" json:"correlationData"`                                     // Y轴-相关性系数
+	CreateTime             time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`                                           // 创建时间
+	ModifyTime             time.Time `gorm:"column:modify_time;type:datetime" json:"modifyTime"`                                           // 更新时间
 }
 
 // TableName get sql table name.获取数据库表名