|
@@ -905,9 +905,63 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
|
|
|
chartInfo.EdbInfoIds = strings.Join(edbInfoIds, ",")
|
|
|
updateStr = append(updateStr, "EdbInfoIds")
|
|
|
}
|
|
|
- if chartInfo.ExtraConfig != "" {
|
|
|
+ if chartInfo.ExtraConfig != "" || chartInfo.BarConfig != "" {
|
|
|
//判断是否是拟合方程或者散点图截面图
|
|
|
- if chartInfo.Source == utils.CHART_SOURCE_LINE_EQUATION {
|
|
|
+ if chartInfo.Source == utils.CHART_SOURCE_FUTURE_GOOD {
|
|
|
+ // 商品价格曲线图的一些配置
|
|
|
+ var barConfig FutureGoodBarChartInfoReq
|
|
|
+ err = json.Unmarshal([]byte(chartInfo.BarConfig), &barConfig)
|
|
|
+ if err != nil {
|
|
|
+ errmsg = "商品价格曲线图配置异常 json.Unmarshal:Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if barConfig.BaseEdbInfoId == oldEdbInfo.EdbInfoId {
|
|
|
+ barConfig.BaseEdbInfoId = newEdbInfo.EdbInfoId
|
|
|
+ }
|
|
|
+ for k, item := range barConfig.EdbInfoIdList {
|
|
|
+ if item.EdbInfoId == oldEdbInfo.EdbInfoId && item.Source == 1 {
|
|
|
+ barConfig.EdbInfoIdList[k].EdbInfoId = newEdbInfo.EdbInfoId
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 更新图表配置信息
|
|
|
+ // 重新序列化
|
|
|
+ configJson, e := json.Marshal(barConfig)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ errmsg = "图表配置信息序列化失败:json.Marshal Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ configStr := string(configJson)
|
|
|
+ chartInfo.BarConfig = configStr
|
|
|
+ updateStr = append(updateStr, "BarConfig")
|
|
|
+ } else if chartInfo.Source == utils.CHART_SOURCE_FUTURE_GOOD_PROFIT {
|
|
|
+ // 商品利润曲线图的一些配置
|
|
|
+ var extraConf FutureGoodProfitChartInfoReq
|
|
|
+ err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &extraConf)
|
|
|
+ if err != nil {
|
|
|
+ errmsg = "商品利润曲线图配置异常 json.Unmarshal:Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if extraConf.BaseEdbInfoId == oldEdbInfo.EdbInfoId {
|
|
|
+ extraConf.BaseEdbInfoId = newEdbInfo.EdbInfoId
|
|
|
+ }
|
|
|
+ for k, v := range extraConf.EdbInfoIdList {
|
|
|
+ if v == oldEdbInfo.EdbInfoId {
|
|
|
+ extraConf.EdbInfoIdList[k] = newEdbInfo.EdbInfoId
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 更新图表配置信息
|
|
|
+ // 重新序列化
|
|
|
+ configJson, e := json.Marshal(extraConf)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ errmsg = "图表配置信息序列化失败:json.Marshal Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ configStr := string(configJson)
|
|
|
+ chartInfo.ExtraConfig = configStr
|
|
|
+ updateStr = append(updateStr, "ExtraConfig")
|
|
|
+ } else if chartInfo.Source == utils.CHART_SOURCE_LINE_EQUATION {
|
|
|
//解析配置内容
|
|
|
var lineChartInfoConfig request.LineChartInfoReq
|
|
|
err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &lineChartInfoConfig)
|
|
@@ -1944,4 +1998,4 @@ func getThsHfAllDataByMongo(edbInfoId, source, subSource int, startDataTime stri
|
|
|
}
|
|
|
|
|
|
return
|
|
|
-}
|
|
|
+}
|