From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置
---
model/process_model.go | 123 +++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 42 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 77cf9af..dbea7b4 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -1,37 +1,54 @@
package model
import (
+ "apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
+ "encoding/json"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
)
type (
- // ProcessModel 宸ヨ壓娴佺▼鍙傛暟
+ // ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
- gorm.Model `json:"-"`
- Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `gorm:"column:order_id;type:varchar(255);not null;default '';comment:璁㈠崟id" json:"orderId"` //璁㈠崟id
- Product string `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"` //浜у搧鍚嶇О
- Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
- WorkOrder string `gorm:"column:work_order;type:varchar(255);not null;default '';comment:宸ュ崟" json:"workOrder"` //宸ュ崟
- Device string `gorm:"column:device;type:varchar(255);not null;default '';comment:璁惧" json:"device"` //璁惧
- Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
- ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
- DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ CommonModel
+ Number string `gorm:"index;column:number;type:varchar(255);not null;default ''" json:"number"` //宸ヨ壓妯″瀷缂栧彿
+ Product string `gorm:"column:product;type:varchar(255);not null;default ''" json:"product"` //浜у搧鍚嶇О
+ Procedure string `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedure"` //宸ュ簭
+ Params string
+ ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
+ DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsNew bool `json:"-" gorm:"column:is_new"` //鏄惁鏈�鏂扮殑
+ IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
+ NewParamsMap map[string]interface{} `json:"newParamsMap" gorm:"-"`
+ NewNumber string `json:"newNumber" gorm:"-"`
}
ProcessModelSearch struct {
ProcessModel
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
+ Order string
+ Limit int
+ Offset int
+ Orm *gorm.DB
+ Procedures []string
+ CurrentNumber string
+ Numbers []string
+ ProductNot string
+ ProcedureNot 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 {
@@ -43,8 +60,8 @@
return slf
}
-func (slf *ProcessModelSearch) SetPage(page, size int) *ProcessModelSearch {
- slf.PageNum, slf.PageSize = page, size
+func (slf *ProcessModelSearch) SetPage(offset, limit int) *ProcessModelSearch {
+ slf.Offset, slf.Limit = offset, limit
return slf
}
@@ -63,24 +80,38 @@
return slf
}
-func (slf *ProcessModelSearch) SetWorkOrder(workOrder string) *ProcessModelSearch {
- slf.WorkOrder = workOrder
+func (slf *ProcessModelSearch) SetNumbers(numbers []string) *ProcessModelSearch {
+ slf.Numbers = numbers
return slf
}
-func (slf *ProcessModelSearch) SetOrderId(orderId string) *ProcessModelSearch {
- slf.OrderId = orderId
+
+func (slf *ProcessModelSearch) SetCurrentNumber(number string) *ProcessModelSearch {
+ slf.CurrentNumber = number
return slf
}
+
func (slf *ProcessModelSearch) SetProduct(product string) *ProcessModelSearch {
slf.Product = product
return slf
}
+
func (slf *ProcessModelSearch) SetProcedure(procedure string) *ProcessModelSearch {
slf.Procedure = procedure
return slf
}
-func (slf *ProcessModelSearch) SetDevice(device string) *ProcessModelSearch {
- slf.Device = device
+
+func (slf *ProcessModelSearch) SetProductAndProcedureNot(product string, procedure string) *ProcessModelSearch {
+ slf.ProductNot, slf.ProcedureNot = product, 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
}
@@ -91,14 +122,6 @@
db = db.Where("id = ?", slf.ID)
}
- if len(slf.WorkOrder) != 0 {
- db = db.Where("work_order = ?", slf.WorkOrder)
- }
-
- if len(slf.OrderId) != 0 {
- db = db.Where("order_id = ?", slf.OrderId)
- }
-
if len(slf.Product) != 0 {
db = db.Where("product = ?", slf.Product)
}
@@ -107,8 +130,12 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
- if len(slf.Device) != 0 {
- db = db.Where("device = ?", slf.Device)
+ if len(slf.ProductNot) != 0 && len(slf.ProcedureNot) != 0 {
+ db = db.Not("product = ? and procedure = ? ", slf.ProductNot, slf.ProcedureNot)
+ }
+
+ if len(slf.Procedures) != 0 {
+ db = db.Where("`procedure` IN (?)", slf.Procedures)
}
if len(slf.Number) != 0 {
@@ -117,6 +144,18 @@
if slf.Order != "" {
db = db.Order(slf.Order)
+ }
+
+ if slf.IsNew {
+ db = db.Where("is_new = ?", 1)
+ }
+
+ if len(slf.CurrentNumber) != 0 {
+ db = db.Where("number != ?", slf.CurrentNumber)
+ }
+
+ if len(slf.Numbers) != 0 {
+ db = db.Where("number in (?)", slf.Numbers)
}
return db
@@ -200,8 +239,8 @@
if err := db.Count(&total).Error; err != nil {
return records, total, fmt.Errorf("find count err: %v", err)
}
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || 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)
@@ -216,8 +255,8 @@
db = slf.build()
)
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, fmt.Errorf("find records err: %v", err)
@@ -237,8 +276,8 @@
if err := db.Count(&total).Error; err != nil {
return records, total, fmt.Errorf("find by query count err: %v", err)
}
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || 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 by query records err: %v, query: %s, args: %+v", err, query, args)
@@ -254,8 +293,8 @@
db = slf.Orm.Table(slf.TableName()).Where(query, args...)
)
- if slf.PageNum*slf.PageSize > 0 {
- db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ if slf.Offset > 0 || slf.Limit > 0 {
+ db = db.Offset(slf.Offset).Limit(slf.Limit)
}
if err := db.Find(&records).Error; err != nil {
return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
--
Gitblit v1.8.0