钢联化工目录查询优化

controllers/data_manage/mysteel_chemical_data.go

@@ -52,23 +52,6 @@ func (this *EdbInfoController) MysteelChemicalClassify() {
 		return
 	}
 
-	baseFromMysteelChemicalIndexMap := make(map[int][]*data_manage.BaseFromMysteelChemicalClassifyItems)
-
-	allBaseFromMysteelChemicalIndex, err := data_manage.GetMysteelChemicalIndexAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取指标信息失败，Err:" + err.Error()
-		return
-	}
-	for _, v := range allBaseFromMysteelChemicalIndex {
-		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.BaseFromMysteelChemicalIndexId)
-		button := data.GetMysteelChemicalOpButton(sysUser, v.SysUserId)
-		button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
-		v.Button = button
-
-		baseFromMysteelChemicalIndexMap[v.BaseFromMysteelChemicalClassifyId] = append(baseFromMysteelChemicalIndexMap[v.BaseFromMysteelChemicalClassifyId], v)
-	}
-
 	rootChildMap := make(map[int][]*data_manage.BaseFromMysteelChemicalClassifyItems)
 	for _, v := range classifyAll {
 		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId)
@@ -78,12 +61,6 @@ func (this *EdbInfoController) MysteelChemicalClassify() {
 		v.Button = button
 
 		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		if existItems, ok := baseFromMysteelChemicalIndexMap[v.BaseFromMysteelChemicalClassifyId]; ok {
-			v.Children = existItems
-		} else {
-			items := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
-			v.Children = items
-		}
 	}
 
 	nodeAll := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
@@ -107,6 +84,52 @@ func (this *EdbInfoController) MysteelChemicalClassify() {
 	br.Data = nodeAll
 }
 
+// MysteelChemicalIndexList
+// @Title 钢联化工数据指标列表
+// @Description 钢联化工数据指标列表接口
+// @Success 200 {object} data_manage.BaseFromMysteelChemicalIndexResp
+// @router /mysteel_chemical/index/list [get]
+func (this *EdbInfoController) MysteelChemicalIndexList() {
+	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("BaseFromMysteelChemicalClassifyId")
+	if classifyId <= 0 {
+		br.Msg = "请选择正确的分类"
+		return
+	}
+	allBaseFromMysteelChemicalIndex, err := data_manage.GetMysteelChemicalIndexByClassifyId(classifyId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标信息失败，Err:" + err.Error()
+		return
+	}
+	nodeAll := make([]*data_manage.BaseFromMysteelChemicalClassifyItems, 0)
+	for _, v := range allBaseFromMysteelChemicalIndex {
+		v.UniqueCode = fmt.Sprint(v.BaseFromMysteelChemicalClassifyId, "_", v.BaseFromMysteelChemicalIndexId)
+		button := data.GetMysteelChemicalOpButton(sysUser, v.SysUserId)
+		button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
+		v.Button = button
+		nodeAll = append(nodeAll, v)
+	}
+	ret := &data_manage.BaseFromMysteelChemicalIndexResp{
+		List: nodeAll,
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = ret
+}
+
 // AddMysteelChemicalClassify
 // @Title 新增分类
 // @Description 新增分类接口

models/data_manage/mysteel_chemical_classify.go

@@ -51,6 +51,9 @@ func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (e
 	return
 }
 
+type BaseFromMysteelChemicalIndexResp struct {
+	List []*BaseFromMysteelChemicalClassifyItems
+}
 type BaseFromMysteelChemicalClassifyItems struct {
 	BaseFromMysteelChemicalClassifyId int                                        `orm:"column(base_from_mysteel_chemical_classify_id)"`
 	BaseFromMysteelChemicalIndexId    int                                        `orm:"column(base_from_mysteel_chemical_index_id)"`

models/data_manage/mysteel_chemical_index.go

@@ -67,13 +67,13 @@ type MysteelChemicalFrequency struct {
 	Frequency string `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
 }
 
-// GetMysteelChemicalIndexAll 用于分类展示
-func GetMysteelChemicalIndexAll() (items []*BaseFromMysteelChemicalClassifyItems, err error) {
+// GetMysteelChemicalIndexByClassifyId 用于分类展示
+func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
              sys_user_id,sys_user_real_name,sort
-            FROM base_from_mysteel_chemical_index ORDER BY sort asc, create_time ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+            FROM base_from_mysteel_chemical_index where base_from_mysteel_chemical_classify_id=? ORDER BY sort asc, create_time ASC `
+	_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	return
 }
 

routers/commentsRouter.go

@@ -2824,6 +2824,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: "MysteelChemicalIndexList",
+            Router: `/mysteel_chemical/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: "MysteelChemicalRefresh",