Merge branch 'feature/eta_1.6.8' into debug

controllers/data_manage/cross_variety/chart_info.go

@@ -1575,3 +1575,89 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	isOk = true
 	return
 }
+
+// Save
+// @Title 保存图表
+// @Description 保存图表
+// @Param	request	body request.SaveChartReq true "type json string"
+// @Success Ret=200 保存成功
+// @router /chart_info/save [post]
+func (c *ChartInfoController) Save() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = true
+		}
+		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.SaveChartReq
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.ChartInfoId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartInfoId: %d", req.ChartInfoId)
+		return
+	}
+
+	chartItem, e := data_manage.GetChartInfoById(req.ChartInfoId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "图表已被删除, 请刷新页面"
+			return
+		}
+		br.Msg = "保存失败"
+		br.ErrMsg = "获取图表信息失败, Err: " + e.Error()
+		return
+	}
+
+	// 更新图表上下限
+	chartItem.LeftMin = req.LeftMin
+	chartItem.LeftMax = req.LeftMax
+	chartItem.XMin = req.XMin
+	chartItem.XMax = req.XMax
+	chartUpdateCols := []string{"ChartName", "ExtraConfig", "ModifyTime", "LeftMin", "LeftMax", "XMin", "XMax"}
+	if e = chartItem.Update(chartUpdateCols); e != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "更新图表上下限失败, Err: " + e.Error()
+		return
+	}
+
+	resp := new(data_manage.AddChartInfoResp)
+	resp.ChartInfoId = chartItem.ChartInfoId
+	resp.UniqueCode = chartItem.UniqueCode
+
+	// 新增操作日志
+	{
+		chartLog := new(data_manage.ChartInfoLog)
+		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.CreateTime = time.Now()
+		chartLog.Content = string(c.Ctx.Input.RequestBody)
+		chartLog.Status = "保存跨品种分析图表"
+		chartLog.Method = c.Ctx.Input.URL()
+		go data_manage.AddChartInfoLog(chartLog)
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "保存成功"
+	br.Data = resp
+	br.IsAddLog = true
+}

models/data_manage/chart_info.go

@@ -32,6 +32,8 @@ type ChartInfo struct {
 	SeasonEndDate     string `description:"季节性图开始日期"`
 	ChartImage        string `description:"图表图片"`
 	Sort              int    `description:"排序字段，数字越小越排前面"`
+	XMin              string `description:"图表X轴最小值"`
+	XMax              string `description:"图表X轴最大值"`
 	LeftMin           string `description:"图表左侧最小值"`
 	LeftMax           string `description:"图表左侧最大值"`
 	RightMin          string `description:"图表右侧最小值"`
@@ -1343,6 +1345,8 @@ type ChartInfoView struct {
 	MyChartClassifyId string `description:"我的图表分类，多个用逗号隔开"`
 	ChartClassify     []*ChartClassifyView
 	EdbEndDate        string `description:"指标最新更新日期"`
+	XMin              string `description:"图表X轴最小值"`
+	XMax              string `description:"图表X轴最大值"`
 	LeftMin           string `description:"图表左侧最小值"`
 	LeftMax           string `description:"图表左侧最大值"`
 	RightMin          string `description:"图表右侧最小值"`

models/data_manage/cross_variety/request/chart.go

@@ -25,6 +25,8 @@ type ChartConfigDate struct {
 // @Description: 添加图表的请求
 type AddChartReq struct {
 	ChartName      string `description:"图表名称"`
+	XMin           string `description:"图表X轴最小值"`
+	XMax           string `description:"图表X轴最大值"`
 	LeftMin        string `description:"图表左侧最小值"`
 	LeftMax        string `description:"图表左侧最大值"`
 	ChartImage     string `description:"图表截图，复制的时候才用到" json:"-"`
@@ -43,6 +45,8 @@ type AddChartReq struct {
 type EditChartReq struct {
 	ChartInfoId    int    `description:"图表id"`
 	ChartName      string `description:"图表名称"`
+	XMin           string `description:"图表X轴最小值"`
+	XMax           string `description:"图表X轴最大值"`
 	LeftMin        string `description:"图表左侧最小值"`
 	LeftMax        string `description:"图表左侧最大值"`
 	ChartImage     string `description:"图表截图，复制的时候才用到" json:"-"`
@@ -78,3 +82,13 @@ type VarietyNameEnReq struct {
 	ChartVarietyId int    `json:"ChartVarietyId"`
 	VarietyNameEn  string `json:"VarietyNameEn"`
 }
+
+// SaveChartReq
+// @Description: 保存图表的请求
+type SaveChartReq struct {
+	ChartInfoId int    `description:"图表ID"`
+	XMin        string `description:"图表X轴最小值"`
+	XMax        string `description:"图表X轴最大值"`
+	LeftMin     string `description:"图表左侧最小值"`
+	LeftMax     string `description:"图表左侧最大值"`
+}

routers/commentsRouter.go

@@ -160,6 +160,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage/cross_variety:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage/cross_variety:ChartInfoController"],
+        beego.ControllerComments{
+            Method: "Save",
+            Router: `/chart_info/save`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage/cross_variety:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage/cross_variety:ChartInfoController"],
         beego.ControllerComments{
             Method: "SearchByEs",

services/data/cross_variety/chart.go

@@ -68,6 +68,7 @@ type CoordinatePoint struct {
 	YDate      string
 	DateType   int `description:"日期类型：1-最新日期；2-N天前；3-固定日期"`
 	DaysAgo    int `description:"N天前的N值"`
+	ShowTips   int `description:"是否显示标注：0-否；1-是"`
 }
 
 // GetChartData
@@ -165,10 +166,12 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 	dateMap := make(map[string]string)
 	dateTypeMap := make(map[int]int) // 日期配置key对应的日期类型
 	daysAgoMap := make(map[int]int)  // 日期配置key对应的N天前的N值
+	showTipsMap := make(map[int]int) // 日期配置key对应点是否显示标注
 
 	for dateIndex, dateConfig := range config.DateConfigList {
 		dateTypeMap[dateIndex] = dateConfig.DateType
 		daysAgoMap[dateIndex] = dateConfig.Num
+		showTipsMap[dateIndex] = dateConfig.ShowTips
 		for _, edbInfoMapping := range mappingList {
 			// 数据会是正序的
 			dataList, ok := edbDataListMap[edbInfoMapping.EdbInfoId]
@@ -423,6 +426,7 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 				YDate:      dateMap[key2],
 				DateType:   dateTypeMap[dateIndex], // 日期类型
 				DaysAgo:    daysAgoMap[dateIndex],  // N天前的N值
+				ShowTips:   showTipsMap[dateIndex], // 是否显示标注
 			})
 		}
 
@@ -698,6 +702,8 @@ func AddChartInfo(req request.AddChartReq, sysUser *system.Admin) (chartInfo *da
 	//chartInfo.SeasonEndDate = req.EndDate
 	chartInfo.LeftMin = req.LeftMin
 	chartInfo.LeftMax = req.LeftMax
+	chartInfo.XMin = req.XMin
+	chartInfo.XMax = req.XMax
 	//chartInfo.RightMin = req.RightMin
 	//chartInfo.RightMax = req.RightMax
 	//chartInfo.Disabled = disableVal
@@ -877,7 +883,11 @@ func EditChartInfo(req request.EditChartReq, sysUser *system.Admin) (chartItem *
 	chartItem.ChartName = req.ChartName
 	chartItem.ExtraConfig = string(extraConfigByte)
 	chartItem.ModifyTime = time.Now()
-	chartUpdateCols := []string{"ChartName", "ExtraConfig", "ModifyTime"}
+	chartItem.LeftMin = req.LeftMin
+	chartItem.LeftMax = req.LeftMax
+	chartItem.XMin = req.XMin
+	chartItem.XMax = req.XMax
+	chartUpdateCols := []string{"ChartName", "ExtraConfig", "ModifyTime", "LeftMin", "LeftMax", "XMin", "XMax"}
 
 	// 跨品种分析配置
 	chartInfoCrossVariety, err := cross_varietyModel.GetChartInfoCrossVarietyByChartInfoId(chartItem.ChartInfoId)