处理冲突

controllers/base_from_rzd.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_index_lib/models"
 	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -400,6 +401,23 @@ func (this *BaseFromRzdController) AddBatchRzdData() {
 			br.ErrMsg = "新增指标数据失败，Err:" + err.Error()
 			return
 		}
+		//更新指标库信息
+		// 获取指标详情
+		var edbInfo *models.EdbInfo
+		edbInfo, err = models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_RZD, rzdIndex.IndexCode)
+		if err != nil {
+			if err.Error() != utils.ErrNoRow() {
+				utils.FileLog.Error(fmt.Sprint("刷新ETA指标异常，指标编码：", rzdIndex.IndexCode, err.Error()))
+				return
+			} else {
+				err = nil
+			}
+		}
+
+		// 已经加入到指标库的话，那么就去更新ETA指标库吧
+		if edbInfo != nil {
+			go logic.RefreshBaseEdbInfo(edbInfo, ``)
+		}
 	}
 
 	br.Ret = 200

logic/base_edb_info.go

@@ -39,6 +39,8 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 	case utils.DATA_SOURCE_RADISH_RESEARCH:
 		ob := new(models.BaseFromRadishResearch)
 		err = ob.Refresh(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+	case utils.DATA_SOURCE_RZD:
+		err = models.RefreshEdbDataFromRzd(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	default:
 		return
 	}