fix

services/eta_bridge/handle_data.go

@@ -65,7 +65,7 @@ func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		// 指标信息
 		pushIndexData = &PushIndexParamDataReq{
 			SourceIndexCode:  edbInfo.EdbCode,
-			IndexCode:        fmt.Sprint(edbInfo.Source, "_", edbInfo.EdbCode),
+			IndexCode:        getIndexCode(edbInfo.Source, edbInfo.EdbCode),
 			IndexName:        origInfo.EdbName,
 			IndexShortName:   edbInfo.EdbName,
 			FrequenceName:    edbInfo.Frequency,
@@ -88,7 +88,7 @@ func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		pushEdbClassify = &PushEdbClassifyItemReq{
 			Id:         fmt.Sprint(edbInfo.EdbInfoId),
 			ClassifyId: edbInfo.ClassifyId,
-			IndexCode:  fmt.Sprint(edbInfo.Source, "_", edbInfo.EdbCode),
+			IndexCode:  getIndexCode(edbInfo.Source, edbInfo.EdbCode),
 			CreateTime: edbInfo.CreateTime,
 			CreateUser: edbInfo.SysUserRealName,
 			UpdateTime: edbInfo.ModifyTime,
@@ -149,8 +149,8 @@ func handleInsert(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
+			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
+			IndexCode:    getIndexCode(source, edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,
@@ -199,7 +199,7 @@ func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		// 指标信息
 		pushIndexData = &PushIndexParamDataReq{
 			SourceIndexCode:  edbInfo.EdbCode,
-			IndexCode:        fmt.Sprint(edbInfo.Source, "_", edbInfo.EdbCode),
+			IndexCode:        getIndexCode(edbInfo.Source, edbInfo.EdbCode),
 			IndexName:        origInfo.EdbName,
 			IndexShortName:   edbInfo.EdbName,
 			FrequenceName:    edbInfo.Frequency,
@@ -222,7 +222,7 @@ func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		pushEdbClassify = &PushEdbClassifyItemReq{
 			Id:         fmt.Sprint(edbInfo.EdbInfoId),
 			ClassifyId: edbInfo.ClassifyId,
-			IndexCode:  fmt.Sprint(edbInfo.Source, "_", edbInfo.EdbCode),
+			IndexCode:  getIndexCode(edbInfo.Source, edbInfo.EdbCode),
 			CreateTime: edbInfo.CreateTime,
 			CreateUser: edbInfo.SysUserRealName,
 			UpdateTime: edbInfo.ModifyTime,
@@ -283,8 +283,8 @@ func handleDelete(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
+			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
+			IndexCode:    getIndexCode(source, edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,
@@ -343,7 +343,7 @@ func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 
 			pushIndexData = &PushIndexParamDataReq{
 				SourceIndexCode:  newEdbInfo.EdbCode,
-				IndexCode:        fmt.Sprint(newEdbInfo.Source, "_", newEdbInfo.EdbCode),
+				IndexCode:        getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
 				IndexName:        origInfo.EdbName,
 				IndexShortName:   newEdbInfo.EdbName,
 				FrequenceName:    newEdbInfo.Frequency,
@@ -368,7 +368,7 @@ func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 			pushEdbClassify = &PushEdbClassifyItemReq{
 				Id:         fmt.Sprint(newEdbInfo.EdbInfoId),
 				ClassifyId: newEdbInfo.ClassifyId,
-				IndexCode:  fmt.Sprint(newEdbInfo.Source, "_", newEdbInfo.EdbCode),
+				IndexCode:  getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
 				CreateTime: newEdbInfo.CreateTime,
 				CreateUser: newEdbInfo.SysUserRealName,
 				UpdateTime: newEdbInfo.ModifyTime,
@@ -403,8 +403,8 @@ func handleUpdate(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexData *PushIn
 		}
 		// 数据信息
 		pushIndexValue = &PushIndexValueItemReq{
-			Id:           utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbData.EdbDataId)),
-			IndexCode:    fmt.Sprint(source, "_", edbData.EdbCode),
+			Id:           getIndexDataId(source, subSource, edbData.EdbDataId),
+			IndexCode:    getIndexCode(source, edbData.EdbCode),
 			Value:        fmt.Sprint(edbData.Value),
 			BusinessDate: edbData.DataTime,
 			CreateTime:   edbData.CreateTime,
@@ -504,7 +504,7 @@ func handleUpdateDataSource(edbUpdateLog *data_manage.EdbUpdateLog) (pushIndexDa
 		}
 		pushIndexData = &PushIndexParamDataReq{
 			SourceIndexCode:  newEdbInfo.EdbCode,
-			IndexCode:        fmt.Sprint(newEdbInfo.Source, "_", newEdbInfo.EdbCode),
+			IndexCode:        getIndexCode(newEdbInfo.Source, newEdbInfo.EdbCode),
 			IndexName:        indexName,
 			IndexShortName:   newEdbInfo.EdbName,
 			FrequenceName:    newEdbInfo.Frequency,
@@ -644,3 +644,26 @@ func getMaxModifyTime(source, subSource int, edbCode, addUpdateTime string) (mod
 
 	return
 }
+
+// getIndexCode
+// @Description: 指标编码生成
+// @author: Roc
+// @datetime 2024-03-20 17:29:27
+// @param source int
+// @param edbCode string
+// @return string
+func getIndexCode(source int, edbCode string) string {
+	return fmt.Sprint(source, "_", edbCode)
+}
+
+// getIndexDataId
+// @Description: 获取数据id
+// @author: Roc
+// @datetime 2024-03-20 17:36:53
+// @param source int
+// @param subSource int
+// @param edbDataId int
+// @return string
+func getIndexDataId(source, subSource int, edbDataId int32) string {
+	return utils.MD5(fmt.Sprint(source, "_", subSource, "_", edbDataId))
+}