From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置
---
model/common/common.go | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index dee9b4c..d918026 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -90,12 +90,13 @@
}
PlcAddress struct {
- DeviceID string `json:"deviceID"` // 璁惧id
- Channel int `json:"channel"` // 鐢熶骇閫氶亾on锛屼竴涓満鍣ㄥ彲鑳芥湁澶氫釜鏈轰綅锛岄渶瑕佸垎鍒厤缃畃lc鍦板潃
- StartAddress int `json:"startAddress"` // 鏁版嵁璧峰鍦板潃
- Length int `json:"length"` // 鏁版嵁闀垮害
- Type string `json:"type"` // 鏁版嵁绫诲瀷
- FieldName constvar.PlcStartAddressType `json:"fieldName"` // 瀵瑰簲绯荤粺瀛楁锛屽畬鎴愰噺鎴栨�婚噺
+ DeviceID string `json:"deviceID"` // 璁惧id
+ Channel int `json:"channel"` // 鐢熶骇閫氶亾on锛屼竴涓満鍣ㄥ彲鑳芥湁澶氫釜鏈轰綅锛岄渶瑕佸垎鍒厤缃畃lc鍦板潃
+ StartAddress int `json:"startAddress"` // 鏁版嵁璧峰鍦板潃
+ Length int `json:"length"` // 鏁版嵁闀垮害
+ Type string `json:"type"` // 鏁版嵁绫诲瀷
+ FieldName constvar.PlcStartAddressType `json:"fieldName"` // 瀵瑰簲绯荤粺瀛楁锛屽畬鎴愰噺鎴栨�婚噺
+ Endian constvar.EndianType `json:"endian" gorm:"type:varchar(255)"` // 瀛楄妭瀛樺偍椤哄簭锛宐ig(ABCD)/little(CDBA)/mix(CDAB)
}
)
@@ -121,11 +122,15 @@
// MsgTaskStatusUpdate 浠诲姟鐘舵�佹敼鍙�
type MsgTaskStatusUpdate struct {
- WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
- ProcedureID string `json:"procedureId"` // 宸ュ簭
- DeviceId string `json:"deviceId"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
- IsProcessing bool //鏄惁澶勭悊涓�
- IsFinish bool //鏄惁瀹屾垚
+ WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
+ ProcedureID string `json:"procedureId"` // 宸ュ簭
+ DeviceId string `json:"deviceId"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsProcessing bool //鏄惁澶勭悊涓�
+ IsFinish bool //鏄惁瀹屾垚
+ FinishAmount int `json:"finishAmount"` //isFinish = true鏃跺彇宸ュ簭鏈�缁堝姞宸ユ暟浼犱笂鍘�
+ ProductProcedureID string `json:"productProcedureID"` //浜у搧宸ュ簭id
+ StartTs int64 `json:"start_ts"` //寮�濮嬫椂闂�
+ FinishTs int64 `json:"finish_ts"` //缁撴潫鏃堕棿
}
// DeviceMsg 涓嬪彂鍒扮粓绔殑璁惧淇℃伅
--
Gitblit v1.8.0