Merge branch 'feature/eta1.9.1_edb_refresh' into debug

services/data/edb_info_relation.go

@@ -43,7 +43,7 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
 
 	// 查询计算指标信息，并且建立关联关系
 	// 查询间接引用的指标信息
-	calculateEdbListMap, calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
+	calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 	if e != nil {
 		err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
 		return
@@ -106,21 +106,18 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
 					if !ok2 {
 						continue
 					}
-					childEdb, ok2 := calculateEdbListMap[childEdbMapping.FromEdbInfoId]
-					if !ok2 {
-						continue
-					}
-					if childEdb.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-						indexCodeList = append(indexCodeList, childEdb.EdbCode)
+
+					if childEdbMapping.FromSource == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+						indexCodeList = append(indexCodeList, childEdbMapping.FromEdbCode)
 					}
 					tmp1 := &data_manage.EdbInfoRelation{
 						ReferObjectId:      objectId,
 						ReferObjectType:    objectType,
 						ReferObjectSubType: objectSubType,
-						EdbInfoId:          childEdb.EdbInfoId,
-						EdbName:            childEdb.EdbName,
-						Source:             childEdb.Source,
-						EdbCode:            childEdb.EdbCode,
+						EdbInfoId:          childEdbMapping.FromEdbInfoId,
+						EdbName:            childEdbMapping.FromEdbName,
+						Source:             childEdbMapping.FromSource,
+						EdbCode:            childEdbMapping.FromEdbCode,
 						CreateTime:         nowTime,
 						ModifyTime:         nowTime,
 						RelationTime:       nowTime,
@@ -129,7 +126,7 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
 						ChildEdbInfoId:     childEdbMapping.EdbInfoId,
 					}
 					addList = append(addList, tmp1)
-					refreshIds = append(refreshIds, childEdb.EdbInfoId)
+					refreshIds = append(refreshIds, childEdbMapping.FromEdbInfoId)
 					// todo 防止重复
 				}
 			}
@@ -238,7 +235,7 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 
 	// 查询计算指标信息，并且建立关联关系
 	// 查询间接引用的指标信息
-	calculateEdbListMap, calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
+	calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 	if e != nil {
 		err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
 		return
@@ -296,21 +293,17 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 					if !ok2 {
 						continue
 					}
-					childEdb, ok2 := calculateEdbListMap[childEdbMapping.FromEdbInfoId]
-					if !ok2 {
-						continue
-					}
-					if childEdb.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-						indexCodeList = append(indexCodeList, childEdb.EdbCode)
+					if childEdbMapping.FromSource == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+						indexCodeList = append(indexCodeList, childEdbMapping.FromEdbCode)
 					}
 					tmp1 := &data_manage.EdbInfoRelation{
 						ReferObjectId:      matter.FeCalendarMatterId,
 						ReferObjectType:    utils.EDB_RELATION_CALENDAR,
 						ReferObjectSubType: 0,
-						EdbInfoId:          childEdb.EdbInfoId,
-						EdbName:            childEdb.EdbName,
-						Source:             childEdb.Source,
-						EdbCode:            childEdb.EdbCode,
+						EdbInfoId:          childEdbMapping.FromEdbInfoId,
+						EdbName:            childEdbMapping.FromEdbName,
+						Source:             childEdbMapping.FromSource,
+						EdbCode:            childEdbMapping.FromEdbCode,
 						CreateTime:         nowTime,
 						ModifyTime:         nowTime,
 						RelationTime:       nowTime,
@@ -319,7 +312,7 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 						ChildEdbInfoId:     childEdbMapping.EdbInfoId,
 					}
 					addList = append(addList, tmp1)
-					refreshIds = append(refreshIds, childEdb.EdbInfoId)
+					refreshIds = append(refreshIds, childEdbMapping.FromEdbInfoId)
 					// todo 防止重复
 				}
 			}
@@ -406,7 +399,7 @@ func GetEdbRelationList(source int, classifyId, sysUserId, frequency, keyword, s
 	return
 }
 
-func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbInfoMap map[int]*data_manage.EdbInfo, edbMappingListMap map[int]*data_manage.EdbInfoCalculateMapping, edbInfoMappingRootIdsMap map[int][]int, err error) {
+func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbMappingListMap map[int]*data_manage.EdbInfoCalculateMapping, edbInfoMappingRootIdsMap map[int][]int, err error) {
 	if len(edbInfoList) == 0 {
 		return
 	}
@@ -460,18 +453,7 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbInfoMap map[i
 	for k, _ := range edbInfoIdMap {
 		edbInfoIdList = append(edbInfoIdList, k)
 	}
-	edbInfoMap = make(map[int]*data_manage.EdbInfo)
 	edbMappingListMap = make(map[int]*data_manage.EdbInfoCalculateMapping)
-	if len(edbInfoIdList) > 0 {
-		edbInfoList, err = data_manage.GetEdbInfoByIdList(edbInfoIdList)
-		if err != nil {
-			err = fmt.Errorf(" GetEdbInfoByIdList err: %s", err.Error())
-			return
-		}
-		for _, v := range edbInfoList {
-			edbInfoMap[v.EdbInfoId] = v
-		}
-	}
 
 	if len(edbMappingList) > 0 {
 		for _, v := range edbMappingList {