相关性图表

models/tables/factor_edb_series_chart_mapping/model.go

@@ -0,0 +1,28 @@
+package factor_edb_series_chart_mapping
+
+import (
+	"hongze/hongze_yb/global"
+	"time"
+)
+
+// FactorEdbSeriesChartMapping 因子指标系列-图表关联
+type FactorEdbSeriesChartMapping struct {
+	FactorEdbSeriesChartMappingId int       `orm:"column(factor_edb_series_chart_mapping_id);pk"`
+	ChartInfoId                   int       `description:"图表ID"`
+	Source                        int       `description:"图表来源, 同chart_info表source"`
+	CalculateType                 int       `description:"计算方式: 1-相关性"`
+	CalculatePars                 string    `description:"计算参数-JSON(如计算窗口等)"`
+	CalculateData                 string    `description:"计算数据-JSON(如相关性矩阵等)"`
+	FactorEdbSeriesId             int       `description:"因子指标系列ID"`
+	EdbInfoId                     int       `description:"指标ID"`
+	EdbUsed                       int       `description:"指标是否使用: 0-否; 1-是"`
+	CreateTime                    time.Time `description:"创建时间"`
+	ModifyTime                    time.Time `description:"修改时间"`
+}
+
+// GetChartUsedFactorSeriesEdb 获取图表引用的系列指标
+func GetChartUsedFactorSeriesEdb(chartId int) (items []*FactorEdbSeriesChartMapping, err error) {
+	sql := `SELECT * FROM factor_edb_series_chart_mapping WHERE chart_info_id = ? AND edb_used = 1`
+	err = global.MYSQL["data"].Raw(sql, chartId).Scan(&items).Error
+	return
+}

models/tables/factor_edb_series_mapping/model.go

@@ -1,26 +0,0 @@
-package factor_edb_series_mapping
-
-import (
-	"hongze/hongze_yb/global"
-	"time"
-)
-
-// FactorEdbSeriesMapping 因子指标系列-指标关联表
-type FactorEdbSeriesMapping struct {
-	FactorEdbSeriesMappingId int       `orm:"column(factor_edb_series_mapping_id);pk"`
-	FactorEdbSeriesId        int       `description:"因子指标系列ID"`
-	EdbInfoId                int       `description:"指标ID"`
-	EdbCode                  string    `description:"指标编码"`
-	CalculateData            string    `description:"计算数据-JSON（如相关性矩阵等等）"`
-	CreateTime               time.Time `description:"创建时间"`
-	ModifyTime               time.Time `description:"修改时间"`
-}
-
-// GetChartUsedFactorSeriesEdb 获取图表引用的系列指标
-func GetChartUsedFactorSeriesEdb(chartId int) (items []*FactorEdbSeriesMapping, err error) {
-	sql := `SELECT b.* FROM factor_edb_series_chart_mapping AS a
-	JOIN factor_edb_series_mapping AS b ON a.factor_edb_series_id = b.factor_edb_series_id AND a.edb_info_id = b.edb_info_id
-	WHERE a.chart_info_id = ? ORDER BY factor_edb_series_id ASC`
-	err = global.MYSQL["data"].Raw(sql, chartId).Scan(&items).Error
-	return
-}

services/chart/correlation/chart_info.go

@@ -11,7 +11,7 @@ import (
 	"hongze/hongze_yb/models/tables/edb_data"
 	edbDataModel "hongze/hongze_yb/models/tables/edb_data"
 	"hongze/hongze_yb/models/tables/factor_edb_series"
-	"hongze/hongze_yb/models/tables/factor_edb_series_mapping"
+	"hongze/hongze_yb/models/tables/factor_edb_series_chart_mapping"
 	"hongze/hongze_yb/services/alarm_msg"
 	"hongze/hongze_yb/services/chart"
 	"hongze/hongze_yb/utils"
@@ -651,7 +651,7 @@ func GetFactorChartDataByChartId(chartInfoId int, extraConfig string) (xEdbIdVal
 	}
 
 	// 获取图表引用到的系列指标
-	edbMappings, e := factor_edb_series_mapping.GetChartUsedFactorSeriesEdb(chartInfoId)
+	chartMappings, e := factor_edb_series_chart_mapping.GetChartUsedFactorSeriesEdb(chartInfoId)
 	if e != nil {
 		err = fmt.Errorf("获取图表引用系列指标失败, err: %v", e)
 		return
@@ -660,7 +660,7 @@ func GetFactorChartDataByChartId(chartInfoId int, extraConfig string) (xEdbIdVal
 	// 取出计算结果
 	yDataList = make([]chart_info.YData, 0)
 	yDate := "0000-00-00"
-	for k, m := range edbMappings {
+	for k, m := range chartMappings {
 		var values []factor_edb_series.FactorEdbSeriesCorrelationMatrixValues
 		if m.CalculateData != "" {
 			e = json.Unmarshal([]byte(m.CalculateData), &values)