|
|
|
@ -5,6 +5,7 @@ using Infrastructure.Extensions;
|
|
|
|
using Infrastructure.Web.SignalR;
|
|
|
|
using Infrastructure.Web.SignalR;
|
|
|
|
using IoT.Shared.Services;
|
|
|
|
using IoT.Shared.Services;
|
|
|
|
using Microsoft.AspNetCore.SignalR;
|
|
|
|
using Microsoft.AspNetCore.SignalR;
|
|
|
|
|
|
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
using Microsoft.Extensions.Configuration;
|
|
|
|
using Microsoft.Extensions.Configuration;
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
@ -143,7 +144,8 @@ namespace IoTCenter.Services
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var model = message.FromJson<EditNodeModel>();
|
|
|
|
var model = message.FromJson<EditNodeModel>();
|
|
|
|
this._dataService.Edit<Node, EditNodeModel>(model);
|
|
|
|
this._dataService.Edit<Node, EditNodeModel>(model);
|
|
|
|
this.Clients.Group("page").SendAsync(method, message);
|
|
|
|
//
|
|
|
|
|
|
|
|
this.Clients.Group("page").SendAsync("UpdateNode", model.ToJson());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (method == Methods.EditDeviceResponse)
|
|
|
|
else if (method == Methods.EditDeviceResponse)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -155,10 +157,13 @@ namespace IoTCenter.Services
|
|
|
|
var model = message.FromJson<EditDeviceModel>();
|
|
|
|
var model = message.FromJson<EditDeviceModel>();
|
|
|
|
this._dataService.Delete<Device, EditDeviceModel>(model);
|
|
|
|
this._dataService.Delete<Device, EditDeviceModel>(model);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (method == Methods.EditDataResponse)
|
|
|
|
else if (method == Methods.EditDataResponse)//后台编辑或设备上报
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var model = message.FromJson<EditDataModel>();
|
|
|
|
var model = message.FromJson<EditDataModel>();
|
|
|
|
this._dataService.Edit<Data, EditDataModel>(model);
|
|
|
|
this._dataService.Edit<Data, EditDataModel>(model);
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
var device = _deviceRepo.ReadOnlyTable().Include(o => o.Data).Where(o => o.Id == model.DeviceId).FirstOrDefault();
|
|
|
|
|
|
|
|
this.Clients.Group("page").SendAsync("UpdateDevice", device.ToJson());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (method == Methods.DeleteDataResponse)
|
|
|
|
else if (method == Methods.DeleteDataResponse)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -213,27 +218,6 @@ namespace IoTCenter.Services
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
|
|
|
|
|
|
|
|
private void DeleteData(string message)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine("iot center> receive delete data message");
|
|
|
|
|
|
|
|
var model = message.FromJson<EditDataModel>();
|
|
|
|
|
|
|
|
var data = _dataRepo.Table().FirstOrDefault(o => o.Device.Id == model.DeviceId && o.Id == model.Id);
|
|
|
|
|
|
|
|
if (data != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
_dataRepo.Delete(data);
|
|
|
|
|
|
|
|
_dataRepo.SaveChanges();
|
|
|
|
|
|
|
|
this.Clients.Group("page").SendAsync("DeleteData", message);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ex.PrintStack();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
|
|
|
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
|
|
|
|
private void UpdateScene(string message)
|
|
|
|
private void UpdateScene(string message)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
