1.0.0.20102103

Former-commit-id: 01a6358f2849cd23c24321c181c5618e6e062712
Former-commit-id: 29c25d65302d740fe0ce804863192b2727cad0af
TSXN
wanggang 5 years ago
parent d51393709b
commit 9777977565

@ -65,8 +65,8 @@ namespace IoTCenter.Api.Controllers
model.Devices = this._deviceRepo.ReadOnlyTable()
.Where(o => o.Product.Id == model.Id)
.WhereIf(!string.IsNullOrWhiteSpace(organNumber), o => o.Node.OrganNodes.Any(o => o.Organ.Number == organNumber))
.Include(o=>o.Node)
.Include(o=>o.Data)
.Include(o => o.Node)
.Include(o => o.Data)
.ToList();
return Ok(model);
}
@ -75,22 +75,6 @@ namespace IoTCenter.Api.Controllers
ex.PrintStack();
return Problem(ex.Message);
}
try
{
var model = this._nodeRepo.ReadOnlyTable()
.WhereIf(!string.IsNullOrWhiteSpace(organNumber), o => o.OrganNodes.Any(o => o.Organ.Number == organNumber))
.Where(o => o.Devices.Any(o => o.Product.Number == number))
.Include(o => o.Devices)
.ThenInclude(o => o.Data)
.SelectMany(o => o.Devices)
.OrderBy(o => o.NodeId).ToList();
return Ok(model);
}
catch (Exception ex)
{
ex.PrintStack();
return Problem(ex.Message);
}
}
}
}

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.20102401")]
[assembly: AssemblyInformationalVersion("1.0.0.20102601")]
Loading…
Cancel
Save