From 80c3bf9f605eddfab91bb72aee99172b0f09fb5a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 15:10:57 +0800
Subject: [PATCH] fix
---
model/common/common.go | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index 72326e7..e47b1fd 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -132,7 +132,8 @@
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"`
- DeviceMac string `gorm:"type:varchar(191);comment:璁惧MAC" json:"deviceMac"`
+ DeviceName string `json:"deviceName"`
+ DeviceMac string `json:"deviceMac"`
PlcAddressList []*PlcAddress
PlcConfig *PlcConfig
}
@@ -145,8 +146,9 @@
type PullDataType string
const (
- PullDataTypeProcessModel = "process_model"
- PullDataTypeDevice = "device"
+ PullDataTypeProcessModel = "process_model"
+ PullDataTypeDevice = "device"
+ PullDataTypeProcessModelPlcAddress = "process_model_plc_address"
)
// MsgPullDataRequest 鎷夊彇浜戠鏁版嵁
@@ -166,3 +168,9 @@
StopBit int `gorm:"type:int(11)" json:"stopBit"` //鍋滄浣嶏紝method = modbusRTU 鐢�
Parity constvar.Parity `gorm:"type:int(11)" json:"parity"` //鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
}
+
+// MsgReportData 鏁版嵁涓婃姤
+type MsgReportData struct {
+ ReportType constvar.ReportType `json:"reportType"` //涓婃姤绫诲瀷
+ Content string `json:"Content"`
+}
--
Gitblit v1.8.0