Merge branch 'bzq1/eia_steo_custom' of eta_server/eta_api into debug

controllers/data_manage/eia_steo.go

@@ -5,7 +5,6 @@ import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
-	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data_stat"
 	etaTrialService "eta/eta_api/services/eta_trial"
@@ -137,7 +136,6 @@ func (this *EdbInfoController) EiaSteoData() {
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
-	alarm_msg.SendAlarmMsg("指标数："+strconv.Itoa(len(indexList)), 1)
 	resultList := make([]data_manage.EiaSteoIndexListResp, 0)
 	for _, v := range indexList {
 

models/data_manage/base_from_eia_stero.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"time"
 
@@ -129,7 +128,6 @@ func GetEiaSteoIndexList(condition string, pars []interface{}) (items []*BaseFro
 	sql += condition
 	sql += ` ORDER BY base_from_eia_steo_index_id ASC `
 	o := orm.NewOrmUsingDB("data")
-	alarm_msg.SendAlarmMsg(sql, 1)
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

services/data/base_from_eia_steo.go

@@ -18,7 +18,9 @@ func GetClassifyALLById(classifyId int) (items []*data_manage.BaseFromEiaSteoCla
 			return
 		}
 		items = append(items, childClassify...)
-	} else {
+	}
+	// 兼容之前部分指标在一级分类下的情况
+	if len(items) == 0 {
 		items = append(items, classify)
 	}
 	return