Browse Source

汾渭数据源对接-修改方法名称

gmy 7 months ago
parent
commit
06dab49e68

+ 9 - 9
controllers/data_manage/fenwei_data.go

@@ -567,13 +567,13 @@ func (this *EdbInfoController) GetFenWeiFrequencyList() {
 	br.Data = frequencyList
 }
 
-// LyIndexAddValidate
+// FenWeiIndexAddValidate
 // @Title 新增加入到指标库校验
 // @Description 新增加入到指标库校验
 // @Param   req    body   data_manage.BaseFromFenWeiIndexBatchAddCheckReq     true        "请求参数"
 // @Success 200 {object} []data_manage.IndexCheckData
 // @router /fenwei/index/add/validate [post]
-func (this *EdbInfoController) LyIndexAddValidate() {
+func (this *EdbInfoController) FenWeiIndexAddValidate() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -606,7 +606,7 @@ func (this *EdbInfoController) LyIndexAddValidate() {
 	}
 
 	// 校验指标编码是否存在
-	addValidate, err := data.LyIndexAddValidate(req.IndexCodes)
+	addValidate, err := data.FenWeiIndexAddValidate(req.IndexCodes)
 	if err != nil {
 		return
 	}
@@ -616,13 +616,13 @@ func (this *EdbInfoController) LyIndexAddValidate() {
 	br.Msg = "操作成功"
 }
 
-// LyIndexAdd
+// FenWeiIndexAdd
 // @Title 指标添加到指标库
 // @Description 指标添加到指标库
 // @Param   req    body   []data_manage.AddEdbInfoReq     true        "请求参数"
 // @Success 200 string "操作成功"
 // @router /fenwei/index/add [post]
-func (this *EdbInfoController) LyIndexAdd() {
+func (this *EdbInfoController) FenWeiIndexAdd() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -732,7 +732,7 @@ func (this *EdbInfoController) LyIndexAdd() {
 		fenWeiIndexAddReq.AdminRealName = sysUser.RealName
 
 		// 新增指标到指标库
-		edbInfo, e, errMsg, skip := data.LyIndexAdd(fenWeiIndexAddReq, this.Lang)
+		edbInfo, e, errMsg, skip := data.FenWeiIndexAdd(fenWeiIndexAddReq, this.Lang)
 		if e != nil {
 			br.Msg = "操作失败"
 			if errMsg != "" {
@@ -903,14 +903,14 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 			rowModifyCell.SetValue(v.ModifyTime)
 			tradeCodeList = append(tradeCodeList, v.IndexCode)
 
-			var lyDataList []*data_manage.BaseFromFenweiData
-			lyDataList, err = data_manage.GetBaseFromFenWeiDataByIndexCode(v.IndexCode)
+			var dataList []*data_manage.BaseFromFenweiData
+			dataList, err = data_manage.GetBaseFromFenWeiDataByIndexCode(v.IndexCode)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.ErrMsg = "GetBaseFromFenWeiDataByIndexCode,Err:" + err.Error()
 				br.Msg = "获取数据失败"
 				return
 			}
-			for _, item := range lyDataList {
+			for _, item := range dataList {
 				if dataMap[item.IndexCode] == nil {
 					dataMap[item.IndexCode] = make(map[string]*data_manage.BaseFromFenweiData)
 				}

+ 4 - 4
services/data/base_from_fenwei_index_service.go

@@ -9,8 +9,8 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// LyIndexAddValidate 指标添加校验
-func LyIndexAddValidate(indexCodes []string) (*[]data_manage.FenWeiIndexCheckData, error) {
+// FenWeiIndexAddValidate 指标添加校验
+func FenWeiIndexAddValidate(indexCodes []string) (*[]data_manage.FenWeiIndexCheckData, error) {
 	// 根据指标编码获取指标库 指标信息
 	edbInfos, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_FENWEI, indexCodes)
 	if err != nil {
@@ -52,8 +52,8 @@ func FenWeiIndexNameCheck(indexNames []string, resp []*data_manage.FenWeiNameChe
 	return resp, nil
 }
 
-// LyIndexAdd 批量添加指标
-func LyIndexAdd(req data_manage.FenWeiIndexAddReq, lang string) (edb *data_manage.EdbInfo, err error, errMsg string, skip bool) {
+// FenWeiIndexAdd 批量添加指标
+func FenWeiIndexAdd(req data_manage.FenWeiIndexAddReq, lang string) (edb *data_manage.EdbInfo, err error, errMsg string, skip bool) {
 	if req.EdbCode == "" {
 		err = fmt.Errorf("指标ID为空")
 		return