|
@@ -39,11 +39,19 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
|
|
|
err = fmt.Errorf("查询指标信息失败,%s", e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ // 查询计算指标信息,并且建立关联关系
|
|
|
+ // 查询间接引用的指标信息
|
|
|
+ calculateEdbListMap, calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
|
|
|
+ if e != nil {
|
|
|
+ err = fmt.Errorf("查询计算指标信息失败,%s", e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
// 只统计钢联化工和wind来源的指标
|
|
|
for _, edbInfo := range edbInfoList {
|
|
|
- if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ /*if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
continue
|
|
|
- }
|
|
|
+ }*/
|
|
|
refreshIds = append(refreshIds, edbInfo.EdbInfoId)
|
|
|
if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
indexCodeList = append(indexCodeList, edbInfo.EdbCode)
|
|
@@ -66,11 +74,11 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
|
|
|
// 删除不再需要的引用关系
|
|
|
nowTime := time.Now()
|
|
|
addList := make([]*data_manage.EdbInfoRelation, 0)
|
|
|
- deleteRelationIds := make([]int, 0)
|
|
|
+ deleteEdbInfoIds := make([]int, 0)
|
|
|
for _, edbInfo := range edbInfoList {
|
|
|
- if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ /*if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
continue
|
|
|
- }
|
|
|
+ }*/
|
|
|
if _, ok := relationMap[edbInfo.EdbInfoId]; ok {
|
|
|
delete(deleteMap, edbInfo.EdbInfoId)
|
|
|
} else {
|
|
@@ -87,15 +95,53 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
|
|
|
RelationTime: nowTime,
|
|
|
}
|
|
|
addList = append(addList, tmp)
|
|
|
+ if edbInfo.EdbType == 2 {
|
|
|
+ childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
|
|
|
+ if !ok1 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ for _, childEdbMappingId := range childEdbMappingIds {
|
|
|
+ childEdbMapping, ok2 := calculateEdbMappingListMap[childEdbMappingId]
|
|
|
+ if !ok2 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ childEdb, ok2 := calculateEdbListMap[childEdbMapping.FromEdbInfoId]
|
|
|
+ if !ok2 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if childEdb.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ indexCodeList = append(indexCodeList, childEdb.EdbCode)
|
|
|
+ }
|
|
|
+ tmp1 := &data_manage.EdbInfoRelation{
|
|
|
+ ReferObjectId: objectId,
|
|
|
+ ReferObjectType: objectType,
|
|
|
+ ReferObjectSubType: objectSubType,
|
|
|
+ EdbInfoId: childEdb.EdbInfoId,
|
|
|
+ EdbName: childEdb.EdbName,
|
|
|
+ Source: childEdb.Source,
|
|
|
+ EdbCode: childEdb.EdbCode,
|
|
|
+ CreateTime: nowTime,
|
|
|
+ ModifyTime: nowTime,
|
|
|
+ RelationTime: nowTime,
|
|
|
+ RelationType: 1,
|
|
|
+ RootEdbInfoId: edbInfo.EdbInfoId,
|
|
|
+ ChildEdbInfoId: childEdbMapping.EdbInfoId,
|
|
|
+ }
|
|
|
+ addList = append(addList, tmp1)
|
|
|
+ refreshIds = append(refreshIds, childEdb.EdbInfoId)
|
|
|
+ // todo 防止重复
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 删除不再需要的引用关系
|
|
|
for deleteId, _ := range deleteMap {
|
|
|
- deleteRelationIds = append(deleteRelationIds, deleteId)
|
|
|
+ deleteEdbInfoIds = append(deleteEdbInfoIds, deleteId)
|
|
|
}
|
|
|
//更新指标刷新状态为启用
|
|
|
- err = data_manage.AddOrUpdateEdbInfoRelation(addList, deleteRelationIds, refreshIds, indexCodeList)
|
|
|
+ err = data_manage.AddOrUpdateEdbInfoRelation(objectId, objectType, addList, deleteEdbInfoIds, refreshIds, indexCodeList)
|
|
|
if err != nil {
|
|
|
err = fmt.Errorf("删除不再需要的引用关系失败,%s", err.Error())
|
|
|
return
|
|
@@ -134,31 +180,30 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
|
|
|
}
|
|
|
|
|
|
//删除ID,先删除
|
|
|
- deleteRelationIds := make([]int, 0)
|
|
|
+ deleteObjectIds := make([]int, 0)
|
|
|
if len(matterIds) > 0 {
|
|
|
- relationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(matterIds, utils.EDB_RELATION_CALENDAR)
|
|
|
+ relationList, e := data_manage.GetEdbInfoRelationAllByReferObjectIds(matterIds, utils.EDB_RELATION_CALENDAR)
|
|
|
if e != nil {
|
|
|
err = fmt.Errorf("查询事件日历指标引用失败,%s", e.Error())
|
|
|
return
|
|
|
}
|
|
|
for _, relation := range relationList {
|
|
|
if _, ok := deleteMatterMap[relation.ReferObjectId]; ok {
|
|
|
- deleteRelationIds = append(deleteRelationIds, relation.EdbInfoRelationId)
|
|
|
+ deleteObjectIds = append(deleteObjectIds, relation.ReferObjectId)
|
|
|
}
|
|
|
if newMatter, ok := updateMatterMap[relation.ReferObjectId]; ok {
|
|
|
if relation.EdbInfoId != newMatter.EdbInfoId {
|
|
|
- deleteRelationIds = append(deleteRelationIds, relation.EdbInfoRelationId)
|
|
|
+ deleteObjectIds = append(deleteObjectIds, relation.ReferObjectId)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if len(deleteRelationIds) > 0 {
|
|
|
- err = data_manage.DeleteEdbRelationByObjectIds(deleteRelationIds, utils.EDB_RELATION_CALENDAR)
|
|
|
+ if len(deleteObjectIds) > 0 {
|
|
|
+ err = data_manage.DeleteEdbRelationByObjectIds(deleteObjectIds, utils.EDB_RELATION_CALENDAR)
|
|
|
if err != nil {
|
|
|
err = fmt.Errorf("删除事件日历指标引用失败,%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
- deleteRelationIds = make([]int, 0)
|
|
|
}
|
|
|
|
|
|
// 获取已有事项
|
|
@@ -189,18 +234,26 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
|
|
|
err = fmt.Errorf("查询指标信息失败,%s", e.Error())
|
|
|
return
|
|
|
}
|
|
|
- // 只统计钢联化工和wind来源的指标
|
|
|
+
|
|
|
+ // 查询计算指标信息,并且建立关联关系
|
|
|
+ // 查询间接引用的指标信息
|
|
|
+ calculateEdbListMap, calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
|
|
|
+ if e != nil {
|
|
|
+ err = fmt.Errorf("查询计算指标信息失败,%s", e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
addEdbInfoIdMap := make(map[int]*data_manage.EdbInfo)
|
|
|
for _, edbInfo := range edbInfoList {
|
|
|
- if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ /*if edbInfo.Source != utils.DATA_SOURCE_WIND && edbInfo.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
continue
|
|
|
- }
|
|
|
+ }*/
|
|
|
refreshIds = append(refreshIds, edbInfo.EdbInfoId)
|
|
|
addEdbInfoIdMap[edbInfo.EdbInfoId] = edbInfo
|
|
|
if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
indexCodeList = append(indexCodeList, edbInfo.EdbCode)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
relationMap := make(map[int]struct{})
|
|
|
if len(newMatterIds) > 0 {
|
|
|
//查询已有的matters
|
|
@@ -231,13 +284,50 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
|
|
|
ModifyTime: nowTime,
|
|
|
}
|
|
|
addList = append(addList, tmp)
|
|
|
+ //todo 添加指标间接引用
|
|
|
+ if edbInfo.EdbType == 2 {
|
|
|
+ childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
|
|
|
+ if !ok1 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ for _, childEdbMappingId := range childEdbMappingIds {
|
|
|
+ childEdbMapping, ok2 := calculateEdbMappingListMap[childEdbMappingId]
|
|
|
+ if !ok2 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ childEdb, ok2 := calculateEdbListMap[childEdbMapping.FromEdbInfoId]
|
|
|
+ if !ok2 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if childEdb.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ indexCodeList = append(indexCodeList, childEdb.EdbCode)
|
|
|
+ }
|
|
|
+ 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,
|
|
|
+ CreateTime: nowTime,
|
|
|
+ ModifyTime: nowTime,
|
|
|
+ RelationTime: nowTime,
|
|
|
+ RelationType: 1,
|
|
|
+ RootEdbInfoId: edbInfo.EdbInfoId,
|
|
|
+ ChildEdbInfoId: childEdbMapping.EdbInfoId,
|
|
|
+ }
|
|
|
+ addList = append(addList, tmp1)
|
|
|
+ refreshIds = append(refreshIds, childEdb.EdbInfoId)
|
|
|
+ // todo 防止重复
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//更新指标刷新状态为启用
|
|
|
- err = data_manage.AddOrUpdateEdbInfoRelation(addList, deleteRelationIds, refreshIds, indexCodeList)
|
|
|
+ err = data_manage.AddOrUpdateEdbInfoRelationFeMatter(addList, refreshIds, indexCodeList)
|
|
|
if err != nil {
|
|
|
- err = fmt.Errorf("删除不再需要的引用关系失败,%s", err.Error())
|
|
|
+ err = fmt.Errorf("添加指标引用,%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
return
|
|
@@ -314,3 +404,122 @@ 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) {
|
|
|
+ //查询指标信息
|
|
|
+ //查询指标映射
|
|
|
+ //查询所有指标数据
|
|
|
+ //查询这个指标相关的mapping信息放到数组里,
|
|
|
+ //将得到的指标ID信息放到数组里
|
|
|
+ hasFindMap := make(map[int]struct{})
|
|
|
+ edbInfoIdMap := make(map[int]struct{})
|
|
|
+ edbMappingList := make([]*data_manage.EdbInfoCalculateMapping, 0)
|
|
|
+ edbInfoMappingRootIdsMap = make(map[int][]int, 0)
|
|
|
+ edbMappingMap := make(map[int]struct{})
|
|
|
+ for _, edbInfo := range edbInfoList {
|
|
|
+ if edbInfo.EdbType == 2 {
|
|
|
+ edbInfoId := edbInfo.EdbInfoId
|
|
|
+ edbMappingList, err = GetCalculateEdbInfoByEdbInfoId(edbInfoId, hasFindMap, edbInfoIdMap, edbMappingList, edbMappingMap, edbInfoMappingRootIdsMap, edbInfoId)
|
|
|
+ if err != nil {
|
|
|
+ err = fmt.Errorf(" GetCalculateEdbInfoByEdbInfoId err: %s", err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(edbMappingList) == 0 {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ // 查询指标信息
|
|
|
+ // 指标信息map
|
|
|
+ edbInfoIdList := make([]int, 0)
|
|
|
+ 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 {
|
|
|
+ edbMappingListMap[v.EdbInfoCalculateMappingId] = v
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
+// GetCalculateEdbInfoByEdbInfoId 计算指标追溯
|
|
|
+func GetCalculateEdbInfoByEdbInfoId(edbInfoId int, hasFindMap map[int]struct{}, edbInfoIdMap map[int]struct{}, edbMappingList []*data_manage.EdbInfoCalculateMapping, edbMappingMap map[int]struct{}, edbInfoMappingRootIdsMap map[int][]int, rootEdbInfoId int) (newEdbMappingList []*data_manage.EdbInfoCalculateMapping, err error) {
|
|
|
+ newEdbMappingList = edbMappingList
|
|
|
+ _, ok := hasFindMap[edbInfoId]
|
|
|
+ if ok {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if _, ok1 := edbInfoIdMap[edbInfoId]; !ok1 {
|
|
|
+ edbInfoIdMap[edbInfoId] = struct{}{}
|
|
|
+ }
|
|
|
+
|
|
|
+ edbInfoMappingList, e := data_manage.GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId)
|
|
|
+ if e != nil {
|
|
|
+ err = fmt.Errorf("GetEdbInfoCalculateMappingListByEdbInfoId err: %s", e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if len(edbInfoMappingList) > 0 {
|
|
|
+ fromEdbInfoIdList := make([]int, 0)
|
|
|
+ edbInfoMappingIdList := make([]int, 0)
|
|
|
+ for _, v := range edbInfoMappingList {
|
|
|
+ fromEdbInfoIdList = append(fromEdbInfoIdList, v.FromEdbInfoId)
|
|
|
+ edbInfoMappingIdList = append(edbInfoMappingIdList, v.EdbInfoCalculateMappingId)
|
|
|
+ if _, ok1 := edbInfoIdMap[v.FromEdbInfoId]; !ok1 {
|
|
|
+ edbInfoIdMap[v.FromEdbInfoId] = struct{}{}
|
|
|
+ }
|
|
|
+ if _, ok2 := edbMappingMap[v.EdbInfoCalculateMappingId]; !ok2 {
|
|
|
+ edbMappingMap[v.EdbInfoCalculateMappingId] = struct{}{}
|
|
|
+ tmp := &data_manage.EdbInfoCalculateMapping{
|
|
|
+ EdbInfoCalculateMappingId: v.EdbInfoCalculateMappingId,
|
|
|
+ EdbInfoId: v.EdbInfoId,
|
|
|
+ Source: v.Source,
|
|
|
+ SourceName: v.SourceName,
|
|
|
+ EdbCode: v.EdbCode,
|
|
|
+ FromEdbInfoId: v.FromEdbInfoId,
|
|
|
+ FromEdbCode: v.FromEdbCode,
|
|
|
+ FromEdbName: v.FromEdbName,
|
|
|
+ FromSource: v.FromSource,
|
|
|
+ FromSourceName: v.FromSourceName,
|
|
|
+ FromTag: v.FromTag,
|
|
|
+ Sort: v.Sort,
|
|
|
+ CreateTime: v.CreateTime,
|
|
|
+ ModifyTime: v.ModifyTime,
|
|
|
+ }
|
|
|
+ newEdbMappingList = append(newEdbMappingList, tmp)
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if edbInfoId != v.FromEdbInfoId && (v.FromEdbType == 2 || v.FromEdbInfoType == 1) {
|
|
|
+ // 查过了就不查了
|
|
|
+ if _, ok2 := hasFindMap[v.FromEdbInfoId]; !ok2 {
|
|
|
+ newEdbMappingList, e = GetCalculateEdbInfoByEdbInfoId(v.FromEdbInfoId, hasFindMap, edbInfoIdMap, newEdbMappingList, edbMappingMap, edbInfoMappingRootIdsMap, rootEdbInfoId)
|
|
|
+ if e != nil {
|
|
|
+ err = fmt.Errorf("traceEdbInfoByEdbInfoId err: %s", e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ hasFindMap[v.FromEdbInfoId] = struct{}{}
|
|
|
+ }
|
|
|
+ edbInfoMappingRootIdsMap[rootEdbInfoId] = append(edbInfoMappingRootIdsMap[rootEdbInfoId], edbInfoMappingIdList...)
|
|
|
+ }
|
|
|
+
|
|
|
+ hasFindMap[edbInfoId] = struct{}{}
|
|
|
+ return
|
|
|
+}
|