From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
model/plc_brand.go | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/model/plc_brand.go b/model/plc_brand.go
index a91bf44..21a8505 100644
--- a/model/plc_brand.go
+++ b/model/plc_brand.go
@@ -5,14 +5,15 @@
"apsClient/pkg/sqlitex"
"errors"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
+ "sync"
)
type (
// PlcBrand plc鍝佺墝
PlcBrand struct {
- Id int `json:"id" gorm:"column:id;type:int;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"column:name;type:varchar(255);not null;default:'';comment:鍚嶇О"`
+ gorm.Model
+ Name string `json:"name" gorm:"column:name;type:varchar(255);not null;default:''"`
}
// PlcBrandSearch plc鍝佺墝鎼滅储鏉′欢
@@ -39,8 +40,8 @@
func (slf *PlcBrandSearch) build() *gorm.DB {
var db = slf.Orm.Model(&PlcBrand{})
- if slf.Id != 0 {
- db = db.Where("id = ?", slf.Id)
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
}
return db
@@ -53,7 +54,10 @@
func (slf *PlcBrandSearch) CreateBatch(records []*PlcBrand) error {
var db = slf.build()
- return db.Create(records).Error
+ for _, record := range records{
+ db.Create(record)
+ }
+ return nil
}
func (slf *PlcBrandSearch) Delete() error {
@@ -73,8 +77,8 @@
return record, err
}
-func (slf *PlcBrandSearch) SetId(id int) *PlcBrandSearch {
- slf.Id = id
+func (slf *PlcBrandSearch) SetId(id uint) *PlcBrandSearch {
+ slf.ID = id
return slf
}
@@ -101,7 +105,7 @@
}
func (slf *PlcBrandSearch) Save(record *PlcBrand) error {
- if record.Id == 0 {
+ if record.ID == 0 {
return errors.New("id涓虹┖")
}
var db = slf.build()
@@ -129,17 +133,28 @@
}
// InitDefaultData 鍒濆鍖栨暟鎹�
-func (slf *PlcBrandSearch) InitDefaultData() error {
+func (slf *PlcBrandSearch) InitDefaultData(errCh chan<- error, wg *sync.WaitGroup) {
var (
db = slf.Orm.Table(slf.TableName())
total int64 = 0
)
+ defer wg.Done()
+
if err := db.Count(&total).Error; err != nil {
- return err
+ errCh <- err
+ return
}
if total != 0 {
- return nil
+ return
}
- records := []*PlcBrand{}
- return slf.CreateBatch(records)
+ records := []*PlcBrand{
+ {Name: "娆у榫�"},
+ {Name: "瑗块棬瀛�"},
+ {Name: "鏉句笅"},
+ }
+ err := slf.CreateBatch(records)
+ if err != nil {
+ errCh <- err
+ return
+ }
}
--
Gitblit v1.8.0