fix:图库相关

controllers/data_manage/chart_public_classify.go

@@ -207,7 +207,7 @@ func (c *ChartPublicClassifyController) AddClassify() {
 	source := utils.CHART_TYPE_CURVE
 
 	//添加指标
-	_, err, errMsg := data.AddChartPublicClassify(req.ChartClassifyName, req.ParentId, req.Level, source, c.SysUser.AdminId, c.SysUser.RealName)
+	_, err, errMsg := data.AddChartPublicClassify(req.ChartClassifyName, req.ParentId, source, c.SysUser.AdminId, c.SysUser.RealName)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -283,8 +283,8 @@ func (c *ChartPublicClassifyController) EditChartClassify() {
 		return
 	}
 
-	if req.ChartClassifyId < 0 {
-		br.Msg = "参数错误"
+	if req.ChartClassifyId <= 0 {
+		br.Msg = "请选择指标"
 		br.IsSendEmail = false
 		return
 	}
@@ -306,10 +306,10 @@ func (c *ChartPublicClassifyController) EditChartClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteChartClassifyCheck
+// DeleteClassifyCheck
 // @Title 删除检测接口
 // @Description 删除检测接口
-// @Param	request	body request.PublicClassifyDeleteCheckReq true "type json string"
+// @Param	request	body request.PublicChartClassifyDeleteCheckReq true "type json string"
 // @Success 200 Ret=200 检测成功
 // @router /chart_public/classify/delete/check [post]
 func (c *ChartPublicClassifyController) DeleteClassifyCheck() {
@@ -319,7 +319,7 @@ func (c *ChartPublicClassifyController) DeleteClassifyCheck() {
 		c.ServeJSON()
 	}()
 
-	var req request.PublicClassifyDeleteCheckReq
+	var req request.PublicChartClassifyDeleteCheckReq
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -327,12 +327,12 @@ func (c *ChartPublicClassifyController) DeleteClassifyCheck() {
 		return
 	}
 
-	if req.ClassifyId < 0 {
+	if req.ChartClassifyId <= 0 {
 		br.Msg = "参数错误"
 		br.IsSendEmail = false
 		return
 	}
-	deleteStatus, tipsMsg, _, tableList, err, errMsg := data.DeleteChartPublicClassifyCheck(req.ClassifyId, c.SysUser)
+	deleteStatus, tipsMsg, _, tableList, err, errMsg := data.DeleteChartPublicClassifyCheck(req.ChartClassifyId, c.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -418,10 +418,10 @@ func (c *ChartPublicClassifyController) DeleteClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteChartClassify
+// DeleteClassify
 // @Title 删除公共分类/指标
 // @Description 删除公共分类/指标接口
-// @Param	request	body request.PublicClassifyDeleteCheckReq true "type json string"
+// @Param	request	body request.PublicChartClassifyDeleteCheckReq true "type json string"
 // @Success 200 Ret=200 删除成功
 // @router /chart_public/classify/delete [post]
 func (c *ChartPublicClassifyController) DeleteClassify() {
@@ -437,7 +437,7 @@ func (c *ChartPublicClassifyController) DeleteClassify() {
 		br.Ret = 408
 		return
 	}
-	var req request.PublicClassifyDeleteCheckReq
+	var req request.PublicChartClassifyDeleteCheckReq
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -445,13 +445,13 @@ func (c *ChartPublicClassifyController) DeleteClassify() {
 		return
 	}
 
-	if req.ClassifyId < 0 {
+	if req.ChartClassifyId <= 0 {
 		br.Msg = "参数错误"
 		br.IsSendEmail = false
 		return
 	}
 
-	nextItem, _, err, errMsg := data.DeleteChartPublicClassify(req.ClassifyId, sysUser, string(c.Ctx.Input.RequestBody), c.Ctx.Input.URI())
+	nextItem, _, err, errMsg := data.DeleteChartPublicClassify(req.ChartClassifyId, sysUser, string(c.Ctx.Input.RequestBody), c.Ctx.Input.URI())
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

controllers/data_manage/edb_public_classify.go

@@ -229,7 +229,7 @@ func (c *EdbPublicClassifyController) AddClassify() {
 	classifyType := utils.EdbClassifyTypeCalculate
 
 	//添加指标
-	_, err, errMsg := data.AddEdbPublicClassify(req.ClassifyName, req.ParentId, req.Level, uint8(classifyType), c.SysUser.AdminId, c.SysUser.RealName)
+	_, err, errMsg := data.AddEdbPublicClassify(req.ClassifyName, req.ParentId, uint8(classifyType), c.SysUser.AdminId, c.SysUser.RealName)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -349,7 +349,7 @@ func (c *EdbPublicClassifyController) DeleteClassifyCheck() {
 		return
 	}
 
-	if req.ClassifyId < 0 {
+	if req.ClassifyId <= 0 {
 		br.Msg = "参数错误"
 		br.IsSendEmail = false
 		return
@@ -467,7 +467,7 @@ func (c *EdbPublicClassifyController) DeleteClassify() {
 		return
 	}
 
-	if req.ClassifyId < 0 {
+	if req.ClassifyId <= 0 {
 		br.Msg = "参数错误"
 		br.IsSendEmail = false
 		return

controllers/fix.go

@@ -696,7 +696,7 @@ func updateChartPath(item *data_manage.ChartClassifyItems, classifyNamePath, cla
 // @datetime 2024-11-29 16:18:02
 func initEs() {
 	// 更新ES中的指标数据
-	data.AddOrEditAllEdbInfoToEs()
+	//data.AddOrEditAllEdbInfoToEs()
 	// 更新es中的图表数据
 	data.AddAllChartInfo()
 

models/data_manage/chart_info.go

@@ -16,54 +16,54 @@ import (
 )
 
 type ChartInfo struct {
-	ChartInfoId         int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
-	ChartName           string `description:"图表名称"`
-	ChartNameEn         string `description:"英文图表名称"`
-	ChartClassifyId     int    `description:"图表分类id"`
-	SysUserId           int
-	SysUserRealName     string
-	UniqueCode          string `description:"图表唯一编码"`
-	CreateTime          time.Time
-	ModifyTime          time.Time
-	DateType            int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
-	StartDate           string    `description:"自定义开始日期"`
-	EndDate             string    `description:"自定义结束日期"`
-	IsSetName           int       `description:"设置名称"`
-	EdbInfoIds          string    `description:"指标id"`
-	ChartType           int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图，10:截面散点图, 11：雷达图"`
-	Calendar            string    `description:"公历/农历"`
-	SeasonStartDate     string    `description:"季节性图开始日期"`
-	SeasonEndDate       string    `description:"季节性图开始日期"`
-	ChartImage          string    `description:"图表图片"`
-	Sort                int       `description:"排序字段，数字越小越排前面"`
-	XMin                string    `description:"图表X轴最小值"`
-	XMax                string    `description:"图表X轴最大值"`
-	LeftMin             string    `description:"图表左侧最小值"`
-	LeftMax             string    `description:"图表左侧最大值"`
-	RightMin            string    `description:"图表右侧最小值"`
-	RightMax            string    `description:"图表右侧最大值"`
-	Right2Min           string    `description:"图表右侧2最小值"`
-	Right2Max           string    `description:"图表右侧2最大值"`
-	MinMaxSave          int       `description:"是否手动保存过上下限：0-否；1-是"`
-	Disabled            int       `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig           string    `description:"柱方图的配置，json数据"`
-	Source              int       `description:"1：ETA图库；2：商品价格曲线"`
-	ExtraConfig         string    `description:"图表额外配置,json数据"`
-	SeasonExtraConfig   string    `description:"季节性图表中的配置,json数据"`
-	StartYear           int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
-	ChartThemeId        int       `description:"图表应用主题ID"`
-	SourcesFrom         string    `description:"图表来源"`
-	Instructions        string    `description:"图表说明"`
-	MarkersLines        string    `description:"标识线"`
-	MarkersAreas        string    `description:"标识区"`
-	Unit                string    `description:"中文单位名称"`
-	UnitEn              string    `description:"英文单位名称"`
-	IsJoinPermission    int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	ForumChartInfoId    int       `description:"社区的图表ID"`
-	ChartAlias          string    `description:"图表别名"`
-	PublicStatus        int       `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
-	EdbPublicClassifyId int       `description:"指标公开分类id"`
-	PublicTime          time.Time `description:"设置公开的时间"`
+	ChartInfoId           int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
+	ChartName             string `description:"图表名称"`
+	ChartNameEn           string `description:"英文图表名称"`
+	ChartClassifyId       int    `description:"图表分类id"`
+	SysUserId             int
+	SysUserRealName       string
+	UniqueCode            string `description:"图表唯一编码"`
+	CreateTime            time.Time
+	ModifyTime            time.Time
+	DateType              int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate             string    `description:"自定义开始日期"`
+	EndDate               string    `description:"自定义结束日期"`
+	IsSetName             int       `description:"设置名称"`
+	EdbInfoIds            string    `description:"指标id"`
+	ChartType             int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图，10:截面散点图, 11：雷达图"`
+	Calendar              string    `description:"公历/农历"`
+	SeasonStartDate       string    `description:"季节性图开始日期"`
+	SeasonEndDate         string    `description:"季节性图开始日期"`
+	ChartImage            string    `description:"图表图片"`
+	Sort                  int       `description:"排序字段，数字越小越排前面"`
+	XMin                  string    `description:"图表X轴最小值"`
+	XMax                  string    `description:"图表X轴最大值"`
+	LeftMin               string    `description:"图表左侧最小值"`
+	LeftMax               string    `description:"图表左侧最大值"`
+	RightMin              string    `description:"图表右侧最小值"`
+	RightMax              string    `description:"图表右侧最大值"`
+	Right2Min             string    `description:"图表右侧2最小值"`
+	Right2Max             string    `description:"图表右侧2最大值"`
+	MinMaxSave            int       `description:"是否手动保存过上下限：0-否；1-是"`
+	Disabled              int       `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig             string    `description:"柱方图的配置，json数据"`
+	Source                int       `description:"1：ETA图库；2：商品价格曲线"`
+	ExtraConfig           string    `description:"图表额外配置,json数据"`
+	SeasonExtraConfig     string    `description:"季节性图表中的配置,json数据"`
+	StartYear             int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	ChartThemeId          int       `description:"图表应用主题ID"`
+	SourcesFrom           string    `description:"图表来源"`
+	Instructions          string    `description:"图表说明"`
+	MarkersLines          string    `description:"标识线"`
+	MarkersAreas          string    `description:"标识区"`
+	Unit                  string    `description:"中文单位名称"`
+	UnitEn                string    `description:"英文单位名称"`
+	IsJoinPermission      int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	ForumChartInfoId      int       `description:"社区的图表ID"`
+	ChartAlias            string    `description:"图表别名"`
+	PublicStatus          int       `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
+	ChartPublicClassifyId int       `description:"图表公开分类id"`
+	PublicTime            time.Time `description:"设置公开的时间"`
 }
 
 type ChartInfoMore struct {
@@ -158,55 +158,55 @@ type ChartInfoSearchResp struct {
 // ChartEsInfo
 // @Description: Es中的数据
 type ChartEsInfo struct {
-	ChartInfoId         int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
-	ChartName           string `description:"图表名称"`
-	ChartNameEn         string `description:"英文图表名称"`
-	ChartClassifyId     int    `description:"图表分类id"`
-	SysUserId           int
-	SysUserRealName     string
-	UniqueCode          string `description:"图表唯一编码"`
-	CreateTime          time.Time
-	ModifyTime          time.Time
-	DateType            int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
-	StartDate           string    `description:"自定义开始日期"`
-	EndDate             string    `description:"自定义结束日期"`
-	IsSetName           int       `description:"设置名称"`
-	EdbInfoIds          string    `description:"指标id"`
-	ChartType           int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图，10:截面散点图, 11：雷达图"`
-	Calendar            string    `description:"公历/农历"`
-	SeasonStartDate     string    `description:"季节性图开始日期"`
-	SeasonEndDate       string    `description:"季节性图开始日期"`
-	ChartImage          string    `description:"图表图片"`
-	Sort                int       `description:"排序字段，数字越小越排前面"`
-	XMin                string    `description:"图表X轴最小值"`
-	XMax                string    `description:"图表X轴最大值"`
-	LeftMin             string    `description:"图表左侧最小值"`
-	LeftMax             string    `description:"图表左侧最大值"`
-	RightMin            string    `description:"图表右侧最小值"`
-	RightMax            string    `description:"图表右侧最大值"`
-	Right2Min           string    `description:"图表右侧2最小值"`
-	Right2Max           string    `description:"图表右侧2最大值"`
-	MinMaxSave          int       `description:"是否手动保存过上下限：0-否；1-是"`
-	Disabled            int       `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig           string    `description:"柱方图的配置，json数据"`
-	Source              int       `description:"1：ETA图库；2：商品价格曲线"`
-	ExtraConfig         string    `description:"图表额外配置,json数据"`
-	SeasonExtraConfig   string    `description:"季节性图表中的配置,json数据"`
-	StartYear           int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
-	ChartThemeId        int       `description:"图表应用主题ID"`
-	SourcesFrom         string    `description:"图表来源"`
-	Instructions        string    `description:"图表说明"`
-	MarkersLines        string    `description:"标识线"`
-	MarkersAreas        string    `description:"标识区"`
-	Unit                string    `description:"中文单位名称"`
-	UnitEn              string    `description:"英文单位名称"`
-	IsJoinPermission    int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	ForumChartInfoId    int       `description:"社区的图表ID"`
-	ChartAlias          string    `description:"图表别名"`
-	SharedUserIdList    []int     `description:"共享用户id列表" gorm:"-"`
-	PublicStatus        int       `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
-	EdbPublicClassifyId int       `description:"指标公开分类id"`
-	PublicTime          time.Time `description:"设置公开的时间"`
+	ChartInfoId           int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
+	ChartName             string `description:"图表名称"`
+	ChartNameEn           string `description:"英文图表名称"`
+	ChartClassifyId       int    `description:"图表分类id"`
+	SysUserId             int
+	SysUserRealName       string
+	UniqueCode            string `description:"图表唯一编码"`
+	CreateTime            time.Time
+	ModifyTime            time.Time
+	DateType              int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate             string    `description:"自定义开始日期"`
+	EndDate               string    `description:"自定义结束日期"`
+	IsSetName             int       `description:"设置名称"`
+	EdbInfoIds            string    `description:"指标id"`
+	ChartType             int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图，10:截面散点图, 11：雷达图"`
+	Calendar              string    `description:"公历/农历"`
+	SeasonStartDate       string    `description:"季节性图开始日期"`
+	SeasonEndDate         string    `description:"季节性图开始日期"`
+	ChartImage            string    `description:"图表图片"`
+	Sort                  int       `description:"排序字段，数字越小越排前面"`
+	XMin                  string    `description:"图表X轴最小值"`
+	XMax                  string    `description:"图表X轴最大值"`
+	LeftMin               string    `description:"图表左侧最小值"`
+	LeftMax               string    `description:"图表左侧最大值"`
+	RightMin              string    `description:"图表右侧最小值"`
+	RightMax              string    `description:"图表右侧最大值"`
+	Right2Min             string    `description:"图表右侧2最小值"`
+	Right2Max             string    `description:"图表右侧2最大值"`
+	MinMaxSave            int       `description:"是否手动保存过上下限：0-否；1-是"`
+	Disabled              int       `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig             string    `description:"柱方图的配置，json数据"`
+	Source                int       `description:"1：ETA图库；2：商品价格曲线"`
+	ExtraConfig           string    `description:"图表额外配置,json数据"`
+	SeasonExtraConfig     string    `description:"季节性图表中的配置,json数据"`
+	StartYear             int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	ChartThemeId          int       `description:"图表应用主题ID"`
+	SourcesFrom           string    `description:"图表来源"`
+	Instructions          string    `description:"图表说明"`
+	MarkersLines          string    `description:"标识线"`
+	MarkersAreas          string    `description:"标识区"`
+	Unit                  string    `description:"中文单位名称"`
+	UnitEn                string    `description:"英文单位名称"`
+	IsJoinPermission      int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	ForumChartInfoId      int       `description:"社区的图表ID"`
+	ChartAlias            string    `description:"图表别名"`
+	SharedUserIdList      []int     `description:"共享用户id列表" gorm:"-"`
+	PublicStatus          int       `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
+	ChartPublicClassifyId int       `description:"图表公开分类id"`
+	PublicTime            time.Time `description:"设置公开的时间"`
 }
 
 func GetChartEsInfoById(chartInfoId int) (item *ChartEsInfo, err error) {
@@ -1998,27 +1998,27 @@ type ChartInfoView struct {
 	BarConfig         string               `description:"柱方图的配置，json数据" json:"-"`
 	Source            int                  `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
 	//CorrelationLeadUnit string `description:"相关性图表-领先单位"`
-	ExtraConfig         string          `description:"图表额外配置,json数据"`
-	ChartSource         string          `description:"图表来源str"`
-	ChartSourceEn       string          `description:"图表来源（英文）"`
-	Button              ChartViewButton `gorm:"-" description:"操作按钮"`
-	SeasonExtraConfig   string          `description:"季节性图表中的配置,json数据"`
-	StartYear           int             `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
-	ChartThemeId        int             `description:"图表应用主题ID"`
-	ChartThemeStyle     string          `description:"图表应用主题样式"`
-	SourcesFrom         string          `description:"图表来源"`
-	Instructions        string          `description:"图表说明"`
-	MarkersLines        string          `description:"标识线"`
-	MarkersAreas        string          `description:"标识区"`
-	IsJoinPermission    int             `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	HaveOperaAuth       bool            `description:"是否有数据权限，默认：false"`
-	ForumChartInfoId    int             `description:"社区的图表ID"`
-	ChartAlias          string          `description:"图表别名"`
-	SharedUserIdList    []int           `description:"共享用户id列表" gorm:"-"`
-	SharedUserName      string          `description:"共享用户姓名，多个用英文,隔开" gorm:"-"`
-	PublicStatus        int             `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
-	EdbPublicClassifyId int             `description:"指标公开分类id"`
-	PublicTime          time.Time       `description:"设置公开的时间"`
+	ExtraConfig           string          `description:"图表额外配置,json数据"`
+	ChartSource           string          `description:"图表来源str"`
+	ChartSourceEn         string          `description:"图表来源（英文）"`
+	Button                ChartViewButton `gorm:"-" description:"操作按钮"`
+	SeasonExtraConfig     string          `description:"季节性图表中的配置,json数据"`
+	StartYear             int             `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	ChartThemeId          int             `description:"图表应用主题ID"`
+	ChartThemeStyle       string          `description:"图表应用主题样式"`
+	SourcesFrom           string          `description:"图表来源"`
+	Instructions          string          `description:"图表说明"`
+	MarkersLines          string          `description:"标识线"`
+	MarkersAreas          string          `description:"标识区"`
+	IsJoinPermission      int             `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	HaveOperaAuth         bool            `description:"是否有数据权限，默认：false"`
+	ForumChartInfoId      int             `description:"社区的图表ID"`
+	ChartAlias            string          `description:"图表别名"`
+	SharedUserIdList      []int           `description:"共享用户id列表" gorm:"-"`
+	SharedUserName        string          `description:"共享用户姓名，多个用英文,隔开" gorm:"-"`
+	PublicStatus          int             `description:"公开状态；0：未公开；1：审批中；2：已驳回；3：已公开"`
+	ChartPublicClassifyId int             `description:"图表公开分类id"`
+	PublicTime            time.Time       `description:"设置公开的时间"`
 }
 
 type ChartViewButton struct {

models/data_manage/request/public_chart.go

@@ -1,51 +1,57 @@
 package request
 
+// PublicChartClassifyDeleteCheckReq
+// @Description: 公共图表分类删除请求
+type PublicChartClassifyDeleteCheckReq struct {
+	ChartClassifyId int `description:"分类id"`
+}
+
 // SetChartPublicReq
-// @Description: 设置指标公开的请求
+// @Description: 设置图表公开的请求
 type SetChartPublicReq struct {
-	ChartInfoList []SetChartPublicChartReq `description:"待设置的指标"`
+	ChartInfoList []SetChartPublicChartReq `description:"待设置的图表"`
 	Description   string                   `description:"备注"`
 }
 
 // CancelChartPublicReq
-// @Description: 撤销指标公开的请求
+// @Description: 撤销图表公开的请求
 type CancelChartPublicReq struct {
-	ChartInfoId int    `description:"待设置的指标"`
+	ChartInfoId int    `description:"待设置的图表"`
 	Description string `description:"备注"`
 }
 
 type SetChartPublicChartReq struct {
-	ChartInfoId int `description:"指标id列表"`
+	ChartInfoId int `description:"图表id列表"`
 	ClassifyId  int `description:"公共分类id"`
 }
 
 // SearchPublicChartReq
-// @Description: 获取指标列表（设置公开的时候）请求结构体
+// @Description: 获取图表列表（设置公开的时候）请求结构体
 type SearchPublicChartReq struct {
-	ChartPublicList      []int  `description:"指标公开状态：1：未公开，2：已提交；3：已公开。可多选，默认是未公开"`
+	ChartPublicList      []int  `description:"图表公开状态：1：未公开，2：已提交；3：已公开。可多选，默认是未公开"`
 	SourceList           []int  `description:"来源id"`
 	Keyword              string `description:"关键字"`
-	ClassifyIdList       []int  `description:"指标分类选择，如果不指定分类，那么就是所有分类"`
-	PublicClassifyIdList []int  `description:"指标所属公共分类id，如果不指定分类，那么就是所有分类"`
+	ClassifyIdList       []int  `description:"图表分类选择，如果不指定分类，那么就是所有分类"`
+	PublicClassifyIdList []int  `description:"图表所属公共分类id，如果不指定分类，那么就是所有分类"`
 	CurrentIndex         int    `description:"当前页页码，从1开始"`
 	PageSize             int    `description:"每页数据条数"`
 }
 
 // AllSearchPublicChartReq
-// @Description: 获取所有指标列表（设置公开的时候）请求结构体
+// @Description: 获取所有图表列表（设置公开的时候）请求结构体
 type AllSearchPublicChartReq struct {
 	SearchPublicChartReq
-	ChartIdList   []int `description:"选中的指标id列表"`
-	NoChartIdList []int `description:"未选中的指标id列表"`
-	IsSelectAll   bool  `description:"是否选择所有指标"`
+	ChartIdList   []int `description:"选中的图表id列表"`
+	NoChartIdList []int `description:"未选中的图表id列表"`
+	IsSelectAll   bool  `description:"是否选择所有图表"`
 }
 
 // MoveChartClassifyReq
-// @Description: 移动指标分类的请求结构体
+// @Description: 移动图表分类的请求结构体
 type MoveChartClassifyReq struct {
 	SearchPublicChartReq
-	ChartIdList   []int `description:"选中的指标id列表"`
-	NoChartIdList []int `description:"未选中的指标id列表"`
-	IsSelectAll   bool  `description:"是否选择所有指标"`
+	ChartIdList   []int `description:"选中的图表id列表"`
+	NoChartIdList []int `description:"未选中的图表id列表"`
+	IsSelectAll   bool  `description:"是否选择所有图表"`
 	NewClassifyId int   `description:"新的分类id"`
 }

routers/router.go

@@ -164,6 +164,9 @@ func init() {
 				&data_manage.EdbInfoShareController{},
 				&data_manage.EdbPublicController{},
 				&data_manage.EdbPublicClassifyController{},
+				&data_manage.ChartInfoShareController{},
+				&data_manage.ChartPublicController{},
+				&data_manage.ChartPublicClassifyController{},
 			),
 			web.NSNamespace("/data_approve",
 				web.NSInclude(

services/data/chart_public_classify.go

@@ -18,14 +18,13 @@ import (
 // @datetime 2024-12-04 18:00:22
 // @param classifyName string
 // @param parentId int
-// @param level int
 // @param source int
 // @param sysUserId int
 // @param sysUserName string
 // @return classifyInfo *data_manage.ChartPublicClassify
 // @return err error
 // @return errMsg string
-func AddChartPublicClassify(classifyName string, parentId, level, source int, sysUserId int, sysUserName string) (classifyInfo *data_manage.ChartPublicClassify, err error, errMsg string) {
+func AddChartPublicClassify(classifyName string, parentId, source int, sysUserId int, sysUserName string) (classifyInfo *data_manage.ChartPublicClassify, err error, errMsg string) {
 	chartPublicClassifyObj := data_manage.ChartPublicClassify{}
 	// 校验分类名称相同的数量
 	{
@@ -42,12 +41,6 @@ func AddChartPublicClassify(classifyName string, parentId, level, source int, sy
 		}
 	}
 
-	// 层级校验
-	if level > 6 {
-		errMsg = fmt.Sprintf("最高只支持添加6级分类")
-		return
-	}
-
 	//获取该层级下最大的排序数
 	maxSort, err := GetChartPublicClassifyMaxSort(parentId, source)
 	if err != nil {
@@ -58,6 +51,9 @@ func AddChartPublicClassify(classifyName string, parentId, level, source int, sy
 	//查询顶级rootId
 	rootId := 0
 	var classifyNamePath, classifyIdPath string
+
+	// 层级
+	level := 0
 	if parentId > 0 {
 		parentClassify, tErr := chartPublicClassifyObj.GetChartClassifyById(parentId)
 		if tErr != nil {
@@ -70,6 +66,7 @@ func AddChartPublicClassify(classifyName string, parentId, level, source int, sy
 			err = errors.New("获取分类信息失败，Err:" + tErr.Error())
 			return
 		}
+		level = parentClassify.Level
 		rootId = parentClassify.RootId
 
 		classifyNamePath = fmt.Sprint(parentClassify.ChartPublicClassifyNamePath, "|", classifyName)
@@ -78,6 +75,12 @@ func AddChartPublicClassify(classifyName string, parentId, level, source int, sy
 		classifyNamePath = classifyName
 	}
 
+	// 层级校验
+	if level > 6 {
+		errMsg = fmt.Sprintf("最高只支持添加6级分类")
+		return
+	}
+
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	classifyInfo = &data_manage.ChartPublicClassify{
 		//ChartPublicClassifyId:       0,

services/data/edb_public_classify.go

@@ -25,7 +25,7 @@ import (
 // @return classifyInfo *data_manage.EdbPublicClassify
 // @return err error
 // @return errMsg string
-func AddEdbPublicClassify(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbPublicClassify, err error, errMsg string) {
+func AddEdbPublicClassify(classifyName string, parentId int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbPublicClassify, err error, errMsg string) {
 	edbPublicClassifyObj := data_manage.EdbPublicClassify{}
 	// 校验分类名称相同的数量
 	{
@@ -42,11 +42,8 @@ func AddEdbPublicClassify(classifyName string, parentId, level int, classifyType
 		}
 	}
 
-	// 层级校验
-	if level > utils.EdbClassifyMaxLevel {
-		errMsg = fmt.Sprintf("最高只支持添加%d级分类", level)
-		return
-	}
+	// 父级的层级
+	level := 0
 
 	//获取该层级下最大的排序数
 	maxSort, err := GetEdbPublicClassifyMaxSort(parentId, classifyType)
@@ -70,6 +67,7 @@ func AddEdbPublicClassify(classifyName string, parentId, level int, classifyType
 			err = errors.New("获取分类信息失败，Err:" + tErr.Error())
 			return
 		}
+		level = parentClassify.Level
 		rootId = parentClassify.RootId
 
 		classifyNamePath = fmt.Sprint(parentClassify.EdbPublicClassifyNamePath, "|", classifyName)
@@ -78,6 +76,12 @@ func AddEdbPublicClassify(classifyName string, parentId, level int, classifyType
 		classifyNamePath = classifyName
 	}
 
+	// 层级校验
+	if level > utils.EdbClassifyMaxLevel {
+		errMsg = fmt.Sprintf("最高只支持添加%d级分类", level)
+		return
+	}
+
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	classifyInfo = &data_manage.EdbPublicClassify{
 		//EdbPublicClassifyId:       0,