汾渭数据源对接-修改实体名称

controllers/data_manage/fenwei_data.go

@@ -556,7 +556,7 @@ func (this *EdbInfoController) GetFenWeiFrequencyList() {
 
 	classifyId, _ := this.GetInt("ClassifyId")
 
-	frequencyList, err := data_manage.GetLyIndexFrequency(classifyId)
+	frequencyList, err := data_manage.GetFenWeiIndexFrequency(classifyId)
 	if err != nil {
 		return
 	}
@@ -670,7 +670,7 @@ func (this *EdbInfoController) LyIndexAdd() {
 	}
 
 	indexNames := make([]string, 0)
-	resp := make([]*data_manage.NameCheckResult, 0)
+	resp := make([]*data_manage.FenWeiNameCheckResult, 0)
 	for _, index := range req {
 		index.EdbCode = strings.TrimSpace(index.EdbCode)
 		if index.EdbCode == "" {
@@ -697,7 +697,7 @@ func (this *EdbInfoController) LyIndexAdd() {
 			return
 		}
 		indexNames = append(indexNames, index.EdbName)
-		resp = append(resp, &data_manage.NameCheckResult{
+		resp = append(resp, &data_manage.FenWeiNameCheckResult{
 			IndexCode: index.EdbCode,
 			IndexName: index.EdbName,
 			Exist:     false,
@@ -828,7 +828,7 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 
 	downLoadFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
 	xlsxFile := xlsx.NewFile()
-	frequencies, err := data_manage.GetLyIndexFrequency(classifyId)
+	frequencies, err := data_manage.GetFenWeiIndexFrequency(classifyId)
 	if err != nil {
 		br.Msg = "查询频度失败"
 		br.ErrMsg = "查询频度失败"

models/data_manage/base_from_fenwei.go

@@ -58,7 +58,7 @@ type BaseFromFenWeiIndexBatchAddCheckReq struct {
 }
 
 // IndexCheckData 校验编码是否存在
-type IndexCheckData struct {
+type FenWeiIndexCheckData struct {
 	IndexCode  string `orm:"column(index_code)" description:"指标编码"`
 	IndexName  string `orm:"column(index_name)" description:"指标名称"`
 	Frequency  string `orm:"column(frequency)" description:"频度"`
@@ -69,7 +69,7 @@ type IndexCheckData struct {
 }
 
 // NameCheckResult 校验名称是否存在
-type NameCheckResult struct {
+type FenWeiNameCheckResult struct {
 	IndexCode string `from:"EdbCode" description:"edb编码"`
 	IndexName string `from:"EdbName" description:"edb名称"`
 	Exist     bool
@@ -184,10 +184,10 @@ func GetBaseFromFenweiIndexByIndexCode(indexCode string) (list *BaseFromFenweiIn
 	return
 }
 
-// GetLyIndexFrequency 获取指标频度
-func GetLyIndexFrequency(classifyId int) (items []*string, err error) {
+// GetFenWeiIndexFrequency 获取指标频度
+func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency 
-        FROM base_from_ly_index 
+        FROM base_from_fenwei_index 
         WHERE frequency IS NOT NULL`
 
 	// 如果 classifyId > 0，则添加该条件

services/data/base_from_fenwei_index_service.go

@@ -10,16 +10,16 @@ import (
 )
 
 // LyIndexAddValidate 指标添加校验
-func LyIndexAddValidate(indexCodes []string) (*[]data_manage.IndexCheckData, error) {
+func LyIndexAddValidate(indexCodes []string) (*[]data_manage.FenWeiIndexCheckData, error) {
 	// 根据指标编码获取指标库 指标信息
 	edbInfos, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_FENWEI, indexCodes)
 	if err != nil {
 		return nil, err
 	}
-	var respList []data_manage.IndexCheckData
+	var respList []data_manage.FenWeiIndexCheckData
 	if len(edbInfos) > 0 {
 		for _, ebdInfo := range edbInfos {
-			respList = append(respList, data_manage.IndexCheckData{
+			respList = append(respList, data_manage.FenWeiIndexCheckData{
 				IndexCode:  ebdInfo.EdbCode,
 				IndexName:  ebdInfo.EdbName,
 				Unit:       ebdInfo.Unit,
@@ -34,7 +34,7 @@ func LyIndexAddValidate(indexCodes []string) (*[]data_manage.IndexCheckData, err
 }
 
 // FenWeiIndexNameCheck 指标名称校验
-func FenWeiIndexNameCheck(indexNames []string, resp []*data_manage.NameCheckResult) ([]*data_manage.NameCheckResult, error) {
+func FenWeiIndexNameCheck(indexNames []string, resp []*data_manage.FenWeiNameCheckResult) ([]*data_manage.FenWeiNameCheckResult, error) {
 	// 重名校验
 	edbList, e := data_manage.GetEdbInfoByNameArr(indexNames, utils.EDB_INFO_TYPE)
 	if e != nil {