From e3e5b224ff6576e0266e63728dff5870d7c8877d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 07 十一月 2023 09:46:55 +0800
Subject: [PATCH] 设备信息增加设备名称字段
---
nsq/msg_handler.go | 4 +++-
model/common/common.go | 3 ++-
model/device.go | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index c84e16d..628054e 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
}
diff --git a/model/device.go b/model/device.go
index a4f8edf..29a6a8d 100644
--- a/model/device.go
+++ b/model/device.go
@@ -12,10 +12,11 @@
Device struct {
gorm.Model
DeviceID string `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //璁惧缂栧彿
+ DeviceName string `gorm:"column:device_name;type:varchar(255);not null" json:"deviceName"` //璁惧鍚嶇О
ExtChannelAmount int `gorm:"type:tinyint;default:0" json:"extChannelAmount"`
Procedures string `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedures"` //璁惧鏀寔鐨勫伐搴忥紝鐢ㄩ�楀彿鍒嗛殧
DeviceMac string `gorm:"type:varchar(255);" json:"deviceMac"` //缁戝畾鐨勫伐鎺ф満璁惧ID
- ProceduresArr []string `gorm:"-" json:"procedureAdd"` //璁惧鏀寔鐨勫伐搴忓垏鐗�
+ ProceduresArr []string `gorm:"-" json:"ProceduresArr"` //璁惧鏀寔鐨勫伐搴忓垏鐗�
}
DeviceSearch struct {
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index dea2aca..82d2118 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -268,6 +268,7 @@
Procedures: strings.Join(procedures, ","),
ExtChannelAmount: msg.ExtChannelAmount,
DeviceMac: msg.DeviceMac,
+ DeviceName: msg.DeviceName,
}
oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
@@ -275,7 +276,8 @@
err = model.NewDeviceSearch().Create(deviceRecord)
} else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount ||
oldRecord.Procedures != deviceRecord.Procedures ||
- oldRecord.DeviceMac != deviceRecord.DeviceMac {
+ oldRecord.DeviceMac != deviceRecord.DeviceMac ||
+ oldRecord.DeviceName != deviceRecord.DeviceName {
err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
}
--
Gitblit v1.8.0