From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 16:39:07 +0800
Subject: [PATCH] Merge branch 'feat-serf'
---
model/plc_brand.go | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/model/plc_brand.go b/model/plc_brand.go
index 4bf7bff..21a8505 100644
--- a/model/plc_brand.go
+++ b/model/plc_brand.go
@@ -5,15 +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鍝佺墝鎼滅储鏉′欢
@@ -40,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
@@ -54,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 {
@@ -74,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
}
@@ -102,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()
@@ -145,9 +148,9 @@
return
}
records := []*PlcBrand{
- {1, "娆у榫�"},
- {2, "瑗块棬瀛�"},
- {3, "鏉句笅"},
+ {Name: "娆у榫�"},
+ {Name: "瑗块棬瀛�"},
+ {Name: "鏉句笅"},
}
err := slf.CreateBatch(records)
if err != nil {
--
Gitblit v1.8.0