合并冲突

controllers/data_manage/edb_info.go

@@ -5730,7 +5730,7 @@ func (this *EdbInfoController) EdbChartList() {
 			}
 			var wg sync.WaitGroup
 			wg.Add(2)
-			var relationMap =make(map[int]*data_manage.BaseRelationEdbInfo,len(list))
+			var relationMap = make(map[int]*data_manage.BaseRelationEdbInfo, len(list))
 			var relationList []*data_manage.BaseRelationEdbInfo
 			relationChan := make(chan RelationResult, 2)
 			var edbInfoIds []int
@@ -5783,9 +5783,18 @@ func (this *EdbInfoController) EdbChartList() {
 						v.IsSupplierStop = 1
 					}
 				}
-				if relationMap[v.EdbInfoId] != nil && relationMap[v.EdbInfoId].RelationNum > 0 {
-					v.IsRelation = true
-				}
+				//优化需求340 被引用的指标可以被停用
+				//var relation *data_manage.BaseRelationEdbInfo
+				//relation, err = data.GetEdbRelationListById(v.EdbInfoId, v.Source)
+				//if err != nil && !utils.IsErrNoRow(err) {
+				//	br.Msg = "获取失败"
+				//	br.ErrMsg = "获取数据引用信息失败，Err:" + e.Error()
+				//	return
+				//}
+				//if relation != nil && relation.RelationNum > 0 {
+				//	v.IsRelation = true
+				//}
+
 			}
 		}
 		page = paging.GetPaging(currentIndex, pageSize, int(dataCount))
@@ -6849,7 +6858,7 @@ func (this *EdbInfoController) ChartImageSetBySvg() {
 		br.Ret = 408
 		return
 	}
-	NotBackendGenerate,_ := this.GetBool("NotBackendGenerate",false)
+	NotBackendGenerate, _ := this.GetBool("NotBackendGenerate", false)
 	imgData := this.GetString("Img")
 	if imgData == "" {
 		br.Msg = "图片参数错误"
@@ -6876,7 +6885,7 @@ func (this *EdbInfoController) ChartImageSetBySvg() {
 	}
 
 	// 通过svg图片生成图片资源地址
-	resourceUrl, err, errMsg := services.GetResourceUrlBySvgImg(imgData,NotBackendGenerate)
+	resourceUrl, err, errMsg := services.GetResourceUrlBySvgImg(imgData, NotBackendGenerate)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()

controllers/data_manage/edb_info_refresh.go

@@ -716,11 +716,13 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			if ok {
 				continue
 			}
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
-				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
-				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
-				return
-			}
+			//优化需求340 被引用指标也可以停用
+			//if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			//if v.IsSupplierStop == 0 && isStop == 1 {
+			//	br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	return
+			//}
 			// 加入到待配置的指标列表id
 			edbIdList = append(edbIdList, v.EdbInfoId)
 		}
@@ -733,11 +735,15 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			return
 		}
 		for _, v := range edbRelationList {
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
-				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
-				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
-				return
-			}
+			//优化需求340 被引用指标也可以停用
+			//if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			//if v.IsSupplierStop == 0 && isStop == 1 {
+			//	//br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	//br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+			//	return
+			//}
 			// 加入到待配置的指标列表id
 			// 加入到待配置的指标列表id
 			edbIdList = append(edbIdList, v.EdbInfoId)