diff --git a/labs/Teacher/docs/西宁市城中区教师信息管理V1.0测试申请单.docx b/labs/Teacher/docs/西宁市城中区教师信息管理V1.0测试申请单.docx index 2b196fc0..d033dcd4 100644 Binary files a/labs/Teacher/docs/西宁市城中区教师信息管理V1.0测试申请单.docx and b/labs/Teacher/docs/西宁市城中区教师信息管理V1.0测试申请单.docx differ diff --git a/projects/Infrastructure/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Views/Shared/_Layout.cshtml index 165f4102..350935c8 100644 --- a/projects/Infrastructure/Views/Shared/_Layout.cshtml +++ b/projects/Infrastructure/Views/Shared/_Layout.cshtml @@ -14,6 +14,7 @@ + @@ -110,7 +111,6 @@
-

加载中

diff --git a/projects/IoTNode/Areas/IoTCenter/Controllers/IoTDataController.cs b/projects/IoTNode/Areas/IoTCenter/Controllers/IoTDataController.cs index 7c645e2c..b7187283 100644 --- a/projects/IoTNode/Areas/IoTCenter/Controllers/IoTDataController.cs +++ b/projects/IoTNode/Areas/IoTCenter/Controllers/IoTDataController.cs @@ -73,7 +73,10 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls public override void ToEditModel(IoTData entity, EditIoTDataModel model) { - model.IoTGatewayId = entity?.IoTDevice?.IoTGatewayId; + if(entity!=null) + { + model.IoTGatewayId = entity?.IoTDevice?.IoTGatewayId; + } ViewData.SelectList(o => model.IoTProductId, () => this._ajax.GetIoTProduct(model.IoTProductId).SelectList()); ViewData.SelectList(o => model.IoTGatewayId, () => this._ajax.GetIoTGateway(model.IoTGatewayId).SelectList()); if (model.IoTGatewayId.HasValue) diff --git a/projects/IoTNode/Areas/IoTCenter/Controllers/IoTProductController.cs b/projects/IoTNode/Areas/IoTCenter/Controllers/IoTProductController.cs index e9cdd483..772d3e96 100644 --- a/projects/IoTNode/Areas/IoTCenter/Controllers/IoTProductController.cs +++ b/projects/IoTNode/Areas/IoTCenter/Controllers/IoTProductController.cs @@ -23,7 +23,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls public override IQueryable Query(PagedListModel model, IQueryable query) { - return base.Query(model, query) + return query .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number)) .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path)) diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs index a2e4e659..57935b8e 100644 --- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs @@ -575,8 +575,17 @@ namespace IoTNode.DeviceServices.FBee tempBytes.AddRange(props[0x00]); tempBytes.Add(0x00); tempBytes.Add(0x00); - var electricity = BitConverter.ToInt64(tempBytes.ToArray()) / 1000f; - this.UpdateIoTData(device.Id, DataKeys.Electricity, electricity); + if (tempBytes.Count == 8) + { + var multiplier = this.GetIoTDataValue(device.Id, DataKeys.ElectricityMultiplier); + var divisor = this.GetIoTDataValue(device.Id, DataKeys.ElectricityDivisor); + if (!string.IsNullOrEmpty(multiplier) && !string.IsNullOrEmpty(divisor)) + { + var electricity = BitConverter.ToInt64(tempBytes.ToArray()); + var value = electricity * Convert.ToInt16(multiplier) / Convert.ToSingle(divisor); + this.UpdateIoTData(device.Id, DataKeys.Electricity, value); + } + } } } else if (clusterId == ClusterId.doorlock) diff --git a/projects/IoTNode/Views/Shared/_Menu.cshtml b/projects/IoTNode/Views/Shared/_Menu.cshtml index ab4de737..e056d201 100644 --- a/projects/IoTNode/Views/Shared/_Menu.cshtml +++ b/projects/IoTNode/Views/Shared/_Menu.cshtml @@ -1,5 +1,4 @@