Merge branch 'feature/pool253_edb_relation' into debug

# Conflicts:
#	controllers/base_from_bloomberg.go

controllers/base_from_bloomberg.go

@@ -169,6 +169,27 @@ func (this *BloombergController) PCSGImportHistoryData() {
 		br.ErrMsg = "参数解析失败，Err:" + e.Error()
 		return
 	}
+	if req.TaskKey == "" {
+		br.Msg = "TaskKey不可为空"
+		return
+	}
+	tasks, e := services.LoadPCSGBloombergTask()
+	if e != nil {
+		br.Msg = "加载配置失败"
+		br.ErrMsg = fmt.Sprintf("加载配置失败, Err: %v", e)
+		return
+	}
+	conf := new(services.PCSGBloombergTask)
+	for _, v := range tasks {
+		if v.TaskKey == req.TaskKey {
+			conf = v
+			break
+		}
+	}
+	if conf.TaskKey == "" {
+		br.Msg = "TaskKey配置不存在"
+		return
+	}
 
 	var indexes []models.BaseFromBloombergApiIndexAndData
 	var index models.BaseFromBloombergApiIndexAndData
@@ -184,7 +205,7 @@ func (this *BloombergController) PCSGImportHistoryData() {
 	indexes = append(indexes, index)
 
 	// 写入数据
-	if e := services.PCSGWrite2BaseBloomberg(indexes, req.IsVCode, req.ExtraLetter, ""); e != nil {
+	if e := services.PCSGWrite2BaseBloomberg(indexes, conf.VCode, conf.ExtraLetter, conf.IndexNamePrefix, conf.IndexCodeSuffix); e != nil {
 		br.Msg = "刷新失败"
 		br.ErrMsg = "PCSG-写入Bloomberg数据源失败, Err: " + e.Error()
 		return

logic/predict_edb.go

@@ -244,8 +244,8 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 						calculateMappingItem := &models.EdbInfoCalculateMapping{
 							EdbInfoCalculateMappingId: 0,
 							EdbInfoId:                 0,
-							Source:                    utils.DATA_SOURCE_CALCULATE,
-							SourceName:                "指标运算",
+							Source:                    edbInfo.Source,
+							SourceName:                edbInfo.SourceName,
 							EdbCode:                   "",
 							FromEdbInfoId:             fromEdbInfo.EdbInfoId,
 							FromEdbCode:               fromEdbInfo.EdbCode,
@@ -336,8 +336,8 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 						tmpCalculateMappingItem := &models.EdbInfoCalculateMapping{
 							EdbInfoCalculateMappingId: 0,
 							EdbInfoId:                 0,
-							Source:                    utils.DATA_SOURCE_CALCULATE,
-							SourceName:                "指标运算",
+							Source:                    edbInfo.Source,
+							SourceName:                edbInfo.SourceName,
 							EdbCode:                   "",
 							FromEdbInfoId:             fromEdbInfo.EdbInfoId,
 							FromEdbCode:               fromEdbInfo.EdbCode,

models/base_from_bloomberg.go

@@ -354,9 +354,7 @@ type BaseFromBloombergApiIndexData struct {
 
 // PCSGImportHistoryDataReq 导入历史数据
 type PCSGImportHistoryDataReq struct {
-	IndexCode       string                `description:"指标编码"`
-	DataMap         map[time.Time]float64 `description:"数据日期/值"`
-	IsVCode         bool                  `description:"是否指标编码中间加V"`
-	ExtraLetter     string                `description:"指标编码中间额外加的字母...比如V"`
-	IndexNamePrefix string                `description:"指标名称前缀"`
+	IndexCode string                `description:"指标编码"`
+	DataMap   map[time.Time]float64 `description:"数据日期/值"`
+	TaskKey   string                `description:"导入数据对应的任务Key"`
 }

models/edb_info_relation.go

@@ -97,8 +97,8 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
-		sql = ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		sql = ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
+		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
 		if err != nil {
 			return
 		}