Merge remote-tracking branch 'origin/eta/1.3.1' into debug

controllers/data_manage/cross_variety/chart_info.go

@@ -62,7 +62,7 @@ func (c *ChartInfoController) List() {
 
 	source, _ := c.GetInt("Source")
 	if source <= 0 {
-		source = utils.CHART_SOURCE_CORRELATION
+		source = utils.CHART_SOURCE_CROSS_HEDGING
 	}
 
 	var condition string
@@ -191,3 +191,96 @@ func (c *ChartInfoController) List() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// Preview
+// @Title 拟合方程图表-预览数据
+// @Description 拟合方程图表-获取预览数据
+// // @Param	request	body request.LineChartInfoReq true "type json string"
+// @Success 200 {object} data_manage.ChartEdbInfoDetailResp
+// @router /chart_info/preview [post]
+func (c *ChartInfoController) Preview() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	//var req request.ChartConfigReq
+	//if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
+	//	br.Msg = "参数解析异常！"
+	//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
+	//	return
+	//}
+	//lenXdbInfoList := len(req.XEdbInfoIdList)
+	//lenYdbInfoList := len(req.YEdbInfoIdList)
+	//if lenXdbInfoList < 2 {
+	//	br.Msg = "X轴指标不能小于两个"
+	//	br.IsSendEmail = false
+	//	return
+	//}
+	//if lenYdbInfoList < 2 {
+	//	br.Msg = "Y轴指标不能小于两个"
+	//	br.IsSendEmail = false
+	//	return
+	//}
+	//if lenYdbInfoList != lenXdbInfoList {
+	//	br.Msg = "X轴与Y轴指标数量不一致"
+	//	br.IsSendEmail = false
+	//	return
+	//}
+	//
+	//chartInfo := new(data_manage.ChartInfoView)
+	//chartInfo.ChartType = 9
+	//
+	//// 获取图表x轴y轴
+	//_, dataResp, err, errMsg := line_equation.GetChartEdbData(0, req, true, true, true)
+	//if err != nil {
+	//	br.Msg = "获取失败"
+	//	if errMsg != `` {
+	//		br.Msg = errMsg
+	//	}
+	//	br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
+	//	return
+	//}
+	//
+	//resp := response.ChartInfoResp{List: []response.ChartDataResp{
+	//	{
+	//		LatestDate:          dataResp.AData.LatestDate,
+	//		EdbInfoCategoryType: dataResp.AData.EdbInfoCategoryType,
+	//		Name:                dataResp.AData.EdbName,
+	//		NameEn:              dataResp.AData.EdbNameEn,
+	//		MinData:             dataResp.AData.MinData,
+	//		MaxData:             dataResp.AData.MaxData,
+	//		DataList:            dataResp.AData.DataList,
+	//	},
+	//	{
+	//		LatestDate:          dataResp.BData.LatestDate,
+	//		EdbInfoCategoryType: dataResp.BData.EdbInfoCategoryType,
+	//		Name:                dataResp.BData.EdbName,
+	//		NameEn:              dataResp.BData.EdbNameEn,
+	//		MinData:             dataResp.BData.MinData,
+	//		MaxData:             dataResp.BData.MaxData,
+	//		DataList:            dataResp.BData.DataList,
+	//	},
+	//	{
+	//		LatestDate:          dataResp.R2Data.LatestDate,
+	//		EdbInfoCategoryType: dataResp.R2Data.EdbInfoCategoryType,
+	//		Name:                dataResp.R2Data.EdbName,
+	//		NameEn:              dataResp.R2Data.EdbNameEn,
+	//		MinData:             dataResp.R2Data.MinData,
+	//		MaxData:             dataResp.R2Data.MaxData,
+	//		DataList:            dataResp.R2Data.DataList,
+	//	},
+	//}}
+
+	//br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

controllers/data_manage/cross_variety/tag.go

@@ -238,6 +238,39 @@ func (c *TagController) Delete() {
 	br.IsAddLog = true
 }
 
+// List
+// @Title 获取标签中的指标与品种的映射关系
+// @Description 获取标签中的指标与品种的映射关系
+// @Param   ChartTagId   query   int  true       "标签id"
+// @Success 200 Ret=200 保存成功
+// @router /tag/list [get]
+func (c *TagController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	// 获取数据
+	list, err := cross_variety.GetTagList()
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败，ERR：" + err.Error()
+		return
+	}
+	dataCount := len(list)
+	page := paging.GetPaging(1, dataCount, dataCount)
+
+	resp := response.TagListResp{
+		List:   list,
+		Paging: page,
+	}
+
+	br.Ret = 200
+	br.Msg = "获取成功"
+	br.Success = true
+	br.Data = resp
+}
+
 // VarietyEdbList
 // @Title 获取标签中的指标与品种的映射关系
 // @Description 获取标签中的指标与品种的映射关系

controllers/data_manage/cross_variety/variety.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/cross_variety/request"
 	"eta/eta_api/models/data_manage/cross_variety/response"
 	"eta/eta_api/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -236,3 +237,35 @@ func (c *VarietyController) Delete() {
 	br.Success = true
 	br.IsAddLog = true
 }
+
+// List
+// @Title 获取标签中的指标与品种的映射关系
+// @Description 获取标签中的指标与品种的映射关系
+// @Success 200 Ret=200 保存成功
+// @router /variety/list [get]
+func (c *VarietyController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	// 获取数据
+	list, err := cross_variety.GetVarietyList()
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败，ERR：" + err.Error()
+		return
+	}
+	dataCount := len(list)
+	page := paging.GetPaging(1, dataCount, dataCount)
+
+	resp := response.VarietyListResp{
+		List:   list,
+		Paging: page,
+	}
+
+	br.Ret = 200
+	br.Msg = "获取成功"
+	br.Success = true
+	br.Data = resp
+}

models/data_manage/cross_variety/chart_tag.go

@@ -64,6 +64,20 @@ func AddTag(item *ChartTag) (err error) {
 	return
 }
 
+// GetTagList
+// @Description: 获取所有标签列表
+// @author: Roc
+// @datetime 2023-11-22 10:44:35
+// @return items []*ChartTag
+// @return err error
+func GetTagList() (items []*ChartTag, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
+	_, err = o.Raw(sql).QueryRows(&items)
+
+	return
+}
+
 // Update
 // @Description: 更新标签
 // @author: Roc

models/data_manage/cross_variety/chart_variety.go

@@ -84,3 +84,17 @@ func (item *ChartVariety) Delete() (err error) {
 	_, err = o.Delete(item)
 	return
 }
+
+// GetVarietyList
+// @Description: 获取所有品种列表
+// @author: Roc
+// @datetime 2023-11-22 10:44:35
+// @return items []*ChartVariety
+// @return err error
+func GetVarietyList() (items []*ChartVariety, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM chart_variety WHERE 1 = 1 `
+	_, err = o.Raw(sql).QueryRows(&items)
+
+	return
+}

models/data_manage/cross_variety/request/chart.go

@@ -0,0 +1,20 @@
+package request
+
+// ChartConfigReq
+// @Description: 图表配置
+type ChartConfigReq struct {
+	TagX           int    `description:"X轴的标签ID"`
+	TagY           int    `description:"Y轴的标签ID"`
+	DateType       int    `description:"日期类型"`
+	StartDate      string `description:"开始日期"`
+	EndDate        string `description:"结束日期"`
+	XEdbInfoIdList []int  `description:"X轴的指标id列表"`
+	YEdbInfoIdList []int  `description:"Y轴的指标id列表"`
+	Source         int    `description:"来源，5：斜率图；6：截距图；7：相关性图"`
+}
+
+type AddChartInfoReq struct {
+	//MultipleGraphConfigId int              `description:"统一配置id,有的话就是编辑，没有则是新增"`
+	//BatchAddChart         []AddChart       `description:"批量创建图的信息"`
+	//ExtraConfig           LineChartInfoReq `description:"图表额外配置信息"`
+}

models/data_manage/cross_variety/response/tag.go

@@ -11,6 +11,13 @@ type TagDeleteCheckResp struct {
 	TipsMsg      string `description:"提示信息"`
 }
 
+// TagListResp
+// @Description: 标签列表数据
+type TagListResp struct {
+	List   []*cross_variety.ChartTag `description:"列表数据"`
+	Paging *paging.PagingItem
+}
+
 // VarietyEdbListResp
 // @Description: 品种与关系的数据返回
 type VarietyEdbListResp struct {

models/data_manage/cross_variety/response/variety.go

@@ -1,7 +1,19 @@
 package response
 
+import (
+	"eta/eta_api/models/data_manage/cross_variety"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
 // VarietyDeleteCheckResp 品种删除检测数据返回
 type VarietyDeleteCheckResp struct {
 	DeleteStatus int    `description:"检测状态:0:默认值，如果为0，继续走其他校验，1:已关联图表的品种，不允许删除！"`
 	TipsMsg      string `description:"提示信息"`
 }
+
+// VarietyListResp
+// @Description: 品种列表数据
+type VarietyListResp struct {
+	List   []*cross_variety.ChartVariety `description:"列表数据"`
+	Paging *paging.PagingItem
+}

routers/commentsRouter.go

@@ -187,6 +187,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"],
+        beego.ControllerComments{
+            Method: "Preview",
+            Router: `/chart_info/preview`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ClassifyController"],
         beego.ControllerComments{
             Method: "DeleteChartClassify",
@@ -268,6 +277,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:TagController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:TagController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/tag/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:TagController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:TagController"],
         beego.ControllerComments{
             Method: "VarietyEdbList",
@@ -322,6 +340,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:VarietyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:VarietyController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/variety/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:CustomAnalysisController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:CustomAnalysisController"],
         beego.ControllerComments{
             Method: "Add",