ciro_xu/iotgateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ccliushou/iotgateway

Browse Source
This commit is contained in:
liushoushan_notebook 2022-06-30 14:34:01 +08:00
commit 5d5d59ce3d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
View File

@ -31,7 +31,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceConfigVMs
.GetSelectListItems(Wtm, y => y.DeviceName); .GetSelectListItems(Wtm, y => y.DeviceName);
if (Entity.DeviceId != null) if (Entity.DeviceId != null)
{ {
if (Entity.EnumInfo != null) //if (Entity.EnumInfo != null)
if (!string.IsNullOrEmpty( Entity.EnumInfo))
{ {
AllTypes = new List<ComboSelectListItem>(); AllTypes = new List<ComboSelectListItem>();
var EnumInfos = JsonSerializer.Deserialize<Dictionary<string, int>>(Entity.EnumInfo); var EnumInfos = JsonSerializer.Deserialize<Dictionary<string, int>>(Entity.EnumInfo);

5
Plugins/Plugin/MyMqttClient.cs
View File

@ -481,6 +481,11 @@ namespace Plugin
case IoTPlatformType.IoTSharp: case IoTPlatformType.IoTSharp:
foreach (var payload in SendModel[device.DeviceName]) foreach (var payload in SendModel[device.DeviceName])
{ {
//if (payload.Values.ContainsKey("ts"))
// payload.Values["ts"] = payload.TS;
//else
// payload.Values.Add("ts",payload.TS);
UploadISTelemetryDataAsync(device.DeviceName, payload.Values); UploadISTelemetryDataAsync(device.DeviceName, payload.Values);
} }
break; break;