From 8e941bd782f574597f19c980982afade4dc11748 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 08 十二月 2023 19:52:20 +0800
Subject: [PATCH] snowflake的id传参换成字符串
---
model/report_work.go | 2 +-
model/net_config.go | 4 ++--
model/process_model_plc_address.go | 3 ++-
model/plc_brand.go | 4 ++--
model/system_status.go | 2 +-
model/request/plcBrand.go | 2 +-
model/device.go | 2 +-
model/reports_to_cloud.go | 2 +-
model/request/task.go | 11 +----------
model/model.go | 7 +++++++
/dev/null | 1 -
model/request/common.go | 12 ++++--------
model/device_plc.go | 2 +-
model/process_model.go | 2 +-
model/work_order.go | 2 +-
model/task_status_sync.go | 2 +-
16 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/model/device.go b/model/device.go
index 1e490d3..ba49b0a 100644
--- a/model/device.go
+++ b/model/device.go
@@ -10,7 +10,7 @@
type (
// Device 璁惧
Device struct {
- gorm.Model
+ CommonModel
DeviceID string `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //璁惧缂栧彿
DeviceName string `gorm:"column:device_name;type:varchar(255);" json:"deviceName"` //璁惧鍚嶇О
ExtChannelAmount int `gorm:"type:tinyint;default:0" json:"extChannelAmount"`
diff --git a/model/device_plc.go b/model/device_plc.go
index a6e7331..4f5f687 100644
--- a/model/device_plc.go
+++ b/model/device_plc.go
@@ -12,7 +12,7 @@
// DevicePlc 璁惧鐨凱LC閰嶇疆
DevicePlc struct {
- gorm.Model
+ CommonModel
DeviceID string `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //璁惧缂栧彿
Brand string `gorm:"type:varchar(191)" json:"brand"`
Method constvar.PlcMethod `gorm:"type:varchar(191)" json:"method"`
diff --git a/model/model.go b/model/model.go
index b873d13..efa8a39 100644
--- a/model/model.go
+++ b/model/model.go
@@ -1,6 +1,7 @@
package model
import (
+ "apsClient/pkg/snowflake"
"time"
)
@@ -10,3 +11,9 @@
UpdatedAt time.Time
DeletedAt *time.Time `sql:"index"`
}
+
+func (c *CommonModel) BeforeCreate() {
+ if c.ID == 0 {
+ c.ID = uint(snowflake.GenerateID())
+ }
+}
diff --git a/model/net_config.go b/model/net_config.go
index 0223a47..ed7523e 100644
--- a/model/net_config.go
+++ b/model/net_config.go
@@ -9,7 +9,7 @@
type (
NetConfig struct {
- gorm.Model
+ CommonModel
NetworkCard string `gorm:"type:varchar(100);not null;default ''" json:"networkCard" binding:"required"` //缃戝崱
IP string `gorm:"type:varchar(100);not null;default ''" json:"ip" binding:"required"` //鏈満ip
MASK string `gorm:"type:varchar(100);not null;default ''" json:"mask" binding:"required"` //瀛愮綉鎺╃爜
@@ -172,7 +172,7 @@
func (slf *NetConfigSearch) CreateBatch(records []*NetConfig) error {
var db = slf.build()
- for _, record := range records{
+ for _, record := range records {
db.Create(record)
}
return nil
diff --git a/model/plc_brand.go b/model/plc_brand.go
index 21a8505..85604b2 100644
--- a/model/plc_brand.go
+++ b/model/plc_brand.go
@@ -12,7 +12,7 @@
type (
// PlcBrand plc鍝佺墝
PlcBrand struct {
- gorm.Model
+ CommonModel
Name string `json:"name" gorm:"column:name;type:varchar(255);not null;default:''"`
}
@@ -54,7 +54,7 @@
func (slf *PlcBrandSearch) CreateBatch(records []*PlcBrand) error {
var db = slf.build()
- for _, record := range records{
+ for _, record := range records {
db.Create(record)
}
return nil
diff --git a/model/process_model.go b/model/process_model.go
index 2418f40..dbea7b4 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -11,7 +11,7 @@
type (
// ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
- gorm.Model
+ 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"` //宸ュ簭
diff --git a/model/process_model_plc_address.go b/model/process_model_plc_address.go
index 857a202..d2aca43 100644
--- a/model/process_model_plc_address.go
+++ b/model/process_model_plc_address.go
@@ -15,7 +15,8 @@
// ProcessModelPlcAddress 宸ヨ壓鍙傛暟plc璇诲啓鍦板潃
ProcessModelPlcAddress struct {
- ID uint `gorm:"primaryKey;" json:"id"`
+ CommonModel
+ ID uint `json:"id"`
AddressList []*ProcessModelAddress `json:"addressList" gorm:"-"`
Address string `json:"-" gorm:"address"`
DeviceID string `json:"deviceId" gorm:"column:device_id;index;type:varchar(255)"`
diff --git a/model/production_progress.go b/model/production_progress.go
deleted file mode 100644
index c6deb29..0000000
--- a/model/production_progress.go
+++ /dev/null
@@ -1,286 +0,0 @@
-package model
-
-//
-//import (
-// "apsClient/pkg/sqlitex"
-// "fmt"
-// "github.com/jinzhu/gorm"
-//)
-//
-//type (
-// ProductionProgress struct {
-// gorm.Model
-// ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
-// WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderID"`
-// OrderID string `gorm:"index;type:varchar(191);not null" json:"orderID"`
-// ProcedureID string `gorm:"type:varchar(191)" json:"procedureId"`
-// ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
-// DeviceID string `gorm:"type:varchar(191);not null" json:"deviceId"`
-// FinishedQuantity int64 `gorm:"type:int;not null" json:"finishedQuantity"`
-// Channel int32 `gorm:"type:int" json:"channel"` //閫氶亾
-// TotalQuantity int64 `gorm:"type:int;not null" json:"totalQuantity"`
-// }
-//
-// ProductionProgressSearch struct {
-// ProductionProgress
-// Order string
-// PageNum int
-// PageSize int
-// Orm *gorm.DB
-// UnFinished bool
-// }
-//)
-//
-//func (slf *ProductionProgress) TableName() string {
-// return "production_progress"
-//}
-//
-//func NewProductionProgressSearch(db *gorm.DB) *ProductionProgressSearch {
-// if db == nil {
-// db = sqlitex.GetDB()
-// }
-// return &ProductionProgressSearch{Orm: db}
-//}
-//
-//func (slf *ProductionProgressSearch) SetOrm(tx *gorm.DB) *ProductionProgressSearch {
-// slf.Orm = tx
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetPage(page, size int) *ProductionProgressSearch {
-// slf.PageNum, slf.PageSize = page, size
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetOrder(order string) *ProductionProgressSearch {
-// slf.Order = order
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetWorkOrderId(orderId string) *ProductionProgressSearch {
-// slf.WorkOrderID = orderId
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetProcedureId(procedureId string) *ProductionProgressSearch {
-// slf.ProcedureID = procedureId
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetProceduresId(proceduresId uint) *ProductionProgressSearch {
-// slf.ProceduresID = proceduresId
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetDeviceId(id string) *ProductionProgressSearch {
-// slf.DeviceID = id
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetProductProcedureId(productProcedureId string) *ProductionProgressSearch {
-// slf.ProductProcedureID = productProcedureId
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetId(id uint) *ProductionProgressSearch {
-// slf.ID = id
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetChannel(channel int32) *ProductionProgressSearch {
-// slf.Channel = channel
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) SetUnFinished() *ProductionProgressSearch {
-// slf.UnFinished = true
-// return slf
-//}
-//
-//func (slf *ProductionProgressSearch) build() *gorm.DB {
-// var db = slf.Orm.Model(&ProductionProgress{})
-//
-// if slf.Order != "" {
-// db = db.Order(slf.Order)
-// }
-//
-// if slf.ID != 0 {
-// db = db.Where("id = ?", slf.ID)
-// }
-//
-// if slf.WorkOrderID != "" {
-// db = db.Where("work_order_id = ?", slf.WorkOrderID)
-// }
-//
-// if slf.OrderID != "" {
-// db = db.Where("order_id = ?", slf.OrderID)
-// }
-//
-// if slf.ProcedureID != "" {
-// db = db.Where("procedure_id = ?", slf.ProcedureID)
-// }
-//
-// if slf.ProceduresID != 0 {
-// db = db.Where("procedures_id = ?", slf.ProceduresID)
-// }
-//
-// if slf.DeviceID != "" {
-// db = db.Where("device_id = ?", slf.DeviceID)
-// }
-//
-// if slf.Channel != 0 {
-// db = db.Where("channel = ?", slf.Channel)
-// }
-//
-// if slf.UnFinished {
-// db = db.Where("finished_quantity < total_quantity")
-// }
-//
-// if slf.ProductProcedureID != "" {
-// db = db.Where("product_procedure_id = ?", slf.ProductProcedureID)
-// }
-//
-// return db
-//}
-//
-//// Create 鍗曟潯鎻掑叆
-//func (slf *ProductionProgressSearch) Create(record *ProductionProgress) error {
-// var db = slf.build()
-//
-// if err := db.Create(record).Error; err != nil {
-// return fmt.Errorf("create err: %v, record: %+v", err, record)
-// }
-//
-// return nil
-//}
-//
-//func (slf *ProductionProgressSearch) Save(record *ProductionProgress) error {
-// var db = slf.build()
-//
-// if err := db.Save(record).Error; err != nil {
-// return fmt.Errorf("save err: %v, record: %+v", err, record)
-// }
-//
-// return nil
-//}
-//
-//func (slf *ProductionProgressSearch) UpdateByMap(upMap map[string]interface{}) error {
-// var (
-// db = slf.build()
-// )
-//
-// if err := db.Updates(upMap).Error; err != nil {
-// return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
-// }
-//
-// return nil
-//}
-//
-//func (slf *ProductionProgressSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
-// var (
-// db = slf.Orm.Table(slf.TableName()).Where(query, args...)
-// )
-//
-// if err := db.Updates(upMap).Error; err != nil {
-// return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
-// }
-//
-// return nil
-//}
-//
-//func (slf *ProductionProgressSearch) Delete() error {
-// var db = slf.build()
-//
-// if err := db.Unscoped().Delete(&ProductionProgress{}).Error; err != nil {
-// return err
-// }
-//
-// return nil
-//}
-//
-//func (slf *ProductionProgressSearch) First() (*ProductionProgress, error) {
-// var (
-// record = new(ProductionProgress)
-// db = slf.build()
-// )
-//
-// if err := db.First(record).Error; err != nil {
-// return record, err
-// }
-//
-// return record, nil
-//}
-//
-//func (slf *ProductionProgressSearch) Find() ([]*ProductionProgress, int64, error) {
-// var (
-// records = make([]*ProductionProgress, 0)
-// total int64
-// db = slf.build()
-// )
-//
-// 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 err := db.Find(&records).Error; err != nil {
-// return records, total, fmt.Errorf("find records err: %v", err)
-// }
-//
-// return records, total, nil
-//}
-//
-//func (slf *ProductionProgressSearch) FindNotTotal() ([]*ProductionProgress, error) {
-// var (
-// records = make([]*ProductionProgress, 0)
-// db = slf.build()
-// )
-//
-// if slf.PageNum*slf.PageSize > 0 {
-// db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
-// }
-// if err := db.Find(&records).Error; err != nil {
-// return records, fmt.Errorf("find records err: %v", err)
-// }
-//
-// return records, nil
-//}
-//
-//// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
-//func (slf *ProductionProgressSearch) FindByQuery(query string, args []interface{}) ([]*ProductionProgress, int64, error) {
-// var (
-// records = make([]*ProductionProgress, 0)
-// total int64
-// db = slf.Orm.Table(slf.TableName()).Where(query, args...)
-// )
-//
-// 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 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)
-// }
-//
-// return records, total, nil
-//}
-//
-//// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
-//func (slf *ProductionProgressSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*ProductionProgress, error) {
-// var (
-// records = make([]*ProductionProgress, 0)
-// 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 err := db.Find(&records).Error; err != nil {
-// return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
-// }
-//
-// return records, nil
-//}
diff --git a/model/report_work.go b/model/report_work.go
index 4f8d8a6..67785df 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -8,7 +8,7 @@
type (
ReportWork struct {
- gorm.Model
+ CommonModel
ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
WorkOrderID string `gorm:"index;type:varchar(191);" json:"workOrderId"`
diff --git a/model/reports_to_cloud.go b/model/reports_to_cloud.go
index f4acf5b..5c2faf4 100644
--- a/model/reports_to_cloud.go
+++ b/model/reports_to_cloud.go
@@ -10,7 +10,7 @@
type (
// ReportsToCloud 鏁版嵁涓婃姤
ReportsToCloud struct {
- gorm.Model
+ CommonModel
ReportType constvar.ReportType `json:"reportType"` //涓婃姤绫诲瀷
Content string `json:"Content"`
}
diff --git a/model/request/cluster.go b/model/request/cluster.go
deleted file mode 100644
index d00ff35..0000000
--- a/model/request/cluster.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package request
-
-type (
- ClusterDevice struct {
- Id int `json:"id"`
- Roles []string `json:"role"`
- }
-
- Devices map[int]ClusterDevice
-
- CreateCluster struct {
- Name string `json:"name"`
- Description string `json:"description"`
- Devices Devices `json:"devices"`
- }
-
- GetClusterList struct {
- Keyword string `json:"keyword" example:"test"` // 妯＄硦鏌ヨ瀛楁
- Status string `json:"status" example:"闆嗙兢鐘舵�� 1:鍏ㄩ儴; 2: 鍦ㄧ嚎; 3: 绂荤嚎"`
- }
-)
diff --git a/model/request/common.go b/model/request/common.go
index 474e019..49f61b6 100644
--- a/model/request/common.go
+++ b/model/request/common.go
@@ -5,10 +5,6 @@
PageSize int `json:"pageSize" form:"pageSize"` // 姣忛〉澶у皬
}
-type GetById struct {
- ID uint `json:"id"` // 涓婚敭ID
-}
-
type SetCurrentDevice struct {
CurrentDeviceID string `json:"currentDeviceID,omitempty"` //褰撳墠閫夊畾鐨勭敓浜ц澶�
}
@@ -18,12 +14,12 @@
}
type ReportWork struct {
- ProcedureId uint `json:"procedureId" binding:"required"` //宸ュ簭id
- ReportAmount int `json:"reportAmount" binding:"required"` //鎶ュ伐鏁伴噺
- WorkerID string `json:"workerID" binding:"required"` //鎶ュ憡鑰卛d
+ ProcedureId uint `json:"procedureId,string" binding:"required"` //宸ュ簭id
+ ReportAmount int `json:"reportAmount" binding:"required"` //鎶ュ伐鏁伴噺
+ WorkerID string `json:"workerID" binding:"required"` //鎶ュ憡鑰卛d
}
type ReportWorkList struct {
PageInfo
- ProcedureId uint `json:"procedureId" binding:"required" form:"procedureId"` //宸ュ簭id
+ ProcedureId uint `json:"procedureId,string" binding:"required" form:"procedureId"` //宸ュ簭id
}
diff --git a/model/request/device.go b/model/request/device.go
deleted file mode 100644
index 75cae2c..0000000
--- a/model/request/device.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package request
-
-type (
- AddDevice struct {
- Device Device
- }
-
- Device struct {
- Name string `json:"name" example:"璁惧鍚嶇О"`
- Ip string `json:"ip" example:"璁惧IP"`
- Account string `json:"account" example:"root璐﹀彿"`
- Password string `json:"password" example:"root瀵嗙爜"`
- Port string `json:"port" example:"绔彛鍙�"`
- }
-
- InstallRancher struct {
- DeviceId int `json:"deviceId"`
- }
-
- GetDeviceList struct {
- Keyword string `json:"keyword"` // 妯＄硦鏌ヨ瀛楁
- Status string `json:"status" example:"璁惧鐘舵�� 1:鍏ㄩ儴; 2: 鍦ㄧ嚎; 3: 绂荤嚎"`
- }
-
- DeleteDevice struct {
- DeviceId int `json:"deviceId"`
- }
-
- UpdateDevice struct {
- Device Device
- }
-)
diff --git a/model/request/plcBrand.go b/model/request/plcBrand.go
index e4c3a31..ad9e1a6 100644
--- a/model/request/plcBrand.go
+++ b/model/request/plcBrand.go
@@ -10,7 +10,7 @@
}
type UpdatePlcBrand struct {
- Id uint `json:"id"`
+ Id uint `json:"id,string"`
model.PlcBrand
}
diff --git a/model/request/schedule_task.go b/model/request/schedule_task.go
deleted file mode 100644
index 725b8fc..0000000
--- a/model/request/schedule_task.go
+++ /dev/null
@@ -1 +0,0 @@
-package request
diff --git a/model/request/task.go b/model/request/task.go
index 63ab2ee..0302d0b 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -2,15 +2,6 @@
import "apsClient/constvar"
-// TaskInfo 浠诲姟寮�鍚�氱煡璇锋眰鍙傛暟
-type TaskInfo struct {
- OrderId string `json:"orderId"` // 璁㈠崟鍙�
- Product string `json:"password"` // 浜у搧
- Procedure string `json:"procedure"` // 宸ュ簭
- WorkOrder string `json:"workOrder"` // 宸ュ崟
- Device string `json:"device"` // 璁惧
-}
-
// TaskList 浠诲姟鍒楄〃璇锋眰鍙傛暟
type TaskList struct {
PageInfo
@@ -29,7 +20,7 @@
// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
type ProcessModelList struct {
PageInfo
- ProcedureId uint `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
+ ProcedureId uint `json:"procedureId,string" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
}
// TaskListByChannel 鎸塩hannel杩斿洖浠诲姟鍒楄〃璇锋眰鍙傛暟
diff --git a/model/request/user.go b/model/request/user.go
deleted file mode 100644
index f2b3d57..0000000
--- a/model/request/user.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package request
-
-type (
- Login struct {
- Username string `json:"username"` // 鐢ㄦ埛鍚�
- Password string `json:"password"` // 瀵嗙爜
- Captcha string `json:"captcha"` // 楠岃瘉鐮�
- CaptchaId string `json:"captchaId"` // 楠岃瘉鐮両D
- }
-
- Register struct {
- Username string `json:"userName" example:"鐢ㄦ埛鍚�"`
- Password string `json:"passWord" example:"瀵嗙爜"`
- NickName string `json:"nickName" example:"鏄电О"`
- Phone string `json:"phone" example:"鐢佃瘽鍙风爜"`
- }
-
- ChangePasswordReq struct {
- ID uint `json:"-"` // 浠� JWT 涓彁鍙� user id锛岄伩鍏嶈秺鏉�
- Password string `json:"password"` // 瀵嗙爜
- NewPassword string `json:"newPassword"` // 鏂板瘑鐮�
- }
-
- DeleteUserReq struct {
- UserId string `json:"userId"` // 鐢ㄦ埛ID
- }
-
- ChangeUserInfo struct {
- ID string `json:"id"` // 鐢ㄦ埛ID
- NickName string `json:"nickName"` // 鐢ㄦ埛鏄电О
- Phone string `json:"phone"` // 鐢ㄦ埛鎵嬫満鍙�
- Pos string `json:"pos"` // 鐢ㄦ埛宀椾綅
- }
-
- GetUserList struct {
- PageInfo
- Keyword string `json:"keyword"` // 妯＄硦鏌ヨ鍏抽敭瀛�
- }
-
- SetOtherInfo struct {
- CompanyLogo string `json:"companyLogo"` // 鍏徃logo
- SystemName string `json:"systemName"` // 绯荤粺鍚嶇О
- }
-
- SetSelfInfo struct {
- NickName string `json:"nickName"` // 鐢ㄦ埛鏄电О
- Phone string `json:"phone"` // 鐢ㄦ埛鎵嬫満鍙�
- CompanyName string `json:"companyName" gorm:"type:varchar(255);comment:鍏徃鍚嶇О"`
- CompanyEmail string `json:"companyEmail" gorm:"type:varchar(255);comment:鍏徃閭"`
- CompanyContact string `json:"companyContact" gorm:"type:varchar(255);comment:鍏徃鑱旂郴浜哄鍚�"`
- CompanyProvince string `json:"companyProvince" gorm:"type:varchar(255);comment:鍏徃鎵�鍦ㄧ渷"`
- CompanyCity string `json:"companyCity" gorm:"type:varchar(255);comment:鍏徃鎵�鍦ㄥ競"`
- CompanyTrade string `json:"companyTrade" gorm:"type:varchar(255);comment:鍏徃琛屼笟"`
- HeaderImage string `json:"headerImage" gorm:"type:mediumtext;comment:鐢ㄦ埛澶村儚"`
- }
-)
diff --git a/model/sqlite.go b/model/sqlite.go
deleted file mode 100644
index 8b53790..0000000
--- a/model/sqlite.go
+++ /dev/null
@@ -1 +0,0 @@
-package model
diff --git a/model/system_status.go b/model/system_status.go
index 90a05ee..f5d15b5 100644
--- a/model/system_status.go
+++ b/model/system_status.go
@@ -12,7 +12,7 @@
type (
// SystemStatus 绯荤粺鐘舵��
SystemStatus struct {
- gorm.Model
+ CommonModel
Key constvar.SystemStatusKey `json:"key" gorm:"column:key;type:varchar(255);not null"`
Value constvar.SystemStatusValue `json:"value" gorm:"column:value;type:varchar(255);not null"`
}
diff --git a/model/task_status_sync.go b/model/task_status_sync.go
index 093cb8f..63d1428 100644
--- a/model/task_status_sync.go
+++ b/model/task_status_sync.go
@@ -10,7 +10,7 @@
type (
// TaskStatusSync 浠诲姟鐘舵�佸悓姝�
TaskStatusSync struct {
- gorm.Model
+ CommonModel
WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
ProcedureID string `json:"procedureId"` // 宸ュ簭缂栧彿
diff --git a/model/work_order.go b/model/work_order.go
index 6d32261..e28834e 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -9,7 +9,7 @@
type (
Order struct {
- gorm.Model
+ CommonModel
WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
OrderID string `gorm:"index;type:varchar(191);not null" json:"orderId"`
ProductID string `gorm:"type:varchar(191)" json:"productId"`
--
Gitblit v1.8.0