fix:红桃3指标刷新

logic/sic.go

@@ -12,7 +12,7 @@ import (
 func RefreshSci(edbInfo *models.EdbInfo, startDate string) (isHandling bool, errMsg string, err error) {
 	cacheKey := utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(edbInfo.Source) + "_" + edbInfo.EdbCode
 	if utils.Rc.IsExist(cacheKey) {
-		isHandle = true
+		isHandling = true
 		return
 	}
 	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)

models/db.go

@@ -60,6 +60,9 @@ func init() {
 
 	// 供应分析 数据表
 	initSupplyAnalysis()
+
+	// 基础指标表
+	initBaseIndex()
 }
 
 // initFutureGood 注册期货数据 数据表
@@ -82,3 +85,11 @@ func initSupplyAnalysis() {
 		new(supply_analysis.BaseFromStockPlantData),
 	)
 }
+
+// initBaseIndex 基础指标表
+func initBaseIndex() {
+	orm.RegisterModel(
+		new(BaseFromSciIndex),
+		new(BaseFromSciData),
+	)
+}

routers/commentsRouter.go

@@ -493,6 +493,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SciController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SciController"],
+        beego.ControllerComments{
+            Method: "HandleExcelData",
+            Router: `/handle/excel_data`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SciController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SciController"],
         beego.ControllerComments{
             Method: "Refresh",

services/base_from_sci.go

@@ -101,7 +101,6 @@ func HandleData(dataMap map[string]map[string]string) {
 		indexDataList, err := sciIndexDataModel.GetIndexDataList(indexCode)
 		if err != nil {
 			errMsgList = append(errMsgList, fmt.Sprint("查找卓创基础指标失败,指标编码：", indexCode, ";错误原因：", err.Error()))
-			fmt.Println(indexCode, "寻找数据失败:", err)
 			continue
 		}
 		indexDataExistMap := make(map[string]*models.BaseFromSciData)
@@ -113,7 +112,7 @@ func HandleData(dataMap map[string]map[string]string) {
 		for currDate, currVal := range data {
 			currDataTime, tmpErr := time.ParseInLocation(utils.FormatDate, currDate, time.Local)
 			if tmpErr != nil {
-				fmt.Println("时间格式化失败:", currDate)
+				errMsgList = append(errMsgList, fmt.Sprint("时间格式化失败,指标编码：", currDate, ";错误原因：", tmpErr.Error()))
 				continue
 			}
 			timestamp := currDataTime.UnixNano() / 1e6
@@ -142,9 +141,10 @@ func HandleData(dataMap map[string]map[string]string) {
 					sciData.ModifyTime = time.Now()
 					// 如果是已经入库了数据,那么就更新,否则只是单纯更改内存数据,而不去更新数据库
 					if sciData.SciDataId > 0 {
-						err = sciData.Update([]string{"Value", "ModifyTime"})
-						if err != nil {
-							fmt.Println(indexCode, "更新,", currDate, "数据失败,err:", err)
+						tmpErr = sciData.Update([]string{"Value", "ModifyTime"})
+						if tmpErr != nil {
+							errMsgList = append(errMsgList, fmt.Sprint("指标数据更新失败,指标编码：", indexCode, "，时间：", currDate, ";错误原因：", tmpErr.Error()))
+							continue
 						}
 					}
 				}
@@ -154,7 +154,8 @@ func HandleData(dataMap map[string]map[string]string) {
 		if len(addSciDataList) > 0 {
 			err = sciIndexDataModel.BatchAdd(addSciDataList)
 			if err != nil {
-				fmt.Println(indexCode, "批量添加数据失败:", err)
+				errMsgList = append(errMsgList, fmt.Sprint("批量添加数据失败,指标编码：", indexCode, err.Error()))
+				continue
 			}
 		}
 		indexInfo.ModifyTime = time.Now()
@@ -163,11 +164,10 @@ func HandleData(dataMap map[string]map[string]string) {
 		// 同步刷新ETA图库红桃3的指标
 		{
 			// 获取指标详情
-			edbInfo, tmpErr := models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI, indexInfo.IndexCode)
-			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
-				br.Msg = "指标不存在！"
-				br.ErrMsg = "指标不存在"
-				return
+			edbInfo, err := models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI, indexInfo.IndexCode)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				errMsgList = append(errMsgList, fmt.Sprint("刷新ETA指标异常，指标编码：", indexCode, err.Error()))
+				continue
 			}
 			go logic.RefreshSci(edbInfo, ``)
 		}