|
@@ -192,6 +192,8 @@ namespace DataVAPI.Controllers |
|
|
int i = 0; |
|
|
int i = 0; |
|
|
string namesy = string.Empty; |
|
|
string namesy = string.Empty; |
|
|
string devid = string.Empty; |
|
|
string devid = string.Empty; |
|
|
|
|
|
string devname = string.Empty; |
|
|
|
|
|
|
|
|
int ClientId = item.Key; |
|
|
int ClientId = item.Key; |
|
|
List<object> aly_data = new List<object>(); |
|
|
List<object> aly_data = new List<object>(); |
|
|
if (retdata.ContainsKey(ClientId))//查询店铺下面所有设备集合 |
|
|
if (retdata.ContainsKey(ClientId))//查询店铺下面所有设备集合 |
|
@@ -220,6 +222,7 @@ namespace DataVAPI.Controllers |
|
|
#endregion |
|
|
#endregion |
|
|
if (i == 0) { |
|
|
if (i == 0) { |
|
|
devid = p.DeviceID.ToString(); |
|
|
devid = p.DeviceID.ToString(); |
|
|
|
|
|
devname=p.DeviceName.ToString(); |
|
|
namesy = dev != null ? dev.devicename : "空"; |
|
|
namesy = dev != null ? dev.devicename : "空"; |
|
|
i++; |
|
|
i++; |
|
|
} |
|
|
} |
|
@@ -240,7 +243,8 @@ namespace DataVAPI.Controllers |
|
|
ClientId = item.Value?[0]?.ClientId.ToString(), |
|
|
ClientId = item.Value?[0]?.ClientId.ToString(), |
|
|
DeviceList= aly_data, |
|
|
DeviceList= aly_data, |
|
|
FirstName = namesy, |
|
|
FirstName = namesy, |
|
|
FirstDeviceID= devid |
|
|
|
|
|
|
|
|
FirstDeviceID= devid, |
|
|
|
|
|
FirstDeviceName= devname |
|
|
}; |
|
|
}; |
|
|
list.Add(_data); |
|
|
list.Add(_data); |
|
|
} |
|
|
} |
|
|