From fecd8ff508b33715cbe24ca892fc19a2d1ad1ef5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 十一月 2023 16:34:05 +0800
Subject: [PATCH] 加锁解决同时读串口时报的资源不可用和超时报错
---
model/index.go | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/model/index.go b/model/index.go
index 6ac0cf7..f109db2 100644
--- a/model/index.go
+++ b/model/index.go
@@ -8,27 +8,30 @@
)
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(
+ db.AutoMigrate(
Order{},
Procedures{},
NetConfig{},
PlcBrand{},
DevicePlc{},
+ ProcessModel{},
+ ProductionProgress{},
+ Device{},
+ TaskStatusSync{},
+ SystemStatus{},
+ ProcessModelPlcAddress{},
)
- return err
}
type InitDefaultData interface {
@@ -42,6 +45,7 @@
models := []interface{}{
NewNetConfigSearch(nil),
NewPlcBrandSearch(),
+ NewSystemStatusSearch(),
}
for _, model := range models {
--
Gitblit v1.8.0