汾渭数据

controllers/base_from_fenwei.go

@@ -10,8 +10,8 @@ import (
 	"time"
 )
 
-// FenWeiController 汾渭煤炭
-type FenWeiController struct {
+// FenweiController 汾渭煤炭
+type FenweiController struct {
 	BaseAuthController
 }
 
@@ -20,7 +20,7 @@ type FenWeiController struct {
 // @Description 新增汾渭煤炭指标接口
 // @Success 200 {object} models.AddEdbInfoReq
 // @router /add [post]
-func (this *FenWeiController) Add() {
+func (this *FenweiController) Add() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -43,7 +43,7 @@ func (this *FenWeiController) Add() {
 		return
 	}
 
-	ob := new(models.BaseFromFenWei)
+	ob := new(models.BaseFromFenwei)
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(ob.GetSource()) + "_" + req.EdbCode
 	if utils.Rc.IsExist(cacheKey) {
 		br.Ret = 501
@@ -58,7 +58,7 @@ func (this *FenWeiController) Add() {
 
 	if err = ob.Add(req.EdbCode); err != nil {
 		br.Msg = "获取指标信息失败！"
-		br.ErrMsg = "获取指标信息失败 AddEdbDataFromFenWei，Err:" + err.Error()
+		br.ErrMsg = "获取指标信息失败 AddEdbDataFromFenwei，Err:" + err.Error()
 		return
 	}
 	br.Ret = 200
@@ -71,7 +71,7 @@ func (this *FenWeiController) Add() {
 // @Description 刷新汾渭煤炭指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
 // @router /refresh [post]
-func (this *FenWeiController) Refresh() {
+func (this *FenweiController) Refresh() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -99,7 +99,7 @@ func (this *FenWeiController) Refresh() {
 		return
 	}
 
-	ob := new(models.BaseFromFenWei)
+	ob := new(models.BaseFromFenwei)
 	source := ob.GetSource()
 	// 获取指标详情
 	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
@@ -125,7 +125,7 @@ func (this *FenWeiController) Refresh() {
 	err = ob.Refresh(req.EdbInfoId, req.EdbCode, req.StartDate)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "刷新指标信息失败！"
-		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromFenWei，Err:" + err.Error()
+		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromFenwei，Err:" + err.Error()
 		return
 	}
 	// 更新指标最大最小值
@@ -149,7 +149,7 @@ func (this *FenWeiController) Refresh() {
 // @Description 处理汾渭煤炭指标的接口
 // @Success 200 string "操作成功"
 // @router /handle/excel_data [post]
-func (this *FenWeiController) HandleExcelData() {
+func (this *FenweiController) HandleExcelData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -158,7 +158,7 @@ func (this *FenWeiController) HandleExcelData() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req models.HandleFenWeiExcelDataReq
+	var req models.HandleFenweiExcelDataReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -167,7 +167,7 @@ func (this *FenWeiController) HandleExcelData() {
 	}
 
 	// 处理excel表数据
-	if err = services.HandleFenWeiIndex(&req); err != nil {
+	if err = services.HandleFenweiIndex(&req); err != nil {
 		br.Msg = "处理失败"
 		br.ErrMsg = "处理失败,Err:" + err.Error()
 		return
@@ -181,9 +181,9 @@ func (this *FenWeiController) HandleExcelData() {
 // ClassifyTree
 // @Title 汾渭数据分类
 // @Description 汾渭数据分类接口
-// @Success 200 {object} models.BaseFromFenWeiClassifyItem
+// @Success 200 {object} models.BaseFromFenweiClassifyItem
 // @router /classify_tree [post]
-func (this *FenWeiController) ClassifyTree() {
+func (this *FenweiController) ClassifyTree() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -193,7 +193,7 @@ func (this *FenWeiController) ClassifyTree() {
 		this.ServeJSON()
 	}()
 
-	classifyOb := new(models.BaseFromFenWeiClassify)
+	classifyOb := new(models.BaseFromFenweiClassify)
 	classifies, e := classifyOb.GetItemsByCondition(``, make([]interface{}, 0), []string{}, "parent_id ASC, sort ASC")
 	if e != nil {
 		br.Msg = "获取失败"
@@ -201,8 +201,8 @@ func (this *FenWeiController) ClassifyTree() {
 		return
 	}
 
-	resp := make([]*models.BaseFromFenWeiClassifyItem, 0)
-	parentMap := make(map[int][]*models.BaseFromFenWeiClassifyItem)
+	resp := make([]*models.BaseFromFenweiClassifyItem, 0)
+	parentMap := make(map[int][]*models.BaseFromFenweiClassifyItem)
 	for _, v := range classifies {
 		t := classifyOb.Format2Item(v)
 		if v.ParentId == 0 {
@@ -210,7 +210,7 @@ func (this *FenWeiController) ClassifyTree() {
 		}
 		if v.ParentId > 0 {
 			if parentMap[v.ParentId] == nil {
-				parentMap[v.ParentId] = make([]*models.BaseFromFenWeiClassifyItem, 0)
+				parentMap[v.ParentId] = make([]*models.BaseFromFenweiClassifyItem, 0)
 			}
 			parentMap[v.ParentId] = append(parentMap[v.ParentId], t)
 		}
@@ -224,3 +224,32 @@ func (this *FenWeiController) ClassifyTree() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// BaseIndexList
+// @Title 汾渭指标基础信息列表
+// @Description 汾渭指标基础信息列表接口
+// @Success 200 {object} models.BaseFromFenweiIndex
+// @router /base_index_list [post]
+func (this *FenweiController) BaseIndexList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	ob := new(models.BaseFromFenweiIndex)
+	list, e := ob.GetItemsByCondition(``, make([]interface{}, 0), []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取汾渭指标列表失败, Err: " + e.Error()
+		return
+	}
+
+	br.Data = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/base_from_fenwei.go

@@ -9,10 +9,10 @@ import (
 	"time"
 )
 
-// BaseFromFenWei 涌溢咨询
-type BaseFromFenWei struct{}
+// BaseFromFenwei 涌溢咨询
+type BaseFromFenwei struct{}
 
-type BaseFromFenWeiData struct {
+type BaseFromFenweiData struct {
 	FenweiDataId  int `orm:"column(fenwei_data_id);pk"`
 	FenweiIndexId int
 	IndexCode     string
@@ -23,11 +23,11 @@ type BaseFromFenWeiData struct {
 	DataTimestamp int64
 }
 
-func (m *BaseFromFenWeiData) TableName() string {
+func (m *BaseFromFenweiData) TableName() string {
 	return "base_from_fenwei_data"
 }
 
-func GetBaseFromFenWeiDataByCondition(condition string, pars []interface{}) (list []*BaseFromFenWeiData, err error) {
+func GetBaseFromFenweiDataByCondition(condition string, pars []interface{}) (list []*BaseFromFenweiData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_fenwei_data WHERE 1=1 `
 	if condition != "" {
@@ -38,7 +38,7 @@ func GetBaseFromFenWeiDataByCondition(condition string, pars []interface{}) (lis
 }
 
 // Add 添加
-func (obj BaseFromFenWei) Add(edbCode string) (err error) {
+func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	var condition string
@@ -47,7 +47,7 @@ func (obj BaseFromFenWei) Add(edbCode string) (err error) {
 		condition += " AND index_code=? "
 		pars = append(pars, edbCode)
 	}
-	fenweiBaseDataAll, err := GetBaseFromFenWeiDataByCondition(condition, pars)
+	fenweiBaseDataAll, err := GetBaseFromFenweiDataByCondition(condition, pars)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
 	}
@@ -79,8 +79,8 @@ func (obj BaseFromFenWei) Add(edbCode string) (err error) {
 	return
 }
 
-// Refresh 刷新涌益咨询指标数据
-func (obj BaseFromFenWei) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
+// Refresh 刷新汾渭数据指标数据
+func (obj BaseFromFenwei) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
 	o := orm.NewOrm()
 	if err != nil {
@@ -101,7 +101,7 @@ func (obj BaseFromFenWei) Refresh(edbInfoId int, edbCode, startDate string) (err
 		pars = append(pars, startDate)
 	}
 
-	fenweiDataList, err := GetBaseFromFenWeiDataByCondition(condition, pars)
+	fenweiDataList, err := GetBaseFromFenweiDataByCondition(condition, pars)
 	if err != nil {
 		return
 	}
@@ -190,16 +190,16 @@ func (obj BaseFromFenWei) Refresh(edbInfoId int, edbCode, startDate string) (err
 }
 
 // GetSource 获取来源编码id
-func (obj BaseFromFenWei) GetSource() int {
+func (obj BaseFromFenwei) GetSource() int {
 	return utils.DATA_SOURCE_FENWEI
 }
 
 // GetSourceName 获取来源名称
-func (obj BaseFromFenWei) GetSourceName() string {
+func (obj BaseFromFenwei) GetSourceName() string {
 	return utils.DATA_SOURCE_NAME_FENWEI
 }
 
-type BaseFromFenWeiIndex struct {
+type BaseFromFenweiIndex struct {
 	FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
 	IndexCode     string
 	IndexName     string
@@ -214,12 +214,54 @@ type BaseFromFenWeiIndex struct {
 	ModifyTime    time.Time
 }
 
-func (m *BaseFromFenWeiIndex) TableName() string {
+func (m *BaseFromFenweiIndex) TableName() string {
 	return "base_from_fenwei_index"
 }
 
-type BaseFromFenWeiIndexList struct {
-	FenWeiIndexId int64 `orm:"column(fenwei_index_id);pk"`
+func (m *BaseFromFenweiIndex) Add() (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(m)
+	return
+}
+
+func (m *BaseFromFenweiIndex) Update(updateCols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(m, updateCols...)
+
+	return
+}
+
+func (m *BaseFromFenweiIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE base_from_fenwei_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
+	_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
+	return
+}
+
+func (m *BaseFromFenweiIndex) GetByIndexCode(indexCode string) (item *BaseFromFenweiIndex, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+	return
+}
+
+func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiIndex, err error) {
+	o := orm.NewOrm()
+	fields := strings.Join(fieldArr, ",")
+	if len(fieldArr) == 0 {
+		fields = `*`
+	}
+	order := `ORDER BY create_time DESC`
+	if orderRule != "" {
+		order = ` ORDER BY ` + orderRule
+	}
+	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_index WHERE 1=1 %s %s`, fields, condition, order)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+type BaseFromFenweiIndexList struct {
+	FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
 	IndexCode     string
 	IndexName     string
 	Frequency     string
@@ -232,21 +274,21 @@ type BaseFromFenWeiIndexList struct {
 	ModifyTime    string
 }
 
-func (y *BaseFromFenWeiData) GetByIndexCode(indexCode string) (list []*BaseFromFenWeiData, err error) {
+func (y *BaseFromFenweiData) GetByIndexCode(indexCode string) (list []*BaseFromFenweiData, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_data WHERE index_code=? `
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
 	return
 }
 
-func (y *BaseFromFenWeiData) AddMulti(item []*BaseFromFenWeiData) (err error) {
+func (y *BaseFromFenweiData) AddMulti(item []*BaseFromFenweiData) (err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, item)
 	return
 }
 
-// HandleFenWeiExcelData 涌益咨询的excel数据
-type HandleFenWeiExcelData struct {
+// HandleFenweiExcelData 汾渭数据的excel数据
+type HandleFenweiExcelData struct {
 	//ClassifyName string `description:"指标目录"`
 	//ClassifySort int    `description:"指标目录排序号"`
 	IndexName    string `description:"指标名称"`
@@ -258,48 +300,20 @@ type HandleFenWeiExcelData struct {
 	ExcelDataMap map[string]string
 }
 
-type HandleFenWeiExcelDataReq struct {
-	List         []*HandleFenWeiExcelData
+type HandleFenweiExcelDataReq struct {
+	List         []*HandleFenweiExcelData
 	TerminalCode string `description:"编码"`
 }
 
-func (y *BaseFromFenWeiData) GetMaxAndMinDateByIndexCode(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
+func (y *BaseFromFenweiData) GetMaxAndMinDateByIndexCode(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM base_from_fenwei_data WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 	return
 }
 
-func (y *BaseFromFenWeiIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
-	sql := ` UPDATE base_from_fenwei_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
-	return
-}
-
-func (y *BaseFromFenWeiIndex) GetByIndexCode(indexCode string) (item *BaseFromFenWeiIndex, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
-	return
-}
-
-func (y *BaseFromFenWeiIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
-	return
-}
-
-// Update 修改
-func (y *BaseFromFenWeiIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
-
-	return
-}
-
-// BaseFromFenWeiClassify 汾渭数据分类表
-type BaseFromFenWeiClassify struct {
+// BaseFromFenweiClassify 汾渭数据分类表
+type BaseFromFenweiClassify struct {
 	ClassifyId      int       `orm:"column(classify_id);pk"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
@@ -311,27 +325,27 @@ type BaseFromFenWeiClassify struct {
 	CreateTime      time.Time `description:"创建时间"`
 }
 
-func (y *BaseFromFenWeiClassify) Add() (lastId int64, err error) {
+func (y *BaseFromFenweiClassify) Add() (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(y)
 	return
 }
 
-func (y *BaseFromFenWeiClassify) Update(updateCols []string) (err error) {
+func (y *BaseFromFenweiClassify) Update(updateCols []string) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Update(y, updateCols...)
 
 	return
 }
 
-func (y *BaseFromFenWeiClassify) GetByClassifyName(classifyName string) (item *BaseFromFenWeiClassify, err error) {
+func (y *BaseFromFenweiClassify) GetByClassifyName(classifyName string) (item *BaseFromFenweiClassify, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_classify WHERE classify_name=? `
 	err = o.Raw(sql, classifyName).QueryRow(&item)
 	return
 }
 
-func (y *BaseFromFenWeiClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenWeiClassify, err error) {
+func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiClassify, err error) {
 	o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
@@ -346,8 +360,8 @@ func (y *BaseFromFenWeiClassify) GetItemsByCondition(condition string, pars []in
 	return
 }
 
-// BaseFromFenWeiClassifyItem 汾渭数据分类信息
-type BaseFromFenWeiClassifyItem struct {
+// BaseFromFenweiClassifyItem 汾渭数据分类信息
+type BaseFromFenweiClassifyItem struct {
 	ClassifyId   int                           `description:"分类ID"`
 	ClassifyName string                        `description:"分类名称"`
 	ParentId     int                           `description:"父级id"`
@@ -355,14 +369,14 @@ type BaseFromFenWeiClassifyItem struct {
 	Sort         int                           `description:"排序字段"`
 	CreateTime   string                        `description:"创建时间"`
 	ModifyTime   string                        `description:"修改时间"`
-	Child        []*BaseFromFenWeiClassifyItem `description:"子分类"`
+	Child        []*BaseFromFenweiClassifyItem `description:"子分类"`
 }
 
-func (y *BaseFromFenWeiClassify) Format2Item(origin *BaseFromFenWeiClassify) (item *BaseFromFenWeiClassifyItem) {
+func (y *BaseFromFenweiClassify) Format2Item(origin *BaseFromFenweiClassify) (item *BaseFromFenweiClassifyItem) {
 	if origin == nil {
 		return
 	}
-	item = new(BaseFromFenWeiClassifyItem)
+	item = new(BaseFromFenweiClassifyItem)
 	item.ClassifyId = origin.ClassifyId
 	item.ClassifyName = origin.ClassifyName
 	item.ParentId = origin.ParentId
@@ -373,8 +387,8 @@ func (y *BaseFromFenWeiClassify) Format2Item(origin *BaseFromFenWeiClassify) (it
 	return
 }
 
-// MultiUpdateBaseFromFenWeiDataValue 批量更新汾渭指标数据
-func MultiUpdateBaseFromFenWeiDataValue(items []*BaseFromFenWeiData) (err error) {
+// MultiUpdateBaseFromFenweiDataValue 批量更新汾渭指标数据
+func MultiUpdateBaseFromFenweiDataValue(items []*BaseFromFenweiData) (err error) {
 	if len(items) == 0 {
 		return
 	}

models/db.go

@@ -114,8 +114,8 @@ func initBaseIndex() {
 		new(BaseFromYongyiIndex),
 		new(BaseFromYongyiData),
 		new(BaseFromYongyiClassify),
-		new(BaseFromFenWeiIndex),
-		new(BaseFromFenWeiData),
+		new(BaseFromFenweiIndex),
+		new(BaseFromFenweiData),
 	)
 }
 

routers/commentsRouter.go

@@ -340,7 +340,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"],
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"],
         beego.ControllerComments{
             Method: "Add",
             Router: `/add`,
@@ -349,7 +349,16 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"],
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"],
+        beego.ControllerComments{
+            Method: "BaseIndexList",
+            Router: `/base_index_list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"],
         beego.ControllerComments{
             Method: "ClassifyTree",
             Router: `/classify_tree`,
@@ -358,7 +367,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"],
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"],
         beego.ControllerComments{
             Method: "HandleExcelData",
             Router: `/handle/excel_data`,
@@ -367,7 +376,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenWeiController"],
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:FenweiController"],
         beego.ControllerComments{
             Method: "Refresh",
             Router: `/refresh`,

routers/router.go

@@ -216,7 +216,7 @@ func init() {
 		),
 		beego.NSNamespace("/fenwei",
 			beego.NSInclude(
-				&controllers.FenWeiController{},
+				&controllers.FenweiController{},
 			),
 		),
 	)

services/base_from_fenwei.go

@@ -10,8 +10,8 @@ import (
 	"time"
 )
 
-// HandleFenWeiIndex 处理汾渭数据的excel数据
-func HandleFenWeiIndex(req *models.HandleFenWeiExcelDataReq) (err error) {
+// HandleFenweiIndex 处理汾渭数据的excel数据
+func HandleFenweiIndex(req *models.HandleFenweiExcelDataReq) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
 		if len(errMsgList) > 0 {
@@ -25,7 +25,7 @@ func HandleFenWeiIndex(req *models.HandleFenWeiExcelDataReq) (err error) {
 			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码%s或者指标ID%s为空：", v.IndexCode, v.IndexName))
 			continue
 		}
-		err = handleFenWeiIndex(v, req.TerminalCode)
+		err = handleFenweiIndex(v, req.TerminalCode)
 		if err != nil {
 			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码：%s, Err: %s", v.IndexCode, err))
 			return
@@ -34,7 +34,7 @@ func HandleFenWeiIndex(req *models.HandleFenWeiExcelDataReq) (err error) {
 	return
 }
 
-func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (err error) {
+func handleFenweiIndex(req *models.HandleFenweiExcelData, terminalCode string) (err error) {
 	indexName := req.IndexName
 	indexCode := req.IndexCode
 	excelDataMap := req.ExcelDataMap
@@ -46,16 +46,16 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 			go alarm_msg.SendAlarmMsg(msg, 3)
 		}
 	}()
-	indexObj := new(models.BaseFromFenWeiIndex)
-	dataObj := new(models.BaseFromFenWeiData)
-	//classifyObj := new(models.BaseFromFenWeiClassify)
+	indexObj := new(models.BaseFromFenweiIndex)
+	dataObj := new(models.BaseFromFenweiData)
+	//classifyObj := new(models.BaseFromFenweiClassify)
 
 	var indexId int64
 
-	addDataList := make([]*models.BaseFromFenWeiData, 0)
-	updateDataList := make([]*models.BaseFromFenWeiData, 0)
+	addDataList := make([]*models.BaseFromFenweiData, 0)
+	updateDataList := make([]*models.BaseFromFenweiData, 0)
 
-	exitDataMap := make(map[string]*models.BaseFromFenWeiData)
+	exitDataMap := make(map[string]*models.BaseFromFenweiData)
 
 	// 修改指标信息
 	if indexName == "" {
@@ -71,7 +71,7 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 	//	if err != nil {
 	//		if err.Error() == utils.ErrNoRow() {
 	//			//新增分类
-	//			classifyObj = &models.BaseFromFenWeiClassify{
+	//			classifyObj = &models.BaseFromFenweiClassify{
 	//				ClassifyName:    req.ClassifyName,
 	//				ParentId:        0,
 	//				SysUserId:       0,
@@ -143,7 +143,7 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 		}
 
 		//获取已存在的所有数据
-		var exitDataList []*models.BaseFromFenWeiData
+		var exitDataList []*models.BaseFromFenweiData
 		exitDataList, err = dataObj.GetByIndexCode(indexCode)
 		if err != nil {
 			err = fmt.Errorf("数据源查询涌溢指标数据失败 Err：%s", err)
@@ -178,7 +178,7 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 				}
 				timestamp := saveDataTime.UnixNano() / 1e6
 
-				dataItem := new(models.BaseFromFenWeiData)
+				dataItem := new(models.BaseFromFenweiData)
 				dataItem.FenweiIndexId = int(indexId)
 				dataItem.IndexCode = indexCode
 				dataItem.DataTime = date
@@ -218,7 +218,7 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 
 	// 批量更新数据
 	if len(updateDataList) > 0 {
-		e := models.MultiUpdateBaseFromFenWeiDataValue(updateDataList)
+		e := models.MultiUpdateBaseFromFenweiDataValue(updateDataList)
 		if e != nil {
 			err = fmt.Errorf("MultiUpdateBaseFromSmmDataValue err: %s", e.Error())
 			return
@@ -228,7 +228,7 @@ func handleFenWeiIndex(req *models.HandleFenWeiExcelData, terminalCode string) (
 	// 同步刷新ETA指标库的指标
 	{
 		// 获取指标详情
-		baseObj := new(models.BaseFromFenWei)
+		baseObj := new(models.BaseFromFenwei)
 		var edbInfo *models.EdbInfo
 		edbInfo, err = models.GetEdbInfoByEdbCode(baseObj.GetSource(), indexCode)
 		if err != nil {