Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_api into debug

controllers/data_manage/chart_classify.go

@@ -427,13 +427,24 @@ func (this *ChartClassifyController) EditChartClassify() {
 	}
 
 	// 编辑图表分类
-	classifyInfo, isDeleteForumChart, err, errMsg, isSendEmail := data.EditChartClassifyV2(req.ChartClassifyId, req.ParentId, utils.CHART_SOURCE_DEFAULT, req.ChartClassifyName, req.IsSelected, this.Lang)
+	classifyInfo, isDeleteForumChart, tipCode, err, errMsg, isSendEmail := data.EditChartClassifyV2(req.ChartClassifyId, req.ParentId, utils.CHART_SOURCE_DEFAULT, req.ChartClassifyName, req.IsSelected, this.Lang)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = "保存分类失败,Err:" + err.Error()
 		br.IsSendEmail = isSendEmail
 		return
 	}
+	var ret data_manage.EditChartClassifyResp
+	if tipCode != "" {
+		br.Ret = 200
+		br.Msg = "该分类下存在已上架的图表，请先将图表从资源库下架，再关闭该精选资源分类。"
+		ret.TipCode = tipCode
+		ret.TipMsg = "该分类下存在已上架的图表，请先将图表从资源库下架，再关闭该精选资源分类。"
+		br.IsSendEmail = false
+		br.Success = true
+		br.Data = ret
+		return
+	}
 
 	// 移除精选后，删除所有的图表
 	if isDeleteForumChart {
@@ -444,6 +455,7 @@ func (this *ChartClassifyController) EditChartClassify() {
 	br.Msg = "保存成功"
 	br.Success = true
 	br.IsAddLog = true
+	br.Data = ret
 }
 
 // @Title 删除图表检测接口
@@ -638,6 +650,8 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 			br.ErrMsg = "删除失败,Err:" + err.Error()
 			return
 		}
+
+		go eta_forum.ChartClassifySaveBatch(item.Source)
 	}
 	resp := new(data_manage.AddChartInfoResp)
 	//删除图表

controllers/report_v2.go

@@ -1819,6 +1819,10 @@ func (this *ReportController) ShareGenerate() {
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
 		return
 	}
+	reportItem, _ := models.GetReportByReportId(req.ReportId)
+	if reportItem != nil && reportItem.Title != "" {
+		req.Title = reportItem.Title
+	}
 
 	link, err := services.GetReportShareUrlToken(req, this.SysUser.AdminId)
 	if err != nil || link == "" {

models/data_manage/chart_classify.go

@@ -768,3 +768,7 @@ type ChartClassifyResourceUpdate struct {
 	ChartClassifyId int `description:"分类id"`
 }
 
+type EditChartClassifyResp struct {
+	TipCode          string `description:"提示码"`
+	TipMsg           string `description:"提示信息"`
+}

models/report.go

@@ -1688,6 +1688,7 @@ func FindReportListByCondition(condition string, pars []interface{}) (items []*R
 type ReportShartUrlReq struct {
 	Url      string `description:"分享链接"`
 	ReportId int    `description:"报告ID"`
+	Title    string `description:"报告标题"`
 }
 
 type ReportShartUrlResp struct {

services/data/chart_classify.go

@@ -1092,7 +1092,7 @@ func UpdateChildClassifySelection(classifyInfo *data_manage.ChartClassify, paren
 }
 
 // 修改图表分类，可以修改父级
-func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyName string, isSelected int, lang string) (classifyInfo *data_manage.ChartClassify, isDeleteForumChart bool, err error, errMsg string, isSendEmail bool) {
+func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyName string, isSelected int, lang string) (classifyInfo *data_manage.ChartClassify, isDeleteForumChart bool, tipCode string, err error, errMsg string, isSendEmail bool) {
 	isSendEmail = true
 	errMsg = "保存失败"
 
@@ -1127,8 +1127,9 @@ func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyNam
 			return
 		}
 		if count > 0 {
-			errMsg = "该分类已经上架的分类，请先下架所有的分类，再取消精选"
-			err = fmt.Errorf("",errMsg)
+			// errMsg = "该分类下存在已经上架的分类，请先下架所有的分类，再取消精选"
+			// err = fmt.Errorf("",errMsg)
+			tipCode = "CHART_CLASSIFY_HAS_UP_CHART"
 			return
 		}
 		isDeleteForumChart = true

services/data/chart_info.go

@@ -9,6 +9,7 @@ import (
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data/data_manage_permission"
+	"eta/eta_api/services/eta_forum"
 	"eta/eta_api/utils"
 	"fmt"
 	"math"
@@ -3038,6 +3039,12 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	//修改my eta es数据
 	go EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
+	// 移出精选分类，从资源库下架
+	// 判断是否为精选目录
+	// 如果该目录不是精选目录，且该图表已经上架，则需撤回该图表
+	if chartClassify.IsSelected == 0 && chartItem.ForumChartInfoId > 0 {
+		go eta_forum.DeleteChart(chartItem.ChartInfoId)
+	}
 	return
 }
 

services/eta_forum/eta_forum_hub.go

@@ -791,7 +791,7 @@ func ChartInfoDeleteBatch(chartClassifyInfo *data_manage.ChartClassify, sysUser
 		chartClassifyIdList = append(chartClassifyIdList, strconv.Itoa(v.ChartClassifyId))
 	}
 	// 批量删除图表信息
-	condition := " AND source=? AND chart_classify_id in ?"
+	condition := " AND source=? AND chart_classify_id in ? AND forum_chart_info_id > 0"
 	total, err := data_manage.GetChartInfoCountByCondition(condition, []interface{}{chartClassifyInfo.Source, chartClassifyIdList})
 	if err != nil {
 		return

services/report_v2.go

@@ -1667,6 +1667,7 @@ func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToke
 	if linkToken != "" && utils.Rc.IsExist(utils.CACHE_REPORT_SHARE_ORIGIN_Url+linkToken) {
 		return
 	}
+
 	var ok bool
 	// 冲突检测
 	for i := 0; i < 3; i++ {
@@ -1676,6 +1677,8 @@ func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToke
 		}
 		hashUrl := utils.MurmurHash64([]byte(linkToken))
 		linkToken = utils.ConvertNumToBase62(hashUrl)
+		// 拼上报告标题
+		linkToken = fmt.Sprintf("%s %s", linkToken, req.Title)
 
 		ok = utils.Rc.IsExist(utils.CACHE_REPORT_SHARE_ORIGIN_Url + linkToken)
 		if !ok {