|
@@ -520,11 +520,8 @@ func (r *Registry) CreateDeviceNetConfig(args *models.DeviceNetConfig, reply *rp
|
|
|
// CheckDeviceNetConfig 检验设备配网是否成功
|
|
|
func (r *Registry) CheckDeviceNetConfig(args *rpcs.ArgsCheckDeviceNetConfig, reply *rpcs.ReplyCheckDeviceNetConfig) error {
|
|
|
if db, err := getDB(); err == nil {
|
|
|
- where := &models.DeviceNetConfig{}
|
|
|
- where.MD5 = args.Md5
|
|
|
- where.DeviceIdentifier = args.DeviceCode
|
|
|
var count int
|
|
|
- err = db.Table("device_net_config").Where(where).Count(&count).Error
|
|
|
+ err = db.Table("device_net_config").Where("device_code = ? and md5 = ?", args.DeviceCode, args.Md5).Count(&count).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|