feat：新增商品利润曲线图

controllers/chart_common.go

@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"hongze/hongze_chart_lib/models"
 	"hongze/hongze_chart_lib/models/data_manage"
+	"hongze/hongze_chart_lib/models/data_manage/future_good"
+	"hongze/hongze_chart_lib/models/data_manage/future_good/request"
+	"hongze/hongze_chart_lib/models/data_manage/future_good/response"
 	"hongze/hongze_chart_lib/services/data"
 	correlationServ "hongze/hongze_chart_lib/services/data/correlation"
 	future_goodServ "hongze/hongze_chart_lib/services/data/future_good"
@@ -87,6 +90,17 @@ func (this *ChartController) CommonChartInfoDetailFromUniqueCode() {
 		br.Success = true
 		br.Msg = "获取成功"
 		br.Data = resp
+	case utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
+		resp, isOk, msg, errMsg := GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo, key)
+		if !isOk {
+			br.Msg = msg
+			br.ErrMsg = errMsg
+			return
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
 	case utils.CHART_SOURCE_CORRELATION, utils.CHART_SOURCE_ROLLING_CORRELATION:
 		resp, isOk, msg, errMsg := GetCorrelationChartInfoDetailFromUniqueCode(chartInfo, key)
 		if !isOk {
@@ -206,6 +220,97 @@ func GetFutureGoodChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key
 	return
 }
 
+// GetFutureGoodProfitChartInfoDetailFromUniqueCode 根据编码获取商品利润图表详情
+func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key string) (resp *models.ChartInfoDetailResp, isOk bool, msg, errMsg string) {
+	resp = new(models.ChartInfoDetailResp)
+
+	chartInfoId := chartInfo.ChartInfoId
+
+	// 商品利润曲线图的一些配置
+	var extraConf request.ChartInfoReq
+	err := json.Unmarshal([]byte(chartInfo.ExtraConfig), &extraConf)
+	if err != nil {
+		msg = "商品利润曲线图配置异常"
+		errMsg = "商品利润曲线图配置异常，Err:" + err.Error()
+		return
+	}
+
+	edbList := make([]*models.ChartEdbInfoMapping, 0)
+	edbInfoMapping, err := models.GetEtaEdbChartEdbMapping(chartInfoId)
+	if err != nil {
+		msg = "获取失败"
+		errMsg = "获取商品利润图表，基础指标信息失败，Err:" + err.Error()
+		return
+	}
+	edbList = append(edbList, edbInfoMapping)
+	futureGoodEdbInfoMappingList, err := models.GetFutureGoodEdbChartEdbMappingList(chartInfoId)
+	if err != nil {
+		msg = "获取失败"
+		errMsg = "获取商品利润图表，商品指标信息失败，Err:" + err.Error()
+		return
+	}
+	edbList = append(edbList, futureGoodEdbInfoMappingList...)
+	if len(edbList) <= 0 {
+		msg = "商品利润曲线图表指标异常"
+		errMsg = "商品利润曲线图表指标异常"
+		return
+	}
+
+	xDataList := make([]models.XData, 0)
+	yDataList := make([]models.YData, 0)
+
+	// 查找商品利润图表的扩展信息
+	chartInfoFutureGoodProfit := new(future_good.ChartInfoFutureGoodProfit)
+	if err = chartInfoFutureGoodProfit.GetItemById(chartInfo.ChartInfoId); err != nil {
+		msg = "获取失败"
+		errMsg = "获取基础相关性图表信息失败, Err: " + err.Error()
+		return
+	}
+
+	err = json.Unmarshal([]byte(chartInfoFutureGoodProfit.XValue), &xDataList)
+	if err != nil {
+		msg = "获取失败"
+		errMsg = "转换X轴数据失败, Err: " + err.Error()
+		return
+	}
+
+	err = json.Unmarshal([]byte(chartInfoFutureGoodProfit.YValue), &yDataList)
+	if err != nil {
+		msg = "获取失败"
+		errMsg = "转换Y轴数据失败, Err: " + err.Error()
+		return
+	}
+
+	warnEdbList := make([]string, 0)
+	baseEdbInfo := edbList[0] //现货指标
+	for _, v := range edbList {
+		if v.IsNullData {
+			warnEdbList = append(warnEdbList, v.EdbName+"("+v.EdbCode+")")
+		}
+	}
+
+	chartInfo.UnitEn = baseEdbInfo.UnitEn
+
+	resp.ChartInfo = chartInfo
+	resp.EdbInfoList = edbList
+	resp.DataResp = response.ProfitFutureGoodChartResp{
+		YDataList:    yDataList,
+		XDataList:    xDataList,
+		ProfitName:   chartInfoFutureGoodProfit.ProfitName + "盘面利润",
+		ProfitEnName: chartInfoFutureGoodProfit.ProfitEnName,
+		Extra:        extraConf,
+	}
+
+	// 将数据加入缓存
+	if utils.Re == nil {
+		data, _ := json.Marshal(resp)
+		utils.Rc.Put(key, data, 2*time.Hour)
+	}
+	isOk = true
+
+	return
+}
+
 // FutureGoodChartInfoRefresh
 // @Title 商品价格图表刷新接口
 // @Description 商品价格图表刷新接口

models/chart_edb_mapping.go

@@ -32,6 +32,19 @@ func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping
 	return
 }
 
+// GetFutureGoodEdbChartEdbMappingList       商品曲线图查询对应的商品指标
+func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	o := orm.NewOrmUsingDB("data")
+	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
+	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
+             FROM chart_edb_mapping AS a
+			 INNER JOIN future_good_edb_info AS b ON a.edb_info_id=b.future_good_edb_info_id
+			 WHERE a.chart_info_id=? AND a.source = ?
+             ORDER BY chart_edb_mapping_id ASC `
+	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRows(&items)
+	return
+}
+
 // GetChartEdbMappingByEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
 	o := orm.NewOrmUsingDB("data")

models/data_manage/future_good/chart_info_future_good_profit.go

@@ -0,0 +1,88 @@
+package future_good
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"strings"
+	"time"
+)
+
+// ChartInfoFutureGoodProfit 商品利润图表-扩展信息
+type ChartInfoFutureGoodProfit struct {
+	ChartInfoId  int       `orm:"column(chart_info_id);pk" description:"商品利润图表ID(chart_info表source=5的)"`
+	ProfitName   string    `description:"利润名称"`
+	ProfitEnName string    `description:"利润英文名称"`
+	XValue       string    `description:"X轴数据值"`
+	YValue       string    `description:"Y轴数据值"`
+	CreateTime   time.Time `description:"创建时间"`
+	ModifyTime   time.Time `description:"更新时间"`
+}
+
+type CorrelationInfo struct {
+	LeadValue       int    `description:"领先值"`
+	LeadUnit        string `description:"领先单位"`
+	CalculateValue  int    `description:"计算窗口"`
+	CalculateUnit   string `description:"计算频度"`
+	StartDate       string `description:"开始日期"`
+	EndDate         string `description:"结束日期"`
+	EdbInfoIdFirst  int    `description:"A指标ID"`
+	EdbInfoIdSecond int    `description:"B指标ID"`
+	PeriodData      string `description:"X轴-期数数据"`
+	CorrelationData string `description:"Y轴-商品利润系数"`
+}
+
+func (m *ChartInfoFutureGoodProfit) TableName() string {
+	return "chart_info_future_good_profit"
+}
+
+func (m *ChartInfoFutureGoodProfit) Create() (err error) {
+	o := orm.NewOrmUsingDB("data")
+	_, err = o.Insert(m)
+	if err != nil {
+		return
+	}
+	//m.CorrelationChartInfoId = int(id)
+	return
+}
+
+func (m *ChartInfoFutureGoodProfit) Update(cols []string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	_, err = o.Update(m, cols...)
+	return
+}
+
+func (m *ChartInfoFutureGoodProfit) Delete() (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := fmt.Sprintf(`DELETE FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
+	_, err = o.Raw(sql, m.ChartInfoId).Exec()
+	return
+}
+
+func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
+	err = o.Raw(sql, id).QueryRow(&m)
+	return
+}
+
+func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	err = o.Raw(sql, pars).QueryRow(&m)
+	return
+}
+
+func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartInfoFutureGoodProfit, err error) {
+	o := orm.NewOrmUsingDB("data")
+	fields := strings.Join(fieldArr, ",")
+	if len(fieldArr) == 0 {
+		fields = `*`
+	}
+	order := ``
+	if orderRule != "" {
+		order = ` ORDER BY ` + orderRule
+	}
+	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

models/data_manage/future_good/request/future_good_chart.go

@@ -5,3 +5,28 @@ type EditChartEnInfoReq struct {
 	ChartNameEn string `description:"英文图表名称"`
 	UnitEn      string `description:"英文单位"`
 }
+
+// ChartInfoReq 图表预览请求数据
+type ChartInfoReq struct {
+	FutureGoodEdbInfoIdList []EdbInfoFromTag   `description:"指标信息"`
+	CalculateFormula        string             `description:"计算公式"`
+	BaseEdbInfoId           int                `description:"基础的指标id"`
+	DateList                []ChartInfoDateReq `description:"日期配置"`
+	ProfitEnName            string             `description:"利润英文名称"`
+}
+
+// EdbInfoFromTag 计算指标的关联指标
+type EdbInfoFromTag struct {
+	EdbInfoId int    `description:"指标id"`
+	FromTag   string `description:"指标对应标签"`
+	MoveValue int    `description:"移动的值"`
+}
+
+// ChartInfoDateReq 图表的日期数据（日期相关）
+type ChartInfoDateReq struct {
+	Type  int    `description:"配置类型"`
+	Date  string `description:"固定日期"`
+	Value int    `description:"N天的值"`
+	Color string `description:"颜色"`
+	Name  string `description:"别名"`
+}

models/data_manage/future_good/response/future_good_chart_profit.go

@@ -0,0 +1,15 @@
+package response
+
+import (
+	"hongze/hongze_chart_lib/models"
+	"hongze/hongze_chart_lib/models/data_manage/future_good/request"
+)
+
+// ProfitFutureGoodChartResp 商品利润图
+type ProfitFutureGoodChartResp struct {
+	XDataList    []models.XData
+	YDataList    []models.YData
+	ProfitName   string               `description:"利润的名称"`
+	ProfitEnName string               `description:"利润的英文名称"`
+	Extra        request.ChartInfoReq `description:"柱方图的配置"`
+}

models/db.go

@@ -54,7 +54,8 @@ func init() {
 func initFutureGood() {
 	//注册对象
 	orm.RegisterModel(
-		new(future_good.FutureGoodEdbInfo), //期货指标表
-		new(future_good.FutureGoodEdbData), //期货指标数据表
+		new(future_good.FutureGoodEdbInfo),         //期货指标表
+		new(future_good.FutureGoodEdbData),         //期货指标数据表
+		new(future_good.ChartInfoFutureGoodProfit), //期货利润图的扩展表
 	)
 }

utils/constants.go

@@ -139,6 +139,7 @@ const (
 	CHART_SOURCE_FUTURE_GOOD         = 2
 	CHART_SOURCE_CORRELATION         = 3 // 相关性图表
 	CHART_SOURCE_ROLLING_CORRELATION = 4 // 滚动相关性图表
+	CHART_SOURCE_FUTURE_GOOD_PROFIT  = 5 // 商品利润曲线
 )
 
 // 图表样式类型