Merge remote-tracking branch 'origin/14.8' into debug

models/data_manage/line_equation/response/line_equation.go

@@ -1,37 +0,0 @@
-package response
-
-import (
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/line_equation/request"
-)
-
-type ChartInfoResp struct {
-	List []ChartDataResp `description:"数据列表"`
-}
-
-// ChartDataResp 图表数据
-type ChartDataResp struct {
-	LatestDate          string  `description:"真实数据的日期"`
-	Name                string  `description:"名称"`
-	NameEn              string  `description:"英文名称"`
-	EdbInfoCategoryType int     `description:"普通数据还是预测数据，0：普通，1：预测"`
-	MaxData             float64 `description:"最大值"`
-	MinData             float64 `description:"最小值"`
-	DataList            []data_manage.EdbDataList
-}
-
-// MultipleGraphConfigDetailResp 配置详情接口返回
-type MultipleGraphConfigDetailResp struct {
-	MultipleGraphConfigId int
-	LineChartInfoConfig   request.LineChartInfoReq
-	EdbInfoList           []*data_manage.ChartEdbInfoMapping
-	ChartMappingList      []MultipleGraphConfigChartMapping `description:"关联图表"`
-}
-type MultipleGraphConfigChartMapping struct {
-	ChartInfoId int `description:"图表id"`
-	Source      int `description:"来源,5:斜率图，6：截距图；7：相关性图；"`
-}
-type MultipleGraphConfigEdbMapping struct {
-	EdbInfoId int `description:"图表id"`
-	Source    int `description:"来源,5:斜率图，6：截距图；7：相关性图；"`
-}

utils/constants.go

@@ -141,12 +141,15 @@ var (
 
 // 图表类型
 const (
-	CHART_SOURCE_DEFAULT             = 1
-	CHART_SOURCE_FUTURE_GOOD         = 2
-	CHART_SOURCE_CORRELATION         = 3 // 相关性图表
-	CHART_SOURCE_ROLLING_CORRELATION = 4 // 滚动相关性图表
-	CHART_SOURCE_FUTURE_GOOD_PROFIT  = 5 // 商品利润曲线
-	CHART_SOURCE_LINE_EQUATION       = 6 // 拟合方程图表
+	CHART_SOURCE_DEFAULT                         = 1
+	CHART_SOURCE_FUTURE_GOOD                     = 2
+	CHART_SOURCE_CORRELATION                     = 3 // 相关性图表
+	CHART_SOURCE_ROLLING_CORRELATION             = 4 // 滚动相关性图表
+	CHART_SOURCE_FUTURE_GOOD_PROFIT              = 5 // 商品利润曲线
+	CHART_SOURCE_LINE_EQUATION                   = 6 // 拟合方程图表
+	CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION = 7 // 统计特征-标准差图表
+	CHART_SOURCE_LINE_FEATURE_PERCENTILE         = 8 // 统计特征-百分位图表
+	CHART_SOURCE_LINE_FEATURE_FREQUENCY          = 9 // 统计特征-频率分布图表
 )
 
 // 图表样式类型