From 53d80c839ad2aad0a0482ca43fca1fc3a95b9d1c Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 03 十一月 2023 17:30:54 +0800 Subject: [PATCH] 更改路由 --- model/index.go | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/model/index.go b/model/index.go index 21552fb..aa38c06 100644 --- a/model/index.go +++ b/model/index.go @@ -4,21 +4,64 @@ "apsClient/conf" "apsClient/pkg/logx" "apsClient/pkg/sqlitex" + "sync" ) func Init() error { - if err := sqlitex.Init(&conf.Conf.Sqlite, logx.GetLogger()); err != nil { + if err := sqlitex.Init(&conf.Conf.Sqlite); err != nil { return err } - if err := RegisterTables(); err != nil { - return err - } + RegisterTables() + InsertDefaultData() return nil } -func RegisterTables() error { +func RegisterTables() { db := sqlitex.GetDB() - err := db.AutoMigrate(Order{}, Procedures{}) - return err + db.AutoMigrate( + Order{}, + Procedures{}, + NetConfig{}, + PlcBrand{}, + DevicePlc{}, + ProcessModel{}, + ProductionProgress{}, + Device{}, + TaskStatusSync{}, + SystemStatus{}, + ) +} + +type InitDefaultData interface { + InitDefaultData(errCh chan<- error, wg *sync.WaitGroup) +} + +func InsertDefaultData() { + errCh := make(chan error, 2) + var wg sync.WaitGroup + + models := []interface{}{ + NewNetConfigSearch(nil), + NewPlcBrandSearch(), + NewSystemStatusSearch(), + } + + for _, model := range models { + if id, ok := model.(InitDefaultData); ok { + wg.Add(1) + go id.InitDefaultData(errCh, &wg) + } + } + + go func() { + wg.Wait() // 绛夊緟鎵�鏈塯oroutine瀹屾垚 + close(errCh) // 鍏抽棴閿欒閫氶亾 + }() + + for err := range errCh { + if err != nil { + logx.Errorf("InitDefaultData err: %v", err.Error()) + } + } } -- Gitblit v1.8.0