|
|
@@ -16,6 +16,7 @@ import (
|
|
|
"hongze/hongze_yb/models/tables/chart_info_future_good_profit"
|
|
|
"hongze/hongze_yb/models/tables/chart_info_log"
|
|
|
"hongze/hongze_yb/models/tables/yb_my_chart"
|
|
|
+ "hongze/hongze_yb/services"
|
|
|
"hongze/hongze_yb/services/alarm_msg"
|
|
|
"hongze/hongze_yb/services/chart"
|
|
|
"hongze/hongze_yb/services/chart/correlation"
|
|
|
@@ -114,6 +115,8 @@ func CommonChartInfoDetailFromUniqueCode(c *gin.Context) {
|
|
|
resp, isOk, msg, errMsg = getLineFeatureChartInfoDetailFromUniqueCode(chartInfo, myChartClassifyId, user.GetInfoByClaims(c))
|
|
|
case utils.CHART_SOURCE_CROSS_HEDGING:
|
|
|
resp, isOk, msg, errMsg = GetCrossVarietyChartInfoDetailFromUniqueCode(chartInfo, myChartClassifyId, user.GetInfoByClaims(c))
|
|
|
+ case utils.CHART_SOURCE_RANGE_ANALYSIS:
|
|
|
+ resp, isOk, msg, errMsg = getRangeAnalysisChartInfoDetail(chartInfo, myChartClassifyId, user.GetInfoByClaims(c))
|
|
|
default:
|
|
|
msg := "错误的图表"
|
|
|
errMsg := "错误的图表"
|
|
|
@@ -1210,3 +1213,69 @@ func RefreshCorrelationChartInfo(c *gin.Context) {
|
|
|
}
|
|
|
response.OkData("刷新成功", "", c)
|
|
|
}
|
|
|
+
|
|
|
+func getRangeAnalysisChartInfoDetail(chartInfo *chartInfoModel.ChartInfoView, myChartClassifyId int, userInfo user.UserInfo) (resp *chart_info.ChartInfoDetailResp, isOk bool, msg, errMsg string) {
|
|
|
+ resp = new(chart_info.ChartInfoDetailResp)
|
|
|
+ //调用接口
|
|
|
+ chartData, e := services.GetRangeChartChartDetail(chartInfo.UniqueCode)
|
|
|
+ if e != nil {
|
|
|
+ msg = "获取失败"
|
|
|
+ errMsg = "获取图表信息失败, Err:" + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ chartDataResp := new(chart_info.ChartInfoDetailResp)
|
|
|
+ // 兼容返回值类型
|
|
|
+ chartDataString, _ := json.Marshal(chartData)
|
|
|
+ err := json.Unmarshal(chartDataString, chartDataResp)
|
|
|
+ if err != nil {
|
|
|
+ msg = "获取失败"
|
|
|
+ errMsg = "获取图表信息失败, Err:" + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ chartInfo = chartDataResp.ChartInfo
|
|
|
+ yDataList := chartDataResp.YDataList
|
|
|
+ edbList := chartDataResp.EdbInfoList
|
|
|
+ xEdbIdValue := chartDataResp.XEdbIdValue
|
|
|
+ dataResp := chartDataResp.DataResp
|
|
|
+ // 访问记录-仅普通用户记录
|
|
|
+ ok, _, _ := user.GetAdminByUserInfo(userInfo)
|
|
|
+ if !ok {
|
|
|
+ go chart.SaveChartVisitLog(userInfo, chartInfo, myChartClassifyId)
|
|
|
+ }
|
|
|
+
|
|
|
+ // 用户是否有收藏该图表
|
|
|
+ {
|
|
|
+ ob := new(yb_my_chart.YbMyChart)
|
|
|
+ cond := `user_id = ? AND chart_info_id = ?`
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+ pars = append(pars, userInfo.UserID, chartInfo.ChartInfoId)
|
|
|
+ exists, e := ob.FetchByCondition(cond, pars)
|
|
|
+ if e != nil && e != utils.ErrNoRow {
|
|
|
+ msg = `操作失败`
|
|
|
+ errMsg = "获取用户图表失败, Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ myChartInfo := new(responseModel.MyChartItem)
|
|
|
+ if exists != nil && exists.MyChartID > 0 {
|
|
|
+ myChartInfo.MyChartID = exists.MyChartID
|
|
|
+ myChartInfo.MyChartClassifyID = exists.MyChartClassifyID
|
|
|
+ myChartInfo.ChartInfoID = exists.ChartInfoID
|
|
|
+ myChartInfo.ChartName = exists.ChartName
|
|
|
+ myChartInfo.UniqueCode = exists.UniqueCode
|
|
|
+ myChartInfo.ChartImage = exists.ChartImage
|
|
|
+ myChartInfo.UserID = exists.UserID
|
|
|
+ myChartInfo.ReportID = exists.ReportID
|
|
|
+ myChartInfo.ReportChapterID = exists.ReportChapterID
|
|
|
+ myChartInfo.CreateTime = utils.TimeTransferString(utils.FormatDateTime, exists.CreateTime)
|
|
|
+ }
|
|
|
+
|
|
|
+ resp.MyChartInfo = myChartInfo
|
|
|
+ }
|
|
|
+ resp.ChartInfo = chartInfo
|
|
|
+ resp.EdbInfoList = edbList
|
|
|
+ resp.XEdbIdValue = xEdbIdValue
|
|
|
+ resp.YDataList = yDataList
|
|
|
+ resp.DataResp = dataResp
|
|
|
+ isOk = true
|
|
|
+ return
|
|
|
+}
|
