Browse Source

删除图表时,同时删除ETA资源库里的图表

xyxie 3 weeks ago
parent
commit
35729b88c1

+ 22 - 0
controllers/data_manage/chart_classify.go

@@ -529,6 +529,24 @@ func (this *ChartClassifyController) DeleteChartClassifyCheck() {
 		tipsMsg = "可删除,进行删除操作"
 	}
 
+	if req.ChartClassifyId == 0 && req.ChartInfoId > 0 {
+		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
+		if err != nil {
+			if utils.IsErrNoRow(err) {
+				br.Msg = "图表已删除,请刷新页面"
+				br.ErrMsg = "指标不存在,Err:" + err.Error()
+				return
+			}
+			br.Msg = "删除失败"
+			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+			return
+		}
+		if chartInfo.ForumChartInfoId > 0 {
+			deleteStatus = 3
+			tipsMsg = "删除后,该图表将从ETA投研资源库同步删除,影响客户的查看权限,是否确认删除?"
+		}
+	}
+
 	resp := new(data_manage.ChartClassifyDeleteCheckResp)
 	resp.DeleteStatus = deleteStatus
 	resp.TipsMsg = tipsMsg
@@ -705,6 +723,10 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
+			
+			if chartInfo.ForumChartInfoId > 0 {
+				go eta_forum.DeleteChartByForumChartInfoId(chartInfo.ForumChartInfoId)
+			}
 		}
 
 		var condition string

+ 5 - 3
services/data/chart_classify.go

@@ -1097,9 +1097,11 @@ func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyNam
 	}
 	oldSelected := classifyInfo.IsSelected
 	var parentClassifyInfo *data_manage.ChartClassify
-	parentClassifyInfo, err= data_manage.GetChartClassifyById(parentId)
-	if err != nil {
-		return
+	if parentId > 0 {
+		parentClassifyInfo, err= data_manage.GetChartClassifyById(parentId)
+		if err != nil {
+			return
+		}
 	}
 	if parentId != classifyInfo.ParentId {
 		if classifyInfo.Level != parentClassifyInfo.Level+1 {

+ 28 - 0
services/eta_forum/eta_forum_hub.go

@@ -450,6 +450,34 @@ func DeleteChart(chartInfoId int) (err error, errMsg string) {
 	return
 }
 
+// DeleteChart 上传图表接口
+func DeleteChartByForumChartInfoId(forumChartInfoId int) (err error, errMsg string) {
+	// 查询图表信息
+	req := new(DeleteChartReq)
+	req.ChartInfoId = forumChartInfoId
+
+	// 添加计算指标
+	reqJson, err := json.Marshal(req)
+	if err != nil {
+		errMsg = "参数解析异常"
+		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
+		return
+	}
+	respItem, err := ChartDeleteLib(string(reqJson))
+	if err != nil {
+		errMsg = "撤回失败"
+		err = fmt.Errorf("撤回失败,Err:" + err.Error())
+		return
+	}
+	if respItem.Ret != 200 {
+		errMsg = "撤回失败"
+		err = fmt.Errorf(respItem.ErrMsg)
+		return
+	}
+
+	return
+}
+
 type AdminSaveReq struct {
 	*system.Admin
 	BusinessCode string `description:"商家编码"`