|
@@ -225,9 +225,9 @@ namespace DataVAPI.Controllers |
|
|
} |
|
|
} |
|
|
aly_data.Add( new |
|
|
aly_data.Add( new |
|
|
{ |
|
|
{ |
|
|
ClientId = p.ClientId, |
|
|
|
|
|
|
|
|
ClientId = p.ClientId.ToString(), |
|
|
ClientName = p.ClientName, |
|
|
ClientName = p.ClientName, |
|
|
DeviceID = p.DeviceID, |
|
|
|
|
|
|
|
|
DeviceID = p.DeviceID.ToString(), |
|
|
DeviceName = p.DeviceName, |
|
|
DeviceName = p.DeviceName, |
|
|
DeviceTypeKey = p.DeviceTypeKey, |
|
|
DeviceTypeKey = p.DeviceTypeKey, |
|
|
AlyName = dev != null ? dev.devicename : "", |
|
|
AlyName = dev != null ? dev.devicename : "", |
|
@@ -237,7 +237,7 @@ namespace DataVAPI.Controllers |
|
|
object _data = new |
|
|
object _data = new |
|
|
{ |
|
|
{ |
|
|
Name = item.Value?[0]?.ClientName, |
|
|
Name = item.Value?[0]?.ClientName, |
|
|
ClientId = item.Value?[0]?.ClientId, |
|
|
|
|
|
|
|
|
ClientId = item.Value?[0]?.ClientId.ToString(), |
|
|
DeviceList= aly_data, |
|
|
DeviceList= aly_data, |
|
|
FirstName = namesy, |
|
|
FirstName = namesy, |
|
|
FirstDeviceID= devid |
|
|
FirstDeviceID= devid |
|
@@ -291,9 +291,9 @@ namespace DataVAPI.Controllers |
|
|
}); |
|
|
}); |
|
|
object obj = new |
|
|
object obj = new |
|
|
{ |
|
|
{ |
|
|
ClientId= p.ClientId, |
|
|
|
|
|
|
|
|
ClientId= p.ClientId.ToString(), |
|
|
ClientName= p.ClientName, |
|
|
ClientName= p.ClientName, |
|
|
DeviceID= p.DeviceID, |
|
|
|
|
|
|
|
|
DeviceID= p.DeviceID.ToString(), |
|
|
DeviceName= p.DeviceName, |
|
|
DeviceName= p.DeviceName, |
|
|
DeviceTypeKey = p.DeviceTypeKey, |
|
|
DeviceTypeKey = p.DeviceTypeKey, |
|
|
AlyName= dev!=null?dev.devicename: "", |
|
|
AlyName= dev!=null?dev.devicename: "", |
|
|