From 3e438843c57c2e3525c14832eb26e5ac343b817c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 07 十月 2023 14:57:37 +0800
Subject: [PATCH] merge
---
model/process_model.go | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 1828814..9ff8e4f 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -1,13 +1,15 @@
package model
import (
+ "apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
+ "encoding/json"
"fmt"
"gorm.io/gorm"
)
type (
- // ProcessModel 宸ヨ壓娴佺▼鍙傛暟
+ // ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
gorm.Model `json:"-"`
Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
@@ -15,20 +17,32 @@
Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
- DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsNew bool `json:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+ IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
}
ProcessModelSearch struct {
ProcessModel
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ Procedures []string
}
)
func (slf *ProcessModel) TableName() string {
return "process_model"
+}
+
+func (slf *ProcessModel) AfterFind(db *gorm.DB) error {
+ err := json.Unmarshal([]byte(slf.Params), &slf.ParamsMap)
+ if err != nil {
+ logx.Errorf("process model json.Unmarshal:%v", err)
+ return err
+ }
+ return nil
}
func NewProcessModelSearch() *ProcessModelSearch {
@@ -64,8 +78,19 @@
slf.Product = product
return slf
}
+
func (slf *ProcessModelSearch) SetProcedure(procedure string) *ProcessModelSearch {
slf.Procedure = procedure
+ return slf
+}
+
+func (slf *ProcessModelSearch) SetProcedures(procedures []string) *ProcessModelSearch {
+ slf.Procedures = procedures
+ return slf
+}
+
+func (slf *ProcessModelSearch) SetIsNew(isNew bool) *ProcessModelSearch {
+ slf.IsNew = isNew
return slf
}
@@ -84,6 +109,10 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
+ if len(slf.Procedures) != 0 {
+ db = db.Where("`procedure` in ?", slf.Procedures)
+ }
+
if len(slf.Number) != 0 {
db = db.Where("number = ?", slf.Number)
}
@@ -92,6 +121,10 @@
db = db.Order(slf.Order)
}
+ if slf.IsNew {
+ db = db.Where("is_new = ?", 1)
+ }
+
return db
}
--
Gitblit v1.8.0