Reset code state to commit 31101f850158a02d074152e94f588f54c5c6234d

go.sum

@@ -49,8 +49,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/phyer/core v0.1.100 h1:xYOywQnKBqNqCD1NK/iFHi5EZX0CDsAfLgaE/BLmz8s=
-github.com/phyer/core v0.1.100/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
+github.com/phyer/core v0.1.99 h1:clNHM5+7c23W1FyyHDYGXHHYZpGEbHOoRhOXpzhWwjQ=
+github.com/phyer/core v0.1.99/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
 github.com/phyer/texus v0.0.0-20241207132635-0e7fb63f8196 h1:P1sxgCsS0VIL38ufZzgUuZLLyY/B+po6kSY7ziNZT7E=
 github.com/phyer/texus v0.0.0-20241207132635-0e7fb63f8196/go.mod h1:iZexs5agdApNlp8HW/FqKgma4Ij1x8/o+ZLcMvY3f80=
 github.com/phyer/v5sdkgo v0.1.4 h1:mAxxjPJVTYGuGDarqOcFGkzj5AgqbbzJGsnYmmsbapU=

main.go

@@ -84,9 +84,7 @@ func main() {
 	go func() {
 		md.StockRsisProcess(&cr)
 	}()
-	go func() {
-		// md.StockRsisProcess(&cr)
-	}()
+
 	// 这些暂时不运行, 以后要不要运行再说
 	// go func() {
 	// 	core.CoasterProcess(&cr)

modules/candle.go

@@ -4,12 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/phyer/core"
 	"os"
 	"strconv"
 	"strings"
-
-	"github.com/phyer/core"
-
 	// "sync"
 	"time"
 	//
@@ -88,52 +86,29 @@ func (cd *MyCandle) Process(cr *core.Core) {
 }
 
 func (cd *MyCandle) InsertIntoPlate(cr *core.Core) (*core.Sample, error) {
-	if cr == nil {
-		return nil, errors.New("core is nil")
-	}
-
-	if cr.Mu == nil {
-		return nil, errors.New("core mutex is nil")
-	}
-
 	cr.Mu.Lock()
 	defer cr.Mu.Unlock()
-
-	if cr.PlateMap == nil {
-		return nil, errors.New("PlateMap is nil")
-	}
-
-	pl, err := LoadPlate(cr, cd.InstID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load plate: %w", err)
-	}
+	// pl, plateFounded := cr.PlateMap[cd.InstID]
+	// if !plateFounded || pl == nil {
+	pl, _ := LoadPlate(cr, cd.InstID)
 	cr.PlateMap[cd.InstID] = pl
-
-	if pl == nil {
-		return nil, errors.New("loaded plate is nil")
-	}
-
+	// }
 	po, coasterFounded := pl.CoasterMap["period"+cd.Period]
+	err := errors.New("")
 	if !coasterFounded {
-		_, err := pl.MakeCoaster(cr, cd.Period)
-		if err != nil {
-			return nil, fmt.Errorf("failed to make coaster: %w", err)
-		}
-		po, coasterFounded = pl.CoasterMap["period"+cd.Period]
+		pl.MakeCoaster(cr, cd.Period)
 	}
 
-	if !coasterFounded || len(po.InstID) == 0 {
-		return nil, fmt.Errorf("coaster creation failed for instID: %s, period: %s", cd.InstID, cd.Period)
+	if len(po.InstID) == 0 {
+		// logrus.Debug("candle coaster: ", cd.Period, pl.CoasterMap["period"+cd.Period], pl.CoasterMap)
+		//创建失败的原因是原始数据不够，一般发生在服务中断了，缺少部分数据的情况下, 后续需要数据补全措施
+		erstr := fmt.Sprintln("coaster创建失败 candle instID: "+cd.InstID+"; period: "+cd.Period, "coasterFounded: ", coasterFounded, " ", err)
+		err := errors.New(erstr)
+		return nil, err
 	}
-
 	sm, err := po.RPushSample(cr, &cd.Candle, "candle")
-	if err != nil {
-		return nil, fmt.Errorf("failed to push sample: %w", err)
-	}
-
-	return sm, nil
+	return sm, err
 }
-
 func (cad *MyCandle) AddToGeneralCandleChnl(cr *core.Core) {
 	suffix := ""
 	env := os.Getenv("GO_ENV")