|
@@ -8,7 +8,7 @@ import (
|
|
|
"eta/eta_index_lib/models/future_good"
|
|
|
"eta/eta_index_lib/services"
|
|
|
"eta/eta_index_lib/utils"
|
|
|
- "fmt"
|
|
|
+ "strconv"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -206,19 +206,19 @@ func (this *FutureGoodEdbInfoController) RefreshRelation() {
|
|
|
this.Data["json"] = br
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
- var req future_good.RefreshFutureEdbEdbInfoReq
|
|
|
+ var req future_good.RefreshFutureChartInfoReq
|
|
|
err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
if err != nil {
|
|
|
br.Msg = "参数解析异常!"
|
|
|
br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if req.FutureGoodEdbInfoId <= 0 {
|
|
|
- br.Msg = "请输入指标ID!"
|
|
|
- br.ErrMsg = "请输入指标ID"
|
|
|
+ if req.ChartInfoId <= 0 {
|
|
|
+ br.Msg = "请输入图表ID!"
|
|
|
+ br.ErrMsg = "请输入图表ID"
|
|
|
return
|
|
|
}
|
|
|
- cacheKey = utils.CACHE_EDB_DATA_REFRESH + "_futuregood_relation_" + req.FutureGoodEdbCode
|
|
|
+ cacheKey = utils.CACHE_EDB_DATA_REFRESH + "_futuregood_relation_chart" + strconv.Itoa(req.ChartInfoId)
|
|
|
|
|
|
if utils.Rc.IsExist(cacheKey) {
|
|
|
br.Ret = 501
|
|
@@ -227,47 +227,17 @@ func (this *FutureGoodEdbInfoController) RefreshRelation() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
|
|
|
+ utils.Rc.SetNX(cacheKey, 1, 10*time.Minute)
|
|
|
defer func() {
|
|
|
utils.Rc.Delete(cacheKey)
|
|
|
}()
|
|
|
-
|
|
|
- //获取指标信息
|
|
|
- futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(req.FutureGoodEdbInfoId)
|
|
|
+ err, errMsg := logic.RefreshByChartId(req.ChartInfoId)
|
|
|
if err != nil {
|
|
|
- if err.Error() != utils.ErrNoRow() {
|
|
|
- br.Msg = "系统内找不到该指标"
|
|
|
- } else {
|
|
|
- br.Msg = "刷新失败"
|
|
|
- br.ErrMsg = "添加失败,ERR:" + err.Error()
|
|
|
- }
|
|
|
+ br.Msg = "利润曲线图表刷新失败"
|
|
|
+ br.ErrMsg = "利润曲线图表刷新失败,Err:" + errMsg
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 获取相关图表
|
|
|
- list, err := models.GetGroupChartEdbMappingListByEdbInfoId(futureGoodEdbInfo.FutureGoodEdbInfoId, 2)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "查找相关图表id失败"
|
|
|
- br.ErrMsg = "添加失败,ERR:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- go func() {
|
|
|
- errMsgList := make([]string, 0)
|
|
|
- for _, v := range list {
|
|
|
- err, errMsg := logic.RefreshByChartId(v.ChartInfoId)
|
|
|
- if err != nil {
|
|
|
- errMsgList = append(errMsgList, fmt.Sprint(v.ChartInfoId, "更新失败,"+errMsg))
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if len(errMsgList) > 0 {
|
|
|
- //br.Msg = "部分刷新失败"
|
|
|
- //br.ErrMsg = "部分刷新失败,Err:" + strings.Join(errMsgList, ";")
|
|
|
- return
|
|
|
- }
|
|
|
- }()
|
|
|
-
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "刷新成功"
|