|
|
|
@ -8,7 +8,6 @@ using Microsoft.EntityFrameworkCore;
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.ComponentModel.DataAnnotations;
|
|
|
|
|
using System.Globalization;
|
|
|
|
|
using System.IO;
|
|
|
|
|
using System.Linq;
|
|
|
|
@ -139,7 +138,6 @@ namespace IoTNode.DeviceServices.LiChuang
|
|
|
|
|
{
|
|
|
|
|
ex.PrintStack();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -355,12 +353,12 @@ namespace IoTNode.DeviceServices.LiChuang
|
|
|
|
|
Ip = ip,
|
|
|
|
|
IoTGatewayId = iotNode.Id,
|
|
|
|
|
IoTProductId = product.Id,
|
|
|
|
|
IsOnline=true,
|
|
|
|
|
IsOnline = true,
|
|
|
|
|
};
|
|
|
|
|
deviceRepo.Add(device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
this.UpdateIoTData(device.Id,DataKeys.Hardware, hardware);
|
|
|
|
|
this.UpdateIoTData(device.Id,DataKeys.Period, period);
|
|
|
|
|
this.UpdateIoTData(device.Id, DataKeys.Hardware, hardware);
|
|
|
|
|
this.UpdateIoTData(device.Id, DataKeys.Period, period);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
@ -490,7 +488,7 @@ namespace IoTNode.DeviceServices.LiChuang
|
|
|
|
|
var dataKey = GetKey(equipidex);
|
|
|
|
|
var unit = this.GetUnit(name)?.ToString();
|
|
|
|
|
var dataName = $"{dataKey.GetDisplayName():unit}";
|
|
|
|
|
this.UpdateIoTData(deviceId.Value, dataKey, value,name:dataName,unit:unit);
|
|
|
|
|
this.UpdateIoTData(deviceId.Value, dataKey, value, name: dataName, unit: unit);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -656,4 +654,4 @@ namespace IoTNode.DeviceServices.LiChuang
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|