Merge remote-tracking branch 'origin/eta/1.7.6' into debug

controllers/data_manage/data_manage_permission/data_move.go

@@ -60,6 +60,74 @@ func (c *DataMangePermissionController) EdbChartClassifyList() {
 	br.Data = list
 }
 
+// SecretEdbChartClassifyList
+// @Title 获取涉密的指标/图表分类列表数据接口
+// @Description 获取指标/图表分类列表数据接口
+// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
+// @Param   SubSource   query   int  false       "子来源 ：ETA表格中的各种表格类型，以及图表的来源（这个是后续的扩展方向）"
+// @Success 200 {object} data_manage.ChartListResp
+// @router /edb_chart/classify/secret [get]
+func (c *DataMangePermissionController) SecretEdbChartClassifyList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	source, _ := c.GetInt("Source")
+	if source <= 0 || source > 6 {
+		br.Msg = "错误的来源"
+		br.IsSendEmail = false
+		return
+	}
+
+	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
+	subSource, _ := c.GetInt("SubSource")
+	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.CUSTOM_ANALYSIS_TABLE) {
+		br.Msg = "错误的子来源"
+		br.IsSendEmail = false
+		return
+	}
+
+	resp, err := data_manage_permission.GetEdbChartClassifyList(source, subSource)
+	if err != nil {
+		//br.Success = true
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+
+	resp.List = removeNodesWithNoJoinPermissionAndEmptyChildRecursively(resp.List)
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+func removeNodesWithNoJoinPermissionAndEmptyChildRecursively(nodes []*data_manage.EdbChartClassify) []*data_manage.EdbChartClassify {
+	var newListNode []*data_manage.EdbChartClassify
+
+	for _, node := range nodes {
+		if node.Child != nil {
+			node.Child = removeNodesWithNoJoinPermissionAndEmptyChildRecursively(node.Child)
+		}
+
+		if node.IsJoinPermission != 0 {
+			newListNode = append(newListNode, node)
+		}
+	}
+
+	return newListNode
+}
+
 // MoveEdbChartList
 // @Title 获取指标/图表创建人列表数据接口
 // @Description 获取指标/图表创建人列表数据接口

routers/commentsRouter.go

@@ -565,6 +565,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/data_manage_permission:DataMangePermissionController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/data_manage_permission:DataMangePermissionController"],
+        beego.ControllerComments{
+            Method: "SecretEdbChartClassifyList",
+            Router: `/edb_chart/classify/secret`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/data_manage_permission:DataMangePermissionController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/data_manage_permission:DataMangePermissionController"],
         beego.ControllerComments{
             Method: "MoveEdbChartCount",