From 578b74f9de4b96e88e2fddb726c7c6f78162b033 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 14:34:23 +0800
Subject: [PATCH] 启停生产者
---
model/common/common.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index 9df61af..f92ae17 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -107,11 +107,8 @@
}
ResponseProcessParams struct {
Number string `json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `json:"orderId"` //璁㈠崟id
Product string `json:"product"` //浜у搧鍚嶇О
Procedure string `json:"procedure"` //宸ュ簭
- WorkOrder string `json:"workOrder"` //宸ュ崟
- Device string `json:"device"` //璁惧
Params string `json:"params"`
ParamsMap map[string]interface{} `json:"paramsMap"`
DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
@@ -127,10 +124,13 @@
IsFinish bool //鏄惁瀹屾垚
}
-type Device struct {
+// DeviceMsg 涓嬪彂鍒扮粓绔殑璁惧淇℃伅
+type DeviceMsg struct {
ID string `gorm:"comment:涓婚敭ID;primaryKey;type:varchar(191);" json:"id"`
DeviceProcedureAttr []*DeviceProcedureAttr `json:"deviceProcedureAttr"` // 璁惧宸ュ簭灞炴�у垪琛�
ExtChannelAmount int `gorm:"type:tinyint;comment:棰濆鐨勯�氶亾鏁伴噺;default:0;" json:"extChannelAmount"`
+ PlcAddressList []*PlcAddress
+ PlcConfig *PlcConfig
}
type DeviceProcedureAttr struct {
ProcedureID string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
@@ -142,6 +142,7 @@
const (
PullDataTypeProcessModel = "process_model"
+ PullDataTypeDevice = "device"
)
// MsgPullDataRequest 鎷夊彇浜戠鏁版嵁
--
Gitblit v1.8.0