test 图库框架接口

controllers/data_manage/chart_framework.go

@@ -213,11 +213,13 @@ func (this *ChartFrameworkController) Add() {
 	nodes := make([]*data_manage.ChartFrameworkNode, 0)
 	if len(req.Nodes) > 0 {
 		for _, v := range req.Nodes {
-			if v <= 0 {
+			if v.MyChartClassifyId <= 0 {
 				continue
 			}
 			t := new(data_manage.ChartFrameworkNode)
-			t.MyChartClassifyId = v
+			t.FrameworkName = req.FrameworkName
+			t.NodeName = v.NodeName
+			t.MyChartClassifyId = v.MyChartClassifyId
 			t.CreateTime = now
 			nodes = append(nodes, t)
 		}
@@ -312,12 +314,14 @@ func (this *ChartFrameworkController) Edit() {
 	nodes := make([]*data_manage.ChartFrameworkNode, 0)
 	if len(req.Nodes) > 0 {
 		for _, v := range req.Nodes {
-			if v <= 0 {
+			if v.MyChartClassifyId <= 0 {
 				continue
 			}
 			t := new(data_manage.ChartFrameworkNode)
-			t.ChartFrameworkId = item.ChartFrameworkId
-			t.MyChartClassifyId = v
+			t.ChartFrameworkId = req.ChartFrameworkId
+			t.FrameworkName = req.FrameworkName
+			t.NodeName = v.NodeName
+			t.MyChartClassifyId = v.MyChartClassifyId
 			t.CreateTime = now
 			nodes = append(nodes, t)
 		}

controllers/data_manage/my_chart.go

@@ -598,8 +598,20 @@ func (this *MyChartController) ClassifyDelete() {
 		return
 	}
 
-	// TODO:图库框架校验
-
+	nodeOb := new(data_manage.ChartFrameworkNode)
+	cond := ` AND my_chart_classify_id = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, req.MyChartClassifyId)
+	nodes, e := nodeOb.GetItemsByCondition(cond, pars, []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取我的图表分类关联的框架节点失败, Err: " + e.Error()
+		return
+	}
+	if len(nodes) > 0 {
+		br.Msg = "该图分类已添加节点链接, 不允许删除"
+		return
+	}
 	//var condition string
 	//var pars []interface{}
 	//
@@ -1983,3 +1995,64 @@ func (this *MyChartController) CompanyPublicClassifyList() {
 //func init() {
 //	data.AddAllMyChartInfo()
 //}
+
+// ClassifyFrameworkNodeList
+// @Title 我的图表分类-关联的框架节点列表
+// @Description 我的图表分类-关联的框架节点列表
+// @Param   MyChartClassifyId	query	int	false	"图表分类ID"
+// @Success 200 Ret=200 获取成功
+// @router /classify/framework_node_list [get]
+func (this *MyChartController) ClassifyFrameworkNodeList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = true
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	classifyId, _ := this.GetInt("MyChartClassifyId")
+	if classifyId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, MyChartClassifyId: %d", classifyId)
+		return
+	}
+
+	_, e := data_manage.GetMyChartClassifyById(sysUser.AdminId, classifyId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "分类不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取分类信息失败, Err:" + e.Error()
+		return
+	}
+
+	nodeOb := new(data_manage.ChartFrameworkNode)
+	cond := ` AND my_chart_classify_id = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, classifyId)
+	nodes, e := nodeOb.GetItemsByCondition(cond, pars, []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取我的图表分类关联的框架节点失败, Err: " + e.Error()
+		return
+	}
+	resp := make([]*data_manage.ChartFrameworkNodeItem, 0)
+	for _, v := range nodes {
+		resp = append(resp, data_manage.FormatChartFrameworkNode2Item(v))
+	}
+
+	br.Data = resp
+	br.Ret = 200
+	br.Msg = "获取成功"
+	br.Success = true
+}

models/data_manage/chart_framework.go

@@ -249,10 +249,16 @@ func (m *ChartFramework) RemoveFrameworkAndNodes(frameworkId int) (err error) {
 
 // ChartFrameworkAddReq 图库框架新增请求体
 type ChartFrameworkAddReq struct {
-	FrameworkName    string `description:"框架名称"`
-	FrameworkImg     string `description:"框架图片"`
-	FrameworkContent string `description:"框架内容"`
-	Nodes            []int  `description:"框架关联的所有节点ID"`
+	FrameworkName    string                  `description:"框架名称"`
+	FrameworkImg     string                  `description:"框架图片"`
+	FrameworkContent string                  `description:"框架内容"`
+	Nodes            []ChartFrameworkNodeReq `description:"框架节点"`
+}
+
+// ChartFrameworkNodeReq 图库框架节点请求体
+type ChartFrameworkNodeReq struct {
+	MyChartClassifyId int    `description:"我的图表分类ID"`
+	NodeName          string `description:"节点名称"`
 }
 
 // ChartFrameworkEditReq 图库框架编辑请求体

models/data_manage/chart_framework_node.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"
@@ -11,6 +12,7 @@ import (
 type ChartFrameworkNode struct {
 	ChartFrameworkNodeId int       `orm:"column(chart_framework_node_id);pk"`
 	ChartFrameworkId     int       `description:"框架ID"`
+	FrameworkName        string    `description:"框架名称"`
 	NodeName             string    `description:"节点名称"`
 	MyChartClassifyId    int       `description:"我的图表分类ID"`
 	CreateTime           time.Time `description:"创建时间"`
@@ -106,3 +108,28 @@ func (m *ChartFrameworkNode) GetPageItemsByCondition(condition string, pars []in
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// ChartFrameworkNodeItem 图库框架节点信息
+type ChartFrameworkNodeItem struct {
+	ChartFrameworkNodeId int
+	ChartFrameworkId     int    `description:"框架ID"`
+	FrameworkName        string `description:"框架名称"`
+	NodeName             string `description:"节点名称"`
+	MyChartClassifyId    int    `description:"我的图表分类ID"`
+	CreateTime           string `description:"创建时间"`
+}
+
+// FormatChartFrameworkNode2Item 格式化框架节点信息
+func FormatChartFrameworkNode2Item(origin *ChartFrameworkNode) (item *ChartFrameworkNodeItem) {
+	if origin == nil {
+		return
+	}
+	item = new(ChartFrameworkNodeItem)
+	item.ChartFrameworkNodeId = origin.ChartFrameworkNodeId
+	item.ChartFrameworkId = origin.ChartFrameworkId
+	item.FrameworkName = origin.FrameworkName
+	item.NodeName = origin.NodeName
+	item.MyChartClassifyId = origin.MyChartClassifyId
+	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
+	return
+}

routers/commentsRouter.go

@@ -3112,6 +3112,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"],
+        beego.ControllerComments{
+            Method: "ClassifyFrameworkNodeList",
+            Router: `/classify/framework_node_list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"],
         beego.ControllerComments{
             Method: "ClassifyList",