From 71b0e418839dda386043fb6cad1ec335bcdc06c6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 09 十一月 2023 14:08:21 +0800
Subject: [PATCH] 增加设置是否跳过设置工艺参数接口
---
model/common/common.go | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index 5eafc0d..628054e 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -51,6 +51,7 @@
OutputMaterials []*ProcedureMaterial `json:"outputMaterials"` // 杈撳嚭鐗╂枡鍒楄〃
Workers []*ProcedureWorker `json:"workers"` // 浜哄憳鍒楄〃
AllProcedureNames []string `json:"allProcedureNames"` // 鎵�灞炲伐鍗曞伐搴忓垪琛�
+ Channel int32 `json:"channel"` //閫氶亾搴忓彿
}
DeliverScheduleTask struct {
@@ -68,25 +69,28 @@
KeyData []byte
AddressData []byte
DeviceId string
- PlcAddressList []*PlcAddress
- PlcConfig PlcConfig
+ PlcAddressList []*PlcAddress //plc 瀹屾垚閲忥紝鎬婚噺锛� 璇诲啓鍦板潃
+ PlcConfig PlcConfig //鐢ㄧ綉鍙ｈ繕鏄鍙ｄ互鍙婄綉鍙p port
}
PlcConfig struct {
- Brand string `gorm:"type:varchar(191);comment:PLC鍝佺墝" json:"brand"`
- Method constvar.PlcMethod `gorm:"type:varchar(191);comment:鎺ュ彛鏂瑰紡" json:"method"`
- Address string `gorm:"type:varchar(191);comment:PLC鍦板潃" json:"address"` //plc ip鍦板潃锛� method = modbusTCP鐢�
- Port int `gorm:"type:int(11);comment:绔彛" json:"port"` //plc 绔彛鍙凤紝 method = modbusTCP鐢�
- BaudRate int `gorm:"type:int(11);comment:娉㈢壒鐜�" json:"baudRate"` //涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
- SerialName string `gorm:"type:int(11);comment:涓插彛鍚嶇О" json:"serialName"` //涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
- IsOpen bool `gorm:"type:tinyint(1);comment:鏄惁寮�鍚�" json:"isOpen"`
- Detail string `gorm:"type:varchar(2048);comment:鏁版嵁璇︽儏" json:"-"`
+ Brand string `gorm:"type:varchar(191)" json:"brand"` //comment:PLC鍝佺墝
+ Method constvar.PlcMethod `gorm:"type:varchar(191)" json:"method"` //comment:鎺ュ彛鏂瑰紡
+ Address string `gorm:"type:varchar(191)" json:"address"` //plc ip鍦板潃锛� method = modbusTCP鐢�
+ Port int `gorm:"type:int(11)" json:"port"` //plc 绔彛鍙凤紝 method = modbusTCP鐢�
+ BaudRate int `gorm:"type:int(11)" json:"baudRate"` //涓插彛娉㈢壒鐜囷紝 method = serial鎴杕odbusRTU 鏃剁敤
+ SerialName string `gorm:"type:int(11)" json:"serialName"` //涓插彛鍚嶇О锛宮ethod = serial鎴杕odbusRTU 鏃剁敤
+ DataBit int `gorm:"type:int(11)" json:"dataBit"` //鏁版嵁浣嶏紝method = modbusRTU 鐢�
+ StopBit int `gorm:"type:int(11)" json:"stopBit"` //鍋滄浣嶏紝method = modbusRTU 鐢�
+ Parity constvar.Parity `gorm:"type:int(11)" json:"parity"` //鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
+ IsOpen bool `gorm:"type:tinyint(1)" json:"isOpen"`
+ Detail string `gorm:"type:varchar(2048)" json:"-"`
Details []*PlcAddress `gorm:"-" json:"details"`
}
PlcAddress struct {
DeviceID string `json:"deviceID"` // 璁惧id
- Position int `json:"position"` // 鐢熶骇浣嶇疆锛屼竴涓満鍣ㄥ彲鑳芥湁澶氫釜鏈轰綅锛岄渶瑕佸垎鍒厤缃畃lc鍦板潃
+ Channel int `json:"channel"` // 鐢熶骇閫氶亾on锛屼竴涓満鍣ㄥ彲鑳芥湁澶氫釜鏈轰綅锛岄渶瑕佸垎鍒厤缃畃lc鍦板潃
StartAddress int `json:"startAddress"` // 鏁版嵁璧峰鍦板潃
Length int `json:"length"` // 鏁版嵁闀垮害
Type string `json:"type"` // 鏁版嵁绫诲瀷
@@ -106,11 +110,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娑堟伅
@@ -125,3 +126,45 @@
IsProcessing bool //鏄惁澶勭悊涓�
IsFinish bool //鏄惁瀹屾垚
}
+
+// 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"`
+ DeviceName string `json:"deviceName"`
+ DeviceMac string `json:"deviceMac"`
+ PlcAddressList []*PlcAddress
+ PlcConfig *PlcConfig
+}
+type DeviceProcedureAttr struct {
+ ProcedureID string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
+ ProcedureName string `gorm:"type:varchar(191);comment:宸ュ簭鍚嶇О" json:"procedureName"`
+ DeviceID string `gorm:"index;type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
+}
+
+type PullDataType string
+
+const (
+ PullDataTypeProcessModel = "process_model"
+ PullDataTypeDevice = "device"
+ PullDataTypeProcessModelPlcAddress = "process_model_plc_address"
+)
+
+// MsgPullDataRequest 鎷夊彇浜戠鏁版嵁
+type MsgPullDataRequest struct {
+ DataType PullDataType `json:"dataType"` //瑕佹媺鍙栫殑鏁版嵁绫诲瀷
+}
+
+type MsgPullDataResponse struct {
+ DataType PullDataType `json:"dataType"` //瑕佹媺鍙栫殑鏁版嵁绫诲瀷
+ Data interface{} //杩斿洖鐨勬暟鎹�
+}
+
+type RTUConfig struct {
+ BaudRate int `json:"baudRate"` //涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
+ SerialName string `json:"serialName"` //涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
+ DataBit int `gorm:"type:int(11)" json:"dataBit"` //鏁版嵁浣嶏紝method = modbusRTU 鐢�
+ StopBit int `gorm:"type:int(11)" json:"stopBit"` //鍋滄浣嶏紝method = modbusRTU 鐢�
+ Parity constvar.Parity `gorm:"type:int(11)" json:"parity"` //鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
+}
--
Gitblit v1.8.0