fix：图表收藏接口

controllers/data_manage/chart_classify.go

@@ -649,7 +649,7 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(req.ChartInfoId)
+			go data.DeleteChartInfoToEs(req.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)

controllers/data_manage/chart_info.go

@@ -5,6 +5,7 @@ import (
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
+	"eta_gn/eta_api/models/data_manage/request"
 	"eta_gn/eta_api/models/data_manage/response"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services"
@@ -91,7 +92,7 @@ func (this *ChartInfoController) ChartInfoSave() {
 	}
 
 	//修改es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -413,7 +414,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 		return
 	}
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -611,7 +612,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 		return
 	}
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -854,7 +855,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -2398,7 +2399,7 @@ func (this *ChartInfoController) ChartInfoImageSet() {
 		}
 
 		//修改es数据
-		go data.EsAddOrEditChartInfo(req.ChartInfoId)
+		go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 		//修改my eta es数据
 		go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 	}
@@ -3186,7 +3187,7 @@ func (this *ChartInfoController) CopyChartInfo() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 
@@ -4187,7 +4188,7 @@ func (this *ChartInfoController) ChartInfoImgSetBySvg() {
 		}
 
 		//修改es数据
-		go data.EsAddOrEditChartInfo(chartInfoId)
+		go data.AddOrEditChartInfoToEs(chartInfoId)
 		//修改my eta es数据
 		go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfoId)
 	}
@@ -4201,3 +4202,132 @@ func (this *ChartInfoController) ChartInfoImgSetBySvg() {
 	br.Data = resp
 	return
 }
+
+// BatchMoveEdb
+// @Title 指标批量移动接口
+// @Description 指标批量移动接口
+// @Param	request	body request.MoveEdbClassifyReq true "type json string"
+// @Success Ret=200 移动成功
+// @router /edb_info/batch_move [post]
+func (this *ChartInfoController) BatchMoveEdb() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var req request.MoveChartClassifyReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if req.NewClassifyId <= 0 {
+		br.Msg = `请选择要转移的新分类`
+		br.IsSendEmail = false
+		return
+	}
+
+	classifyItem, err := data_manage.GetChartClassifyById(req.NewClassifyId)
+	if err != nil {
+		br.Msg = "获取指标分类失败！"
+		br.ErrMsg = "获取指标分类失败！" + err.Error()
+		return
+	}
+	if classifyItem.SysUserId != this.SysUser.AdminId {
+		br.Msg = `您没有权限移动指标到该分类！`
+		br.IsSendEmail = false
+		return
+	}
+
+	chartInfoIdList := make([]int, 0)
+	if req.IsSelectAll {
+		// 获取指标
+		chartInfoList, err := data.GetAllChartInfoListBySearchPublicChartReq(req.SearchPublicChartReq, this.SysUser.AdminId)
+		if err != nil {
+			br.Msg = "获取指标列表失败！"
+			br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
+			return
+		}
+		// 如果有过滤指标，那么就过滤吧
+		if len(req.NoChartIdList) > 0 {
+			noChartIdMap := make(map[int]bool)
+			for _, v := range req.NoChartIdList {
+				noChartIdMap[v] = true
+			}
+
+			for _, chartInfo := range chartInfoList {
+				if _, ok := noChartIdMap[chartInfo.ChartInfoId]; !ok {
+
+					if chartInfo.SysUserId != this.SysUser.AdminId {
+						br.Msg = `您没有权限移动该指标！`
+						br.IsSendEmail = false
+						return
+					}
+
+					// 如果不在未选中的指标id列表中，那么就加入到选中的指标id列表
+					chartInfoIdList = append(chartInfoIdList, chartInfo.ChartInfoId)
+				}
+			}
+		} else {
+			for _, chartInfo := range chartInfoList {
+				chartInfoIdList = append(chartInfoIdList, chartInfo.ChartInfoId)
+				for _, v := range chartInfoList {
+					if v.SysUserId != this.SysUser.AdminId {
+						br.Msg = `您没有权限移动该指标！`
+						br.IsSendEmail = false
+						return
+					}
+				}
+			}
+		}
+	} else {
+		chartInfoList, err := data_manage.GetChartInfoViewByIdList(req.ChartIdList)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取所有有权限的指标失败，Err:" + err.Error()
+			return
+		}
+		for _, v := range chartInfoList {
+			if v.SysUserId != this.SysUser.AdminId {
+				br.Msg = `您没有权限移动该指标！`
+				br.IsSendEmail = false
+				return
+			}
+		}
+		chartInfoIdList = req.ChartIdList
+	}
+
+	num := len(chartInfoIdList)
+	if num <= 0 {
+		br.Msg = `请选择要移动的指标！`
+		br.IsSendEmail = false
+		return
+	}
+	if num > 100 {
+		br.Msg = `最多只能选择100条指标！`
+		br.IsSendEmail = false
+		return
+	}
+
+	// 开始批量修改指标分类
+	if len(chartInfoIdList) > 0 {
+		err = data_manage.UpdateClassifyIdByChartInfoIdList(chartInfoIdList, req.NewClassifyId)
+		if err != nil {
+			br.Msg = `指标移动失败！`
+			br.ErrMsg = `指标移动失败，ERR：` + err.Error()
+			return
+		}
+
+		// 还得修改ES呢
+		for _, v := range chartInfoIdList {
+			data.AddOrEditChartInfoToEs(v)
+		}
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

controllers/data_manage/chart_info_share.go

@@ -155,7 +155,7 @@ func (c *ChartInfoShareController) Save() {
 	}
 
 	// 更新es
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 
 	br.Ret = 200
 	br.Success = true
@@ -597,7 +597,7 @@ func (c *ChartInfoShareController) BatchSave() {
 
 		// 更新es
 		for _, chartInfoId := range selectChartInfoIdList {
-			data.EsAddOrEditChartInfo(chartInfoId)
+			data.AddOrEditChartInfoToEs(chartInfoId)
 		}
 	}
 

controllers/data_manage/correlation/correlation_chart_classify.go

@@ -495,7 +495,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+			go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)

controllers/data_manage/correlation/correlation_chart_info.go

@@ -427,7 +427,7 @@ func (this *CorrelationChartInfoController) Move() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -1438,7 +1438,7 @@ func (this *CorrelationChartInfoController) Copy() {
 			}
 		}
 
-		go data.EsAddOrEditChartInfo(chartInfoId)
+		go data.AddOrEditChartInfoToEs(chartInfoId)
 	}
 
 	// 新增操作日志
@@ -1834,7 +1834,7 @@ func (this *CorrelationChartInfoController) EnInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -2106,7 +2106,7 @@ func (this *CorrelationChartInfoController) BaseInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -2481,7 +2481,7 @@ func (this *CorrelationChartInfoController) MultiFactorAdd() {
 		}
 	}
 
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	// 操作日志
 	{
@@ -2817,7 +2817,7 @@ func (this *CorrelationChartInfoController) MultiFactorEdit() {
 
 	// ES
 	go func() {
-		data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+		data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 		data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 	}()
 

controllers/data_manage/cross_variety/chart_info.go

@@ -991,7 +991,7 @@ func (c *ChartInfoController) Move() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -1183,7 +1183,7 @@ func (c *ChartInfoController) EnInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -1304,7 +1304,7 @@ func (c *ChartInfoController) DeleteChart() {
 	}
 	//删除ES
 	{
-		go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+		go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 		// 删除MY ETA 图表 es数据
 		go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 	}
@@ -1857,7 +1857,7 @@ func (c *ChartInfoController) BaseInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

controllers/data_manage/cross_variety/classify.go

@@ -380,7 +380,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+			go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)

controllers/data_manage/excel/balance_table.go

@@ -877,7 +877,7 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(req.ChartInfoId)
+			go data.DeleteChartInfoToEs(req.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
@@ -1684,7 +1684,7 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		return
 	}
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -472,7 +472,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(req.ChartInfoId)
+			go data.DeleteChartInfoToEs(req.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)

controllers/data_manage/future_good/future_good_chart_info.go

@@ -265,7 +265,7 @@ func (this *FutureGoodChartInfoController) ChartInfoSave() {
 	}
 
 	//修改es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -552,7 +552,7 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	//新增操作日志
 	{
@@ -763,7 +763,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdit() {
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -959,7 +959,7 @@ func (this *FutureGoodChartInfoController) ChartEnInfoEdit() {
 		return
 	}
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -1171,7 +1171,7 @@ func (this *FutureGoodChartInfoController) ChartInfoMove() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -2473,7 +2473,7 @@ func (this *FutureGoodChartInfoController) ChartInfoImageSet() {
 		}
 
 		//修改es数据
-		go data.EsAddOrEditChartInfo(req.ChartInfoId)
+		go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 		//修改my eta es数据
 		go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 	}
@@ -2726,7 +2726,7 @@ func (this *FutureGoodChartInfoController) CopyChartInfo() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 
@@ -3419,7 +3419,7 @@ func (this *FutureGoodChartInfoController) BaseInfoEdit() {
 		return
 	}
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -3500,7 +3500,7 @@ func (this *FutureGoodChartInfoController) ChartInfoImgSetBySvg() {
 		}
 
 		//修改es数据
-		go data.EsAddOrEditChartInfo(chartInfoId)
+		go data.AddOrEditChartInfoToEs(chartInfoId)
 		//修改my eta es数据
 		go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfoId)
 	}

controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -335,7 +335,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	//新增操作日志
 	{
@@ -669,7 +669,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -858,7 +858,7 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 	//保存图表与指标的关系
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 

controllers/data_manage/line_equation/line_chart_classify.go

@@ -480,7 +480,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+			go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}

controllers/data_manage/line_equation/line_chart_info.go

@@ -505,7 +505,7 @@ func (this *LineEquationChartInfoController) Move() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -1501,7 +1501,7 @@ func (this *LineEquationChartInfoController) EnInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -1745,7 +1745,7 @@ func (this *LineEquationChartInfoController) BaseInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

controllers/data_manage/line_feature/chart_info.go

@@ -1554,7 +1554,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(req.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
@@ -2633,7 +2633,7 @@ func (this *LineFeaturesChartInfoController) EnInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -2879,7 +2879,7 @@ func (this *LineFeaturesChartInfoController) BaseInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

controllers/data_manage/line_feature/classify.go

@@ -480,7 +480,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+			go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}

controllers/data_manage/public_chart.go

@@ -132,7 +132,7 @@ func (c *ChartPublicController) Save() {
 
 		// 更新ES
 		for _, dataPublicItem := range dataPublicItemList {
-			data.EsAddOrEditChartInfo(dataPublicItem.DataId)
+			data.AddOrEditChartInfoToEs(dataPublicItem.DataId)
 		}
 	}
 

controllers/data_manage/range_analysis/chart_classify.go

@@ -514,7 +514,7 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 		}
 		//删除ES
 		{
-			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
+			go data.DeleteChartInfoToEs(chartInfo.ChartInfoId)
 			// 删除MY ETA 图表 es数据
 			//go data.EsDeleteMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)

controllers/data_manage/range_analysis/chart_info.go

@@ -1966,7 +1966,7 @@ func (this *RangeChartChartInfoController) BaseInfoEdit() {
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -2064,7 +2064,7 @@ func (this *RangeChartChartInfoController) ChartInfoSave() {
 	}
 
 	//修改es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

models/data_manage/chart_info.go

@@ -2942,3 +2942,20 @@ func getThsHfEdbDataListMinAndMaxByMongo(source, subSource, edbInfoId int, start
 	maxData = result.MaxValue
 	return
 }
+
+// UpdateClassifyIdByChartInfoIdList
+// @Description: 根据图表id列表更新所属分类id
+// @author: Roc
+// @datetime 2024-12-10 13:18:52
+// @param chartInfoIdList int
+// @param chartClassifyId int
+// @return err error
+func UpdateClassifyIdByChartInfoIdList(chartInfoIdList []int, chartClassifyId int) (err error) {
+	if len(chartInfoIdList) <= 0 {
+		return
+	}
+	sql := ` UPDATE chart_info SET chart_classify_id = ? WHERE  chart_info_id in (?) `
+	err = global.DmSQL["data"].Exec(sql, chartClassifyId, chartInfoIdList).Error
+
+	return
+}

services/data/chart_info.go

@@ -2382,7 +2382,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 	_ = SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 
 	//添加es数据
-	go EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }
@@ -2745,7 +2745,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	_ = SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 
 	//添加es数据
-	go EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

services/data/chart_info_elastic.go

@@ -21,13 +21,13 @@ func AddAllChartInfo() {
 	}
 	total := len(allList)
 	for k, v := range allList {
-		EsAddOrEditChartInfo(v.ChartInfoId)
+		AddOrEditChartInfoToEs(v.ChartInfoId)
 		fmt.Println("剩余", total-k-1, "条图表数据，当前图表id：", v.ChartInfoId)
 	}
 }
 
-// EsAddOrEditChartInfo 新增和修改ES中的图表数据
-func EsAddOrEditChartInfo(chartInfoId int) {
+// AddOrEditChartInfoToEs 新增和修改ES中的图表数据
+func AddOrEditChartInfoToEs(chartInfoId int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -49,13 +49,13 @@ func EsAddOrEditChartInfo(chartInfoId int) {
 	itemInfo.SharedUserIdList = sharedList
 
 	//添加es
-	err = elastic.EsAddOrEditChartInfoData(utils.CHART_INDEX_NAME, strconv.Itoa(itemInfo.ChartInfoId), itemInfo)
+	err = elastic.AddOrEditChartInfoToEsData(utils.CHART_INDEX_NAME, strconv.Itoa(itemInfo.ChartInfoId), itemInfo)
 
 	return
 }
 
-// EsDeleteChartInfo 删除ES中的图表数据
-func EsDeleteChartInfo(chartInfoId int) {
+// DeleteChartInfoToEs 删除ES中的图表数据
+func DeleteChartInfoToEs(chartInfoId int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -73,8 +73,11 @@ func EsSearchChartInfo(keyword string, showSysId int, sourceList []int, noPermis
 	return
 }
 
+// ###### 下面是MY ETA 相关，没有意义了
+
 // EsAddOrEditMyChartInfoByChartInfoId 根据图表id 新增和修改ES中的图表数据
 func EsAddOrEditMyChartInfoByChartInfoId(chartInfoId int) {
+	return
 	errMsg := make([]string, 0)
 	defer func() {
 		if len(errMsg) > 0 {
@@ -105,6 +108,7 @@ func EsAddOrEditMyChartInfoByChartInfoId(chartInfoId int) {
 
 // EsAddOrEditMyChartInfoByMyChartId 根据我的图库id 新增和修改ES中的图表数据
 func EsAddOrEditMyChartInfoByMyChartId(myChartId int) {
+	return
 	errMsg := make([]string, 0)
 	defer func() {
 		if len(errMsg) > 0 {
@@ -134,6 +138,7 @@ func EsAddOrEditMyChartInfoByMyChartId(myChartId int) {
 
 // EsDeleteMyChartInfoByMyChartId 根据我的图库id 删除ES中的图表数据
 func EsDeleteMyChartInfoByMyChartId(myChartId int) {
+	return
 	var err error
 	defer func() {
 		if err != nil {
@@ -147,12 +152,14 @@ func EsDeleteMyChartInfoByMyChartId(myChartId int) {
 
 // EsSearchMyChartInfo 搜索图表信息
 func EsSearchMyChartInfo(keyword string, adminId int, noPermissionChartIdList []int, startSize, pageSize int) (list []*data_manage.MyChartList, total int64, err error) {
+	return
 	list, total, err = elastic.SearchMyChartInfoData(utils.MY_CHART_INDEX_NAME, keyword, adminId, noPermissionChartIdList, startSize, pageSize)
 	return
 }
 
 // EsDeleteMyChartInfoByMyChartIds 根据我的图表IDs删除ES中的我的图表
 func EsDeleteMyChartInfoByMyChartIds(ids []int) {
+	return
 	if len(ids) == 0 {
 		return
 	}

services/data/chart_info_excel_balance.go

@@ -475,7 +475,7 @@ func editBalanceExcelChart(req request.AddBalanceTableChartReq) (chartInfo *data
 	chartInfo.ChartInfoId = int(newId)*/
 
 	//添加es数据
-	//go EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	//go AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }
@@ -1478,7 +1478,7 @@ func copyBalanceExcelChart(oldChartInfo *data_manage.ChartInfoView, sysUserId in
 	chartInfo.ChartInfoId = int(newId)*/
 
 	//添加es数据
-	//go EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	//go AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }

services/data/correlation/chart_info.go

@@ -898,7 +898,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	return
 }
@@ -1101,7 +1101,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -1161,7 +1161,7 @@ func CopyChartInfo(configId, classifyId int, chartName string, correlationChartI
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }

services/data/cross_variety/chart.go

@@ -746,7 +746,7 @@ func AddChartInfo(req request.AddChartReq, sysUser *system.Admin, lang string) (
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	return
 }
@@ -987,7 +987,7 @@ func EditChartInfo(req request.EditChartReq, sysUser *system.Admin, lang string)
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 

services/data/data_approve/approve.go

@@ -441,7 +441,7 @@ func UpdatePublicByDataList(dataType, dataApproveState int, dataList []SetDataPu
 
 		// 更新ES
 		for _, dataId := range dataIdList {
-			data.EsAddOrEditChartInfo(dataId)
+			data.AddOrEditChartInfoToEs(dataId)
 		}
 	}
 

services/data/edb_info.go

@@ -9,7 +9,6 @@ import (
 	"eta_gn/eta_api/models/data_manage/excel"
 	"eta_gn/eta_api/services/alarm_msg"
 	"eta_gn/eta_api/services/data/data_manage_permission"
-	"eta_gn/eta_api/services/elastic"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"sort"
@@ -699,54 +698,6 @@ func AddEdbInfo(secName, unit, frequency, noticeTime, mobile string, classifyId,
 	return
 }
 
-// AddOrEditEdbInfoToEs 添加/修改ES中的指标
-func AddOrEditEdbInfoToEs(edbInfoId int) {
-	var err error
-	defer func() {
-		if err != nil {
-			utils.FileLog.Error("添加/修改ES中的指标失败； err:%s", err.Error())
-		}
-	}()
-	//添加es
-	itemInfo, err := data_manage.GetEdbInfoEsByCondition("AND edb_info_id=?", []interface{}{edbInfoId})
-	if err != nil {
-		return
-	}
-	obj := data_manage.EdbInfoShare{}
-	list, _ := obj.GetListByEdbInfoId(edbInfoId)
-	sharedList := make([]int, 0)
-	for _, v := range list {
-		sharedList = append(sharedList, v.SysUserId)
-	}
-	itemInfo.SharedUserIdList = sharedList
-
-	err = elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
-}
-
-// AddOrEditAllEdbInfoToEs 修复ES中的所有指标
-func AddOrEditAllEdbInfoToEs() {
-	//添加es
-	total, itemInfoList, _ := data_manage.GetEsEdbInfo("", []interface{}{}, 0, 100000)
-	obj := data_manage.EdbInfoShare{}
-	for k, itemInfo := range itemInfoList {
-		list, _ := obj.GetListByEdbInfoId(itemInfo.EdbInfoId)
-		sharedList := make([]int, 0)
-		for _, v := range list {
-			sharedList = append(sharedList, v.SysUserId)
-		}
-		itemInfo.SharedUserIdList = sharedList
-
-		elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
-		fmt.Println("剩余", int(total)-k-1, "条指标数据")
-	}
-}
-
-// DeleteEdbInfoToEs 删除ES中的指标
-func DeleteEdbInfoToEs(edbInfoId int) {
-	//添加es
-	go elastic.EsDeleteEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(edbInfoId))
-}
-
 // RefreshManualData 根据手工指标code刷新手工指标数据
 func RefreshManualData(edbCode string) {
 	var err error

services/data/edb_info_es.go

@@ -0,0 +1,57 @@
+package data
+
+import (
+	"eta_gn/eta_api/models/data_manage"
+	"eta_gn/eta_api/services/elastic"
+	"eta_gn/eta_api/utils"
+	"fmt"
+	"strconv"
+)
+
+// AddOrEditEdbInfoToEs 添加/修改ES中的指标
+func AddOrEditEdbInfoToEs(edbInfoId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			utils.FileLog.Error("添加/修改ES中的指标失败； err:%s", err.Error())
+		}
+	}()
+	//添加es
+	itemInfo, err := data_manage.GetEdbInfoEsByCondition("AND edb_info_id=?", []interface{}{edbInfoId})
+	if err != nil {
+		return
+	}
+	obj := data_manage.EdbInfoShare{}
+	list, _ := obj.GetListByEdbInfoId(edbInfoId)
+	sharedList := make([]int, 0)
+	for _, v := range list {
+		sharedList = append(sharedList, v.SysUserId)
+	}
+	itemInfo.SharedUserIdList = sharedList
+
+	err = elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
+}
+
+// AddOrEditAllEdbInfoToEs 修复ES中的所有指标
+func AddOrEditAllEdbInfoToEs() {
+	//添加es
+	total, itemInfoList, _ := data_manage.GetEsEdbInfo("", []interface{}{}, 0, 100000)
+	obj := data_manage.EdbInfoShare{}
+	for k, itemInfo := range itemInfoList {
+		list, _ := obj.GetListByEdbInfoId(itemInfo.EdbInfoId)
+		sharedList := make([]int, 0)
+		for _, v := range list {
+			sharedList = append(sharedList, v.SysUserId)
+		}
+		itemInfo.SharedUserIdList = sharedList
+
+		elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
+		fmt.Println("剩余", int(total)-k-1, "条指标数据")
+	}
+}
+
+// DeleteEdbInfoToEs 删除ES中的指标
+func DeleteEdbInfoToEs(edbInfoId int) {
+	//添加es
+	go elastic.EsDeleteEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(edbInfoId))
+}

services/data/line_equation/chart_info.go

@@ -550,7 +550,7 @@ func BatchAddChartInfo(batchAddChartReq []request.AddChart, lineChartInfoConfig
 		// 添加指标引用记录
 		_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, v.ChartInfo)
 		//添加es数据
-		go data.EsAddOrEditChartInfo(v.ChartInfo.ChartInfoId)
+		go data.AddOrEditChartInfoToEs(v.ChartInfo.ChartInfoId)
 	}
 
 	return
@@ -793,7 +793,7 @@ func BatchSaveChartInfo(multipleGraphConfigId int, batchAddChartReq []request.Ad
 		_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, v.ChartInfo)
 
 		//添加es数据
-		go data.EsAddOrEditChartInfo(v.ChartInfo.ChartInfoId)
+		go data.AddOrEditChartInfoToEs(v.ChartInfo.ChartInfoId)
 	}
 	return
 }

services/data/line_feature/chart_info.go

@@ -535,7 +535,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, edbInfoMapping *data_manage.C
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	return
 }
@@ -664,7 +664,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, edbInfoMapping *data_manage
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -720,7 +720,7 @@ func CopyChartInfo(configId, configSource, classifyId int, chartName string, edb
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }

services/data/range_analysis/chart_info.go

@@ -1223,7 +1223,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfoId)
 
 	return
 }
@@ -1436,7 +1436,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartItem.ChartInfoId)
 	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
@@ -1606,7 +1606,7 @@ func CopyChartInfo(classifyId int, chartName string, oldChartInfo *data_manage.C
 	}
 
 	//添加es数据
-	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
+	go data.AddOrEditChartInfoToEs(chartInfo.ChartInfoId)
 
 	return
 }

services/elastic/chart.go

@@ -9,8 +9,8 @@ import (
 	"github.com/olivere/elastic/v7"
 )
 
-// EsAddOrEditChartInfoData 新增/修改es中的图表数据
-func EsAddOrEditChartInfoData(indexName, docId string, item *data_manage.ChartEsInfo) (err error) {
+// AddOrEditChartInfoToEsData 新增/修改es中的图表数据
+func AddOrEditChartInfoToEsData(indexName, docId string, item *data_manage.ChartEsInfo) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("EsAddOrEditData Err:", err.Error())