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/procedures.go | 121 ++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 23 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 8d893e6..79e3842 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -6,23 +6,28 @@
"apsClient/pkg/sqlitex"
"encoding/json"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
+ "strings"
)
type (
Procedures struct {
- gorm.Model `json:"-"`
- ID int `gorm:"primarykey"`
- WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"-"`
- OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"-"`
- DeviceID string `gorm:"index;type:varchar(191);comment:璁惧ID" json:"deviceId"`
- ProcedureID string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
- Channel int32 `gorm:"index;comment:閫氶亾" json:"channel"` //閫氶亾
- StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
- EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
- Status ProcedureStatus
- ProcedureData string `json:"-"` //common.ProductProcedure json涓�
- ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
+ gorm.Model
+ ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ WorkOrderID string `gorm:"index;type:varchar(191);" json:"-"`
+ OrderID string `gorm:"index;type:varchar(191);" json:"-"`
+ DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
+ ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
+ Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
+ ProcessModelNumber string `gorm:"index;" json:"processModelNumber"` //宸ヨ壓妯″瀷缂栧彿
+ StartTime int64 `json:"startTime"`
+ EndTime int64 `json:"endTime"`
+ RealStartTime int64 `json:"realStartTime"`
+ RealEndTime int64 `json:"realEndTime"`
+ FinishedQuantity int `gorm:"type:int;" json:"finishedQuantity"`
+ Status ProcedureStatus
+ ProcedureData string `json:"-"` //common.ProductProcedure json涓�
+ ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
}
ProceduresSearch struct {
@@ -32,10 +37,16 @@
PageSize int
Orm *gorm.DB
Preload bool
+ StartTimeMin int64
StartTimeMax int64
EndTimeMin int64
+ EndTimeMax int64
StatusNot ProcedureStatus
ProcedureIds []string
+ Channels []int32
+ Offset int
+ Limit int
+ Fields []string
}
)
@@ -51,13 +62,15 @@
return "procedures"
}
func (slf *Procedures) AfterFind(db *gorm.DB) error {
- var proceduresInfo common.ProductProcedure
- err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
- if err != nil {
- logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
- return err
+ if slf.ProcedureData != "" {
+ var proceduresInfo common.ProductProcedure
+ err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
+ if err != nil {
+ logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
+ return err
+ }
+ slf.ProceduresInfo = proceduresInfo
}
- slf.ProceduresInfo = proceduresInfo
return nil
}
@@ -78,6 +91,11 @@
return slf
}
+func (slf *ProceduresSearch) SetOffset(offset, limit int) *ProceduresSearch {
+ slf.Offset, slf.Limit = offset, limit
+ return slf
+}
+
func (slf *ProceduresSearch) SetOrder(order string) *ProceduresSearch {
slf.Order = order
return slf
@@ -93,6 +111,11 @@
return slf
}
+func (slf *ProceduresSearch) SetStartTimeMin(ts int64) *ProceduresSearch {
+ slf.StartTimeMin = ts
+ return slf
+}
+
func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
slf.StartTimeMax = ts
return slf
@@ -103,7 +126,12 @@
return slf
}
-func (slf *ProceduresSearch) SetId(id int) *ProceduresSearch {
+func (slf *ProceduresSearch) SetEndTimeMax(ts int64) *ProceduresSearch {
+ slf.EndTimeMax = ts
+ return slf
+}
+
+func (slf *ProceduresSearch) SetId(id uint) *ProceduresSearch {
slf.ID = id
return slf
}
@@ -130,6 +158,16 @@
func (slf *ProceduresSearch) SetPreload(preload bool) *ProceduresSearch {
slf.Preload = preload
+ return slf
+}
+
+func (slf *ProceduresSearch) SetChannels(channels []int32) *ProceduresSearch {
+ slf.Channels = channels
+ return slf
+}
+
+func (slf *ProceduresSearch) SetFields(fields []string) *ProceduresSearch {
+ slf.Fields = fields
return slf
}
@@ -160,8 +198,16 @@
db = db.Where("start_time <= ?", slf.StartTimeMax)
}
+ if slf.StartTimeMin != 0 {
+ db = db.Where("start_time >= ?", slf.StartTimeMin)
+ }
+
if slf.EndTimeMin != 0 {
db = db.Where("end_time > ?", slf.EndTimeMin)
+ }
+
+ if slf.EndTimeMax != 0 {
+ db = db.Where("end_time < ?", slf.EndTimeMax)
}
if slf.Status != 0 {
@@ -173,11 +219,19 @@
}
if len(slf.ProcedureIds) > 0 {
- db = db.Where("procedure_id in ?", slf.ProcedureIds)
+ db = db.Where("procedure_id IN (?)", slf.ProcedureIds)
}
if slf.ProcedureID != "" {
db = db.Where("procedure_id = ?", slf.ProcedureID)
+ }
+
+ if len(slf.Channels) > 0 {
+ db = db.Where("channel IN (?)", slf.Channels)
+ }
+
+ if len(slf.Fields) > 0 {
+ db = db.Select(strings.Join(slf.Fields, ","))
}
return db
@@ -197,9 +251,25 @@
// CreateBatch 鎵归噺鎻掑叆
func (slf *ProceduresSearch) CreateBatch(records []*Procedures) error {
var db = slf.build()
+ for _, record := range records {
+ if err := db.Create(record).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+ }
+ return nil
+}
- if err := db.Create(&records).Error; err != nil {
- return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+func (slf *ProceduresSearch) Upsert(record *Procedures) error {
+ var db = slf.build()
+ old, err := slf.First()
+ if err != gorm.ErrRecordNotFound && old.ID != 0 {
+ record.ID = old.ID
+ err = db.Save(&record).Error
+ } else {
+ err = db.Create(&record).Error
+ }
+ if err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
}
return nil
@@ -275,6 +345,11 @@
if slf.PageNum*slf.PageSize > 0 {
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
+
+ if slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
+ }
+
if err := db.Find(&records).Error; err != nil {
return records, total, fmt.Errorf("find records err: %v", err)
}
--
Gitblit v1.8.0