From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口
---
model/index.go | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/model/index.go b/model/index.go
index fb11459..738e2fc 100644
--- a/model/index.go
+++ b/model/index.go
@@ -4,6 +4,7 @@
"apsClient/conf"
"apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
+ "sync"
)
func Init() error {
@@ -14,11 +15,52 @@
if err := RegisterTables(); err != nil {
return err
}
+ InsertDefaultData()
return nil
}
func RegisterTables() error {
db := sqlitex.GetDB()
- err := db.AutoMigrate(ScheduleTask{})
+ err := db.AutoMigrate(
+ Order{},
+ Procedures{},
+ NetConfig{},
+ PlcBrand{},
+ DevicePlc{},
+ ProcessModel{},
+ ProductionProgress{},
+ )
return err
}
+
+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(),
+ }
+
+ 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