新增图表简介

controllers/data_manage/chart_info.go

@@ -5191,16 +5191,16 @@ func (this *ChartInfoController) GetChartDescriptionList() {
 		return
 	}
 
-	chartDescriptionList, err := models.GetChartDescriptionByChartInfoId(chartInfoId)
+	chartDescriptionList, err := data_manage.GetChartDescriptionByChartInfoId(chartInfoId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表简介失败，Err:" + err.Error()
 		return
 	}
-	list := make([]*models.ChartDescriptionList, 0)
-	response := new(models.ChartDescriptionListResponse)
+	list := make([]*data_manage.ChartDescriptionList, 0)
+	response := new(data_manage.ChartDescriptionListResponse)
 	for _, v := range chartDescriptionList {
-		list = append(list, &models.ChartDescriptionList{
+		list = append(list, &data_manage.ChartDescriptionList{
 			Id:               v.Id,
 			Description:      v.Description,
 			ChartInfoId:      v.ChartInfoId,
@@ -5237,7 +5237,7 @@ func (this *ChartInfoController) AddChartDescription() {
 		return
 	}	
 
-	var req models.ChartDescriptionAddReq
+	var req data_manage.ChartDescriptionAddReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -5263,7 +5263,7 @@ func (this *ChartInfoController) AddChartDescription() {
 		br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
 		return
 	}
-	item := &models.ChartDescription{
+	item := &data_manage.ChartDescription{
 		ChartInfoId: req.ChartInfoId,
 		Description: req.Description,
 		SysUserId: sysUser.AdminId,
@@ -5271,7 +5271,7 @@ func (this *ChartInfoController) AddChartDescription() {
 		ModifyTime: time.Now(),
 		CreateTime: time.Now(),
 	}
-	err = models.AddChartDescription(item)
+	err = data_manage.AddChartDescription(item)
 	if err != nil {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加图表简介失败，Err:" + err.Error()

models/chart_description.go → models/data_manage/chart_description.go

@@ -1,4 +1,4 @@
-package models
+package data_manage
 
 import (
 	"eta/eta_api/global"
@@ -67,3 +67,15 @@ type ChartDescriptionAddReq struct {
 	ChartInfoId int `description:"图表id"`
 	Description string `description:"简介"`
 }
+
+
+type ChartDescriptionReq struct {
+	Id               int       
+	Description      string      // 图表id
+	ChartInfoId      int       
+	SysUserId        int         // 创建人id
+	SysUserRealName  string    	 // 创建人姓名
+	AdminName        string   	 // 创建人姓名
+	ModifyTime       time.Time 	 // 变更时间
+	CreateTime       time.Time 	 // 关系建立时间  
+}

services/eta_forum/eta_forum_hub.go

@@ -23,7 +23,7 @@ type UpdateChartToForumReq struct {
 
 type ChartSaveLibReq struct {
 	ChartInfo               *data_manage.ChartInfo
-	Description             string `description:"逻辑简述"`
+	Description             []*data_manage.ChartDescriptionReq `description:"逻辑简述"`
 	EdbInfoList             []*data_manage.EdbInfo
 	ChartThemeList          []*chart_theme.ChartTheme
 	EdbInfoDataList         []*AddEdbDataReq
@@ -133,13 +133,20 @@ func UploadChart(chartInfoId int, description string, uploaderInfo *system.Admin
 		return
 	}
 
+	descriptionList, err, errMsg := getChartDescriptionWithAdminNameByChartInfoId(chartInfoId)
+	if err != nil {
+		errMsg = "获取图表简介失败"
+		err = fmt.Errorf("获取图表简介失败,Err:" + err.Error())
+		return
+	}
+
 	req := new(ChartSaveLibReq)
 	req.ChartInfo = chartInfo
 	req.ChartEdbMapping = chartMappingList
 	req.EdbInfoList = edbInfoList
 	req.EdbInfoDataList = edbInfoDataList
 	req.EdbInfoCalculateMapping = edbMappingList
-	req.Description = description
+	req.Description = descriptionList
 	req.ChartSeries = chartSeriesList
 	req.ChartSeriesEdbMapping = chartSeriesEdbList
 
@@ -258,6 +265,12 @@ func UpdateChart(chartInfoId int) (err error, errMsg string) {
 		err = fmt.Errorf("获取指标详情失败,Err:" + err.Error())
 		return
 	}
+	descriptionList, err, errMsg := getChartDescriptionWithAdminNameByChartInfoId(chartInfoId)
+	if err != nil {
+		errMsg = "获取图表简介失败"
+		err = fmt.Errorf("获取图表简介失败,Err:" + err.Error())
+		return
+	}
 	req := new(ChartSaveLibReq)
 	req.ChartInfo = chartInfo
 	req.ChartInfo.ChartInfoId = chartInfo.ForumChartInfoId
@@ -267,6 +280,7 @@ func UpdateChart(chartInfoId int) (err error, errMsg string) {
 	req.EdbInfoCalculateMapping = edbMappingList
 	req.ChartSeries = chartSeriesList
 	req.ChartSeriesEdbMapping = chartSeriesEdbList
+	req.Description = descriptionList
 	// 查询创建者信息
 	creatorInfo, _ := system.GetSysAdminById(chartInfo.SysUserId)
 	if creatorInfo != nil {
@@ -875,3 +889,43 @@ func SetChartClassifyResourceStatusDown(chartClassifyInfo *data_manage.ChartClas
 	
 	return
 }
+
+func getChartDescriptionWithAdminNameByChartInfoId(chartInfoId int) (list []*data_manage.ChartDescriptionReq, err error, errMsg string) {
+	descriptionList, err := data_manage.GetChartDescriptionByChartInfoId(chartInfoId)
+	if err != nil {
+		errMsg = "获取图表简介失败"
+		err = fmt.Errorf("获取图表简介失败,Err:" + err.Error())
+		return
+	}
+	// 查询创建者信息
+	adminIdList := make([]int, 0)
+	for _, v := range descriptionList {
+		adminIdList = append(adminIdList, v.SysUserId)
+	}
+	adminList, err := system.GetAdminListByIdList(adminIdList)
+	if err != nil {
+		errMsg = "获取创建者信息失败"
+		err = fmt.Errorf("获取创建者信息失败,Err:" + err.Error())
+		return
+	}
+	adminMap := make(map[int]string)
+	for _, v := range adminList {
+		adminMap[v.AdminId] = v.AdminName
+	}
+	for _, v := range descriptionList {
+		adminName, ok := adminMap[v.SysUserId]
+		if !ok {
+			adminName = ""
+		}
+		list = append(list, &data_manage.ChartDescriptionReq{
+			ChartInfoId: v.ChartInfoId,
+			Description: v.Description,
+			AdminName:   adminName,
+			SysUserId:   v.SysUserId,
+			SysUserRealName: v.SysUserRealName,
+			ModifyTime: v.ModifyTime,
+			CreateTime: v.CreateTime,
+		})
+	}
+	return
+}