Merge branch 'feature/eta1.9.1' into debug

models/edb_info_relation.go

@@ -21,6 +21,8 @@ type EdbInfoRelation struct {
 	RelationType       int       `description:"引用类型，0:直接饮用，1间接引用"`
 	RootEdbInfoId      int       `description:"间接引用时，关联的直接引用的指标ID"`
 	ChildEdbInfoId     int       `description:"间接引用时，计算指标直接关联的指标ID"`
+	RelationCode       string    `description:"引用标识"`
+	ParentRelationId   int       `description:"间接引用关联的直接引用的ID"`
 }
 
 func (e *EdbInfoRelation) TableName() string {
@@ -57,7 +59,13 @@ func AddOrUpdateEdbInfoRelationByChildEdbInfoId(relationList []*EdbInfoRelation,
 		_ = o.Commit()
 	}()
 
+	relationCodesMap := make(map[string]struct{}, 0)
 	if len(relationList) > 0 {
+		for _, relation := range relationList {
+			if relation.RelationType == 1 {
+				relationCodesMap[relation.RelationCode] = struct{}{}
+			}
+		}
 		_, err = o.InsertMulti(len(relationList), relationList)
 		if err != nil {
 			return
@@ -92,6 +100,24 @@ func AddOrUpdateEdbInfoRelationByChildEdbInfoId(relationList []*EdbInfoRelation,
 		}
 	}
 
-	// todo 由此被禁用的计算指标是否能恢复刷新
+	if len(relationList) > 0 {
+		// 更新间接引用指标的关联ID
+		relationCodes := make([]string, 0)
+		for relationCode := range relationCodesMap {
+			relationCodes = append(relationCodes, relationCode)
+		}
+		if len(relationCodes) > 0 {
+			sql := ` UPDATE edb_info_relation e1  
+JOIN edb_info_relation e2 ON e1.relation_code = e2.relation_code   
+SET e1.parent_relation_id = e2.edb_info_relation_id  
+WHERE  
+    e1.relation_type = 1   
+    AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
+			_, err = o.Raw(sql, relationCodes).Exec()
+			if err != nil {
+				return
+			}
+		}
+	}
 	return
 }

services/edb_info_relation.go

@@ -101,6 +101,7 @@ func ResetEdbRelation(edbInfoId int) {
 					RootEdbInfoId:      rootEdbId,
 					ChildEdbInfoId:     edbInfoId,
 				}
+				tmp1.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp1.RootEdbInfoId, tmp1.ReferObjectId, tmp1.ReferObjectType, tmp1.ReferObjectSubType)
 				addList = append(addList, tmp1)
 				refreshEdbIds = append(refreshEdbIds, childEdb.FromEdbInfoId)
 				if childEdb.FromSource == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {