数据源smm指标优化查询分类

controllers/data_manage/smm_data.go

@@ -2,15 +2,15 @@ package data_manage
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/request"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 	"os"
 	"path/filepath"
 	"strings"
@@ -49,7 +49,7 @@ func (this *EdbInfoController) SmmClassify() {
 		return
 	}
 
-	baseFromSmmIndexMap := make(map[int][]*data_manage.BaseFromSmmClassifyItems)
+	/*baseFromSmmIndexMap := make(map[int][]*data_manage.BaseFromSmmClassifyItems)
 
 	allBaseFromSmmIndex, err := data_manage.GetSmmIndexAll()
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -59,17 +59,17 @@ func (this *EdbInfoController) SmmClassify() {
 	}
 	for _, v := range allBaseFromSmmIndex {
 		baseFromSmmIndexMap[v.ClassifyId] = append(baseFromSmmIndexMap[v.ClassifyId], v)
-	}
+	}*/
 
 	rootChildMap := make(map[int][]*data_manage.BaseFromSmmClassifyItems)
 	for _, v := range classifyAll {
 		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		if existItems, ok := baseFromSmmIndexMap[v.ClassifyId]; ok {
+		/*if existItems, ok := baseFromSmmIndexMap[v.ClassifyId]; ok {
 			v.Children = existItems
 		} else {
 			items := make([]*data_manage.BaseFromSmmClassifyItems, 0)
 			v.Children = items
-		}
+		}*/
 	}
 	var ret data_manage.BaseFromSmmClassifyResp
 	nodeAll := make([]*data_manage.BaseFromSmmClassifyItems, 0)
@@ -93,7 +93,7 @@ func (this *EdbInfoController) SmmClassify() {
 		Sort:               0,
 		Children:           nil,
 	}
-	initIndexList, err := data_manage.GetBaseFromSmmIndexByClassifyId(initClassify.ClassifyId)
+	/*initIndexList, err := data_manage.GetBaseFromSmmIndexByClassifyId(initClassify.ClassifyId)
 	if err != nil {
 		br.Msg = "获取未分类指标失败"
 		br.ErrMsg = "获取未分类指标失败，Err:" + err.Error()
@@ -112,7 +112,7 @@ func (this *EdbInfoController) SmmClassify() {
 			Children:             nil,
 		}
 		initClassify.Children = append(initClassify.Children, tmp)
-	}
+	}*/
 	finalList := make([]*data_manage.BaseFromSmmClassifyItems, 0)
 	finalList = append(finalList, initClassify)
 	finalList = append(finalList, nodeAll...)
@@ -123,6 +123,55 @@ func (this *EdbInfoController) SmmClassify() {
 	br.Data = ret
 }
 
+// SmmIndexList
+// @Title 有色数据指标
+// @Description 有色数据指标列表接口
+// @Success 200 {object} data_manage.SmmClassify
+// @router /smm/index/list [get]
+func (this *EdbInfoController) SmmIndexList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		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("ClassifyId", 0)
+
+	list := make([]*data_manage.BaseFromSmmClassifyItems, 0)
+	indexList, err := data_manage.GetBaseFromSmmIndexByClassifyId(classifyId)
+	if err != nil {
+		br.Msg = "获取未分类指标失败"
+		br.ErrMsg = "获取未分类指标失败，Err:" + err.Error()
+		return
+	}
+
+	for _, v := range indexList {
+		tmp := &data_manage.BaseFromSmmClassifyItems{
+			ClassifyId:           v.ClassifyId,
+			BaseFromSmmIndexId:   v.BaseFromSmmIndexId,
+			BaseFromSmmIndexCode: v.IndexCode,
+			ClassifyName:         v.IndexName,
+			ParentId:             0,
+			Level:                0,
+			Sort:                 0,
+			Children:             nil,
+		}
+		list = append(list, tmp)
+	}
+	var ret data_manage.BaseFromSmmClassifyResp
+	ret.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = ret
+}
+
 // SmmClassifyName
 // @Title 有色数据分类名称查询
 // @Description 有色数据分类名称查询接口

routers/commentsRouter.go

@@ -3058,6 +3058,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "SmmIndexList",
+            Router: `/smm/index/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "MoveSmmData",