|
@@ -449,6 +449,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
}
|
|
|
}
|
|
|
resp := new(data_manage.AddChartInfoResp)
|
|
|
+
|
|
|
//删除图表
|
|
|
if req.ChartInfoId > 0 {
|
|
|
chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
|
|
@@ -492,13 +493,23 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
}
|
|
|
|
|
|
source := chartInfo.Source // 相关性图表(滚动相关性)
|
|
|
- //删除图表及关联指标
|
|
|
+
|
|
|
+ // 删除图表及关联指标
|
|
|
err = data_manage.DeleteChartInfoAndData(chartInfo.ChartInfoId)
|
|
|
if err != nil {
|
|
|
br.Msg = "删除失败"
|
|
|
br.ErrMsg = "删除失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ // 删除图表关联
|
|
|
+ e = correlationServ.RemoveCorrelationRelate(chartInfo.ChartInfoId)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "删除失败"
|
|
|
+ br.ErrMsg = fmt.Sprintf("删除相关性图表关联失败, %v", e)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
//删除ES
|
|
|
{
|
|
|
go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
|
|
@@ -507,13 +518,11 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
go data.EsDeleteMyChartInfoByMyChartIds(myIds)
|
|
|
}
|
|
|
|
|
|
+ // 删除后定位至其他图(不知道原需求具体定位到哪张...修复的时候只是多加上了个source条件)
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
- condition += " AND chart_classify_id=? AND source = ? "
|
|
|
- pars = append(pars, chartInfo.ChartClassifyId, source)
|
|
|
-
|
|
|
- condition += " AND chart_info_id>? ORDER BY create_time ASC LIMIT 1 "
|
|
|
- pars = append(pars, req.ChartInfoId)
|
|
|
+ condition += ` AND chart_classify_id = ? AND source = ? AND chart_info_id > ? ORDER BY create_time ASC LIMIT 1`
|
|
|
+ pars = append(pars, chartInfo.ChartClassifyId, source, req.ChartInfoId)
|
|
|
|
|
|
nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -529,11 +538,8 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
|
|
|
- condition += " AND level=1 "
|
|
|
- //pars = append(pars, chartInfo.ChartClassifyId)
|
|
|
-
|
|
|
- condition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
|
|
|
- pars = append(pars, chartInfo.ChartClassifyId)
|
|
|
+ condition += ` AND level = 1 AND chart_classify_id > ? AND source = ? ORDER BY chart_classify_id ASC LIMIT 1`
|
|
|
+ pars = append(pars, chartInfo.ChartClassifyId, source)
|
|
|
|
|
|
classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -542,7 +548,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
return
|
|
|
}
|
|
|
if classifyItem != nil {
|
|
|
- nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
|
|
|
+ nextItem, err = data_manage.GetNextChartByClassifyIdAndSource(chartInfo.ChartClassifyId, source)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Msg = "删除失败"
|
|
|
br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
|
|
@@ -555,14 +561,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 删除图表关联
|
|
|
- e = correlationServ.RemoveCorrelationRelate(chartInfo.ChartInfoId)
|
|
|
- if e != nil {
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = fmt.Sprintf("删除相关性图表关联失败, %v", e)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
//新增操作日志
|
|
|
{
|
|
|
chartLog := new(data_manage.ChartInfoLog)
|