wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 09292e061a3a491ce9a656e07354d815c03a79dd
TangShanKaiPing
wanggang 6 years ago
parent 1bb1878fe5
commit dd22e7f417
6 changed files with 102 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
projects/IoT/IoTServices/FBeeService/Controllers/IRController.cs
Unescape View File

@ -7,11 +7,11 @@ using System;
namespace FBeeService.Controllers
{
[SwaggerTag("红外转发器")]
public class IRController : BaseDeviceController
public class IrController : BaseDeviceController
{
private readonly DeviceService _deviceService;
public IRController(IServiceProvider applicationServices, DeviceService deviceService) : base(applicationServices)
public IrController(IServiceProvider applicationServices, DeviceService deviceService) : base(applicationServices)
{
this._deviceService = deviceService;
}

4
projects/IoT/IoTServices/FBeeService/Infrastructure/ClientService.cs
Unescape View File

@ -46,7 +46,7 @@ namespace FBeeService
try
{
Console.WriteLine("send device info to server");
this.Connection.SendAsync("ClientToServer", "UpdateDevice", deviceInfo.ToJson());
this.Connection.SendAsync("ClientToServer", "UpdateDeviceInfo", deviceInfo.ToJson(), null);
}
catch (Exception ex)
{
@ -62,7 +62,7 @@ namespace FBeeService
try
{
Console.WriteLine("send device to server");
this.Connection.SendAsync("ClientToServer", "UpdateDevice", device.ToJson());
this.Connection.SendAsync("ClientToServer", "UpdateDevice", device.ToJson(), null);
}
catch (Exception ex)
{

2
projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
Unescape View File

@ -494,7 +494,7 @@ namespace FBeeService
{
deviceInfo.ApiJson = this.GetApiJson("/ColorLight/");
}
else if (deviceName == "调色灯")
else if (deviceName == "红外转发器")
{
deviceInfo.ApiJson = this.GetApiJson("/Ir/");
}

2
projects/IoT/IoTServices/FBeeService/Startup.cs
Unescape View File

@ -24,7 +24,7 @@ namespace FBeeService
{
base.Configure(app, env, loggerFactory);
app.ApplicationServices.GetService<DeviceService>().Start();
app.ApplicationServices.GetService<ClientService>().Connect();
app.ApplicationServices.GetService<ClientService>().Start();
}
}
}

1
projects/IoTCenter/IoTCenter.csproj
Unescape View File

@ -7,6 +7,7 @@
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.3" />
<PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.1" />
</ItemGroup>
<ItemGroup>

145
projects/IoTCenter/Services/PageHub.cs
Unescape View File

@ -3,6 +3,7 @@ using Infrastructure.Data;
using Infrastructure.Extensions;
using Infrastructure.Web.SignalR;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Readers;
using System;
using System.Linq;
@ -19,13 +20,13 @@ namespace IoTCenter.Services
public override void ClientToServer(string method, string message, string connectionId)
{
if (method == "UpdateDevice")
if (method == "UpdateDeviceInfo")
{
this.UpdateDevice(message);
this.UpdateDeviceInfo(message);
}
else if (method == "UpdateDeviceInfo")
else if (method == "UpdateDevice")
{
this.UpdateDeviceInfo(message);
this.UpdateDevice(message);
}
else if (message == "ApiCallback")
{
@ -33,65 +34,64 @@ namespace IoTCenter.Services
}
}
private void UpdateDevice(string message)
private void UpdateDeviceInfo(string message)
{
var newDevice = message.FromJson<Device>();
var newDeviceInfo = message.FromJson<DeviceInfo>();
using (var scope = this._applicationService.CreateScope())
{
var deviceInfoRepo = scope.ServiceProvider.GetService<IRepository<DeviceInfo>>();
var deviceInfo = deviceInfoRepo.Table().FirstOrDefault(o => o.Number == newDevice.InfoNumber);
var deviceInfo = deviceInfoRepo.Table().FirstOrDefault(o => o.Number == newDeviceInfo.Number);
if (deviceInfo == null)
{
deviceInfo = new DeviceInfo
{
Name = newDevice.Name,
Number = newDevice.InfoNumber
};
deviceInfo = new DeviceInfo().From(newDeviceInfo);
deviceInfoRepo.Add(deviceInfo);
deviceInfoRepo.SaveChanges();
}
var nodeRepo = scope.ServiceProvider.GetService<IRepository<Node>>();
var node = nodeRepo.Table().FirstOrDefault(o => o.Number == newDevice.NodeNumber);
if (node == null)
{
node = new Node
if (!string.IsNullOrEmpty(deviceInfo.ApiJson))
{
Number = newDevice.NodeNumber,
Name = newDevice.NodeNumber
};
nodeRepo.Add(node);
nodeRepo.SaveChanges();
}
var deviceRepo = scope.ServiceProvider.GetService<IRepository<Device>>();
var device = deviceRepo.Table().FirstOrDefault(o => o.Number == newDevice.Number);
if (device == null)
{
device = new Device
{
};
this.UpdateApi(deviceInfo);
}
deviceInfoRepo.SaveChanges();
}
}
Console.WriteLine(message);
}
private void UpdateDeviceInfo(string message)
private void UpdateDevice(string message)
{
var newDeviceInfo = message.FromJson<Device>();
using (var scope = this._applicationService.CreateScope())
{
var deviceInfoRepo = scope.ServiceProvider.GetService<IRepository<DeviceInfo>>();
var deviceInfo = deviceInfoRepo.Table().FirstOrDefault(o => o.Number == newDeviceInfo.InfoNumber);
if (deviceInfo == null)
{
deviceInfo = new DeviceInfo
{
//Name = newDevice.Name,
//Number = newDevice.InfoNumber
};
deviceInfoRepo.Add(deviceInfo);
deviceInfoRepo.SaveChanges();
}
}
//var newDevice = message.FromJson<Device>();
//using (var scope = this._applicationService.CreateScope())
//{
// var deviceInfoRepo = scope.ServiceProvider.GetService<IRepository<DeviceInfo>>();
// var deviceInfo = deviceInfoRepo.Table().FirstOrDefault(o => o.Number == newDevice.InfoNumber);
// if (deviceInfo == null)
// {
// deviceInfo = new DeviceInfo
// {
// Name = newDevice.Name,
// Number = newDevice.InfoNumber
// };
// deviceInfoRepo.Add(deviceInfo);
// deviceInfoRepo.SaveChanges();
// }
// var nodeRepo = scope.ServiceProvider.GetService<IRepository<Node>>();
// var node = nodeRepo.Table().FirstOrDefault(o => o.Number == newDevice.NodeNumber);
// if (node == null)
// {
// node = new Node
// {
// Number = newDevice.NodeNumber,
// Name = newDevice.NodeNumber
// };
// nodeRepo.Add(node);
// nodeRepo.SaveChanges();
// }
// var deviceRepo = scope.ServiceProvider.GetService<IRepository<Device>>();
// var device = deviceRepo.Table().FirstOrDefault(o => o.Number == newDevice.Number);
// if (device == null)
// {
// device = new Device
// {
// };
// }
//}
}
public void ApiCallback(string message, string connectionId)
@ -101,5 +101,50 @@ namespace IoTCenter.Services
this.ServerToClient(connectionId, "ApiCallback", message);
}
}
private void UpdateApi(DeviceInfo deviceInfo)
{
try
{
var reader = new OpenApiStringReader(new OpenApiReaderSettings { }).Read(deviceInfo.ApiJson, out OpenApiDiagnostic diagnostic);
foreach (var path in reader.Paths)
{
foreach (var operation in path.Value.Operations)
{
if (!deviceInfo.Apis.Any(o => o.Name == operation.Value.Summary))
{
var postion = path.Key.LastIndexOf('/') + 1;
var api = new Api
{
Path = path.Key.Substring(0, postion),
Command = path.Key.Substring(postion),
Name = operation.Value.Summary,
Method = operation.Key.ToString()
};
deviceInfo.Apis.Add(api);
foreach (var parameter in operation.Value.Parameters)
{
if (!api.Parameters.Any(o => o.Name == parameter.Name))
{
api.Parameters.Add(new Parameter
{
Name = parameter.Name,
Description = parameter.Description,
Required = parameter.Required,
Type = parameter.Schema.Type,
Minimum = parameter.Schema.Minimum?.ToString(),
Maxinum = parameter.Schema.Maximum?.ToString()
});
}
}
}
}
}
}
catch (Exception ex)
{
ex.PrintStack();
}
}
}
}
Write Preview
Loading…
Cancel
Save