From dd75b36c03049be232a94d97eff1c4a5cc751fb5 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 31 十月 2023 22:08:39 +0800 Subject: [PATCH] 支持设备ID切换 --- model/device.go | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/model/device.go b/model/device.go index 2919584..a4f8edf 100644 --- a/model/device.go +++ b/model/device.go @@ -14,6 +14,7 @@ DeviceID string `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //璁惧缂栧彿 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"` //璁惧鏀寔鐨勫伐搴忓垏鐗� } @@ -65,6 +66,11 @@ return slf } +func (slf *DeviceSearch) SetDeviceMac(deviceMac string) *DeviceSearch { + slf.DeviceMac = deviceMac + return slf +} + func (slf *DeviceSearch) SetDeviceIds(deviceIds []string) *DeviceSearch { slf.DeviceIDs = deviceIds return slf @@ -81,6 +87,10 @@ db = db.Where("device_id = ?", slf.DeviceID) } + if slf.DeviceMac != "" { + db = db.Where("device_mac = ?", slf.DeviceMac) + } + if len(slf.DeviceIDs) != 0 { db = db.Where("device_id in (?)", slf.DeviceIDs) } -- Gitblit v1.8.0