从社区撤回图表

models/chart_collect/chart.go

@@ -89,8 +89,8 @@ func GetChartCollectListByChartInfoId(chartInfoId int) (item []*ChartCollectView
 	o := orm.NewOrm()
 	//sql := ` SELECT * FROM chart_collect WHERE 1=1 AND user_id=? `
 
-	sql := ` SELECT a.*,GROUP_CONCAT(c.classify_id SEPARATOR ',') AS classify_id FROM chart_collect AS a
-			LEFT JOIN chart_collect_classify AS c ON b.classify_id=c.classify_id
+	sql := ` SELECT a.*,GROUP_CONCAT(c.collect_classify_id SEPARATOR ',') AS classify_id FROM chart_collect AS a
+			LEFT JOIN chart_collect_classify AS c ON a.collect_classify_id=c.collect_classify_id
 			WHERE 1=1 AND a.chart_info_id=?
 			GROUP BY a.chart_info_id, a.user_id `
 	_, err = o.Raw(sql, chartInfoId).QueryRows(&item)

services/chart_info.go

@@ -580,17 +580,6 @@ func DeleteChart(chartInfoId int) (err error, errMsg string) {
 	for _, v := range oldChartEdbMappingList {
 		edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 	}
-	// 查询所有的收藏图表数据
-	userChartCollect := make([]string, 0)
-	chartCollectList, err := chart_collect.GetChartCollectListByChartInfoId(chartInfo.ChartInfoId)
-	if err != nil {
-		errMsg = "删除失败"
-		err = fmt.Errorf("查询图表收藏数据失败, Err:" + err.Error())
-		return
-	}
-	for _, v := range chartCollectList {
-		userChartCollect = append(userChartCollect, fmt.Sprintf("%d_%d", v.UserId, v.ChartInfoId))
-	}
 
 	//删除图表及关联指标
 	err = models.DeleteChartInfoAndData(chartInfo.ChartInfoId)
@@ -615,9 +604,28 @@ func DeleteChart(chartInfoId int) (err error, errMsg string) {
 	}
 
 	go EsDeleteChartInfo(chartInfo.ChartInfoId)
-	if len(userChartCollect) > 0 {
-		go EsDeleteChartCollectByChartInfoIdUserIds(userChartCollect)
-	}
+	go func() {
+		var e error
+		defer func() {
+			if e != nil {
+				utils.FileLog.Info("删除图表收藏数据失败, Err:" + e.Error())
+			}
+		}()
+		// 查询所有的收藏图表数据
+		userChartCollect := make([]string, 0)
+		chartCollectList, e := chart_collect.GetChartCollectListByChartInfoId(chartInfo.ChartInfoId)
+		if e != nil {
+			e = fmt.Errorf("查询图表收藏数据失败, Err:" + e.Error())
+			return
+		}
+		for _, v := range chartCollectList {
+			userChartCollect = append(userChartCollect, fmt.Sprintf("%d_%d", v.UserId, v.ChartInfoId))
+		}
+		if len(userChartCollect) > 0 {
+			EsDeleteChartCollectByChartInfoIdUserIds(userChartCollect)
+		}
+	}()
+
 	return
 }