Reset code state to commit 31101f850158a02d074152e94f588f54c5c6234d

This commit is contained in:
zhangkun9038@dingtalk.com 2025-01-14 21:48:47 +08:00
parent 581bdb81fc
commit 94030db9c9
4 changed files with 17 additions and 44 deletions

4
go.sum
View File

@ -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.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= 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.99 h1:clNHM5+7c23W1FyyHDYGXHHYZpGEbHOoRhOXpzhWwjQ=
github.com/phyer/core v0.1.100/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg= 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 h1:P1sxgCsS0VIL38ufZzgUuZLLyY/B+po6kSY7ziNZT7E=
github.com/phyer/texus v0.0.0-20241207132635-0e7fb63f8196/go.mod h1:iZexs5agdApNlp8HW/FqKgma4Ij1x8/o+ZLcMvY3f80= 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= github.com/phyer/v5sdkgo v0.1.4 h1:mAxxjPJVTYGuGDarqOcFGkzj5AgqbbzJGsnYmmsbapU=

View File

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

View File

@ -4,12 +4,10 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/phyer/core"
"os" "os"
"strconv" "strconv"
"strings" "strings"
"github.com/phyer/core"
// "sync" // "sync"
"time" "time"
// //
@ -88,52 +86,29 @@ func (cd *MyCandle) Process(cr *core.Core) {
} }
func (cd *MyCandle) InsertIntoPlate(cr *core.Core) (*core.Sample, error) { 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() cr.Mu.Lock()
defer cr.Mu.Unlock() defer cr.Mu.Unlock()
// pl, plateFounded := cr.PlateMap[cd.InstID]
if cr.PlateMap == nil { // if !plateFounded || pl == nil {
return nil, errors.New("PlateMap is nil") pl, _ := LoadPlate(cr, cd.InstID)
}
pl, err := LoadPlate(cr, cd.InstID)
if err != nil {
return nil, fmt.Errorf("failed to load plate: %w", err)
}
cr.PlateMap[cd.InstID] = pl cr.PlateMap[cd.InstID] = pl
// }
if pl == nil {
return nil, errors.New("loaded plate is nil")
}
po, coasterFounded := pl.CoasterMap["period"+cd.Period] po, coasterFounded := pl.CoasterMap["period"+cd.Period]
err := errors.New("")
if !coasterFounded { if !coasterFounded {
_, err := pl.MakeCoaster(cr, cd.Period) 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]
} }
if !coasterFounded || len(po.InstID) == 0 { if len(po.InstID) == 0 {
return nil, fmt.Errorf("coaster creation failed for instID: %s, period: %s", cd.InstID, cd.Period) // 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") sm, err := po.RPushSample(cr, &cd.Candle, "candle")
if err != nil { return sm, err
return nil, fmt.Errorf("failed to push sample: %w", err)
} }
return sm, nil
}
func (cad *MyCandle) AddToGeneralCandleChnl(cr *core.Core) { func (cad *MyCandle) AddToGeneralCandleChnl(cr *core.Core) {
suffix := "" suffix := ""
env := os.Getenv("GO_ENV") env := os.Getenv("GO_ENV")

BIN
siaga Executable file

Binary file not shown.