update

Former-commit-id: ab537da368422aa24afd5df897037c851406efb8
Former-commit-id: 9e274e869576ccd5bafb4514232d9affc24fc897

projects/Infrastructure/Data/EfDbContext.cs

@@ -99,15 +99,15 @@ namespace Infrastructure.Data
                 }
                 if (entry.State == EntityState.Added)
                 {
-                    events.Add(Activator.CreateInstance(typeof(EntityInsertedEvent<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
+                    events.Add(Activator.CreateInstance(typeof(EntityInserted<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
                 }
                 else if (entry.State == EntityState.Modified)
                 {
-                    events.Add(Activator.CreateInstance(typeof(EntityUpdatedEvent<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
+                    events.Add(Activator.CreateInstance(typeof(EntityUpdated<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
                 }
                 else if (entry.State == EntityState.Deleted)
                 {
-                    events.Add(Activator.CreateInstance(typeof(EntityDeletedEvent<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
+                    events.Add(Activator.CreateInstance(typeof(EntityDeleted<>).MakeGenericType(entry.Entity.GetType()), entry.Entity));
                 }
                 this._logger.LogDebug($"{nameof(EfDbContext)}>{entity.GetType().Name}:{entry.State}");
             }

projects/Infrastructure/Events/EntityDeleted.cs

@@ -0,0 +1,9 @@
+namespace Infrastructure.Events
+{
+    public class EntityDeleted<T> : BaseEvent<T>
+    {
+        public EntityDeleted(T entity) : base(entity, nameof(EntityDeleted<T>))
+        {
+        }
+    }
+}

projects/Infrastructure/Events/EntityDeletedEvent.cs

@@ -1,9 +0,0 @@
-namespace Infrastructure.Events
-{
-    public class EntityDeletedEvent<T> : BaseEvent<T>
-    {
-        public EntityDeletedEvent(T entity) : base(entity, "EntityDeleted")
-        {
-        }
-    }
-}

projects/Infrastructure/Events/EntityInserted.cs

@@ -0,0 +1,9 @@
+namespace Infrastructure.Events
+{
+    public class EntityInserted<T> : BaseEvent<T>
+    {
+        public EntityInserted(T entity) : base(entity, nameof(EntityInserted<T>))
+        {
+        }
+    }
+}

projects/Infrastructure/Events/EntityInsertedEvent.cs

@@ -1,9 +0,0 @@
-namespace Infrastructure.Events
-{
-    public class EntityInsertedEvent<T> : BaseEvent<T>
-    {
-        public EntityInsertedEvent(T entity) : base(entity, "EntityInserted")
-        {
-        }
-    }
-}

projects/Infrastructure/Events/EntityUpdated.cs

@@ -0,0 +1,9 @@
+namespace Infrastructure.Events
+{
+    public class EntityUpdated<T> : BaseEvent<T>
+    {
+        public EntityUpdated(T entity) : base(entity, nameof(EntityUpdated<T>))
+        {
+        }
+    }
+}

projects/Infrastructure/Events/EntityUpdatedEvent.cs

@@ -1,9 +0,0 @@
-namespace Infrastructure.Events
-{
-    public class EntityUpdatedEvent<T> : BaseEvent<T>
-    {
-        public EntityUpdatedEvent(T entity) : base(entity, "EntityUpdated")
-        {
-        }
-    }
-}

projects/IoTNode/DeviceServices/BaseDeviceService.cs

@@ -18,6 +18,7 @@ using System.ComponentModel.DataAnnotations;
 using NJsonSchema;
 using System.Globalization;
 using Microsoft.EntityFrameworkCore;
+using Infrastructure.Events;
 
 namespace IoTNode.DeviceServices
 {
@@ -104,7 +105,7 @@ namespace IoTNode.DeviceServices
                     var response = httpClient.GetStringAsync(url).Result.FromJson<bool>();
                     if (!response)
                     {
-                        scope.ServiceProvider.GetRequiredService<IoTNodeClient>().ClientToServer($"{nameof(IoTProduct)}EntityUpdated", product, null);
+                        scope.ServiceProvider.GetRequiredService<IoTNodeClient>().ClientToServer($"{nameof(IoTProduct)}{nameof(EntityUpdated<IoTProduct>)}", product, null);
                     }
                 }
                 catch (Exception ex)

projects/IoTNode/Services/IoTNodeClient.cs

@@ -212,13 +212,13 @@ namespace IoT.Shared.Services
         public void OnConnected()
         {
             //上传网关
-            this.UpdateEntityIdList<IoTGateway>(null, $"{nameof(IoTGateway)}EntityUpdated");
+            this.UpdateEntityIdList<IoTGateway>(null, $"{nameof(IoTGateway)}{nameof(EntityUpdated<IoTGateway>)}");
 
             //上传产品
-            this.UpdateEntityIdList<IoTProduct>(null, $"{nameof(IoTProduct)}EntityUpdated");
+            this.UpdateEntityIdList<IoTProduct>(null, $"{nameof(IoTProduct)}{nameof(EntityUpdated<IoTProduct>)}");
 
             //上传设备Id列表、设备
-            this.UpdateEntityIdList<IoTDevice>(Methods.UpdateDeviceIdList, $"{nameof(IoTDevice)}EntityUpdated");
+            this.UpdateEntityIdList<IoTDevice>(Methods.UpdateDeviceIdList, $"{nameof(IoTDevice)}{nameof(EntityUpdated<IoTDevice>)}");
 
             //上传数据
             this.UpdateEntityIdList<IoTData>(null, $"{nameof(IoTData)}EntityUpdated", null, o => !o.Hidden);
@@ -258,13 +258,13 @@ namespace IoT.Shared.Services
                     dataService.Delete<IoTDevice, EditIoTDeviceModel>(model);
                     this.ClientToServer(method, model, null);
                 }
-                else if (method == $"{nameof(IoTData)}EntityInserted"|| method == $"{nameof(IoTData)}EntityUpdated")//服务端插入或更新数据
+                else if (method == $"{nameof(IoTData)}{nameof(EntityDeleted<IoTData>)}" || method == $"{nameof(IoTData)}{nameof(EntityUpdated<IoTData>)}")//服务端插入或更新数据
                 {
                     var model = message.FromJson<EditIoTDataModel>();
                     dataService.Edit<IoTData, EditIoTDataModel>(model);
                     this.ClientToServer(method, model, null);
                 }
-                else if (method == $"{nameof(IoTData)}EntityDeleted")//服务端删除数据
+                else if (method == $"{nameof(IoTData)}{nameof(EntityDeleted<IoTData>)}")//服务端删除数据
                 {
                     var model = message.FromJson<EditIoTDataModel>();
                     dataService.Delete<IoTData, EditIoTDataModel>(model);

projects/IoTNode/Services/IoTNodeEventHandler.cs

@@ -14,13 +14,13 @@ using System.Threading.Tasks;
 namespace IoTNode.Services
 {
     public class IoTNodeEventHandler :
-        IEventHander<EntityUpdatedEvent<Setting>>,
-        IEventHander<EntityInsertedEvent<IoTDevice>>,
-        IEventHander<EntityUpdatedEvent<IoTDevice>>,
-        IEventHander<EntityDeletedEvent<IoTDevice>>,
-        IEventHander<EntityInsertedEvent<IoTData>>,
-        IEventHander<EntityUpdatedEvent<IoTData>>,
-        IEventHander<EntityDeletedEvent<IoTData>>
+        IEventHander<EntityUpdated<Setting>>,
+        IEventHander<EntityInserted<IoTDevice>>,
+        IEventHander<EntityUpdated<IoTDevice>>,
+        IEventHander<EntityDeleted<IoTDevice>>,
+        IEventHander<EntityInserted<IoTData>>,
+        IEventHander<EntityUpdated<IoTData>>,
+        IEventHander<EntityDeleted<IoTData>>
     {
         private readonly ILogger<IoTNodeEventHandler> _logger;
 
@@ -42,7 +42,7 @@ namespace IoTNode.Services
             this._ioTNodeClient = ioTNodeClient;
         }
 
-        public void Handle(EntityUpdatedEvent<Setting> message)
+        public void Handle(EntityUpdated<Setting> message)
         {
             if (message.Data.Name == "stream.rtmp" || message.Data.Name == "ffmpeg.args")
             {
@@ -62,32 +62,32 @@ namespace IoTNode.Services
             }
         }
 
-        public void Handle(EntityInsertedEvent<IoTDevice> message)
+        public void Handle(EntityInserted<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTDevice> message)
+        public void Handle(EntityUpdated<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTDevice> message)
+        public void Handle(EntityDeleted<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTData> message)
+        public void Handle(EntityInserted<IoTData> message)
         {
             this.Upload(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTData> message)
+        public void Handle(EntityUpdated<IoTData> message)
         {
             this.Upload(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTData> message)
+        public void Handle(EntityDeleted<IoTData> message)
         {
             this.Upload(message);
         }

projects/IoTNode/Services/IoTNodeToServerEventHandler.cs

@@ -6,126 +6,111 @@ using Application.Domain.Entities;
 namespace IoTNode.Services
 {
     public class IoTNodeToServerEventHandler :
-        IEventHander<EntityInsertedEvent<IoTProduct>>,
-        IEventHander<EntityUpdatedEvent<IoTProduct>>,
-        IEventHander<EntityDeletedEvent<IoTProduct>>,
-        IEventHander<EntityInsertedEvent<IoTApi>>,
-        IEventHander<EntityUpdatedEvent<IoTApi>>,
-        IEventHander<EntityDeletedEvent<IoTApi>>,
-        IEventHander<EntityInsertedEvent<IoTParameter>>,
-        IEventHander<EntityUpdatedEvent<IoTParameter>>,
-        IEventHander<EntityDeletedEvent<IoTParameter>>,
-        IEventHander<EntityUpdatedEvent<IoTGateway>>,
-        IEventHander<EntityInsertedEvent<IoTDevice>>,
-        IEventHander<EntityUpdatedEvent<IoTDevice>>,
-        IEventHander<EntityDeletedEvent<IoTDevice>>,
-        IEventHander<EntityInsertedEvent<IoTData>>,
-        IEventHander<EntityUpdatedEvent<IoTData>>,
-        IEventHander<EntityDeletedEvent<IoTData>>
-        //IEventHander<EntityInsertedEvent<IoTCommand>>,
-        //IEventHander<EntityUpdatedEvent<IoTCommand>>,
-        //IEventHander<EntityDeletedEvent<IoTCommand>>,
-        //IEventHander<EntityInsertedEvent<IoTScene>>,
-        //IEventHander<EntityUpdatedEvent<IoTScene>>,
-        //IEventHander<EntityDeletedEvent<IoTScene>>,
-        //IEventHander<EntityInsertedEvent<IoTSceneTimer>>,
-        //IEventHander<EntityUpdatedEvent<IoTSceneTimer>>,
-        //IEventHander<EntityDeletedEvent<IoTSceneTimer>>,
-        //IEventHander<EntityInsertedEvent<IoTSceneTigger>>,
-        //IEventHander<EntityUpdatedEvent<IoTSceneTigger>>,
-        //IEventHander<EntityDeletedEvent<IoTSceneTigger>>
+        IEventHander<EntityInserted<IoTProduct>>,
+        IEventHander<EntityUpdated<IoTProduct>>,
+        IEventHander<EntityDeleted<IoTProduct>>,
+        IEventHander<EntityInserted<IoTApi>>,
+        IEventHander<EntityUpdated<IoTApi>>,
+        IEventHander<EntityDeleted<IoTApi>>,
+        IEventHander<EntityInserted<IoTParameter>>,
+        IEventHander<EntityUpdated<IoTParameter>>,
+        IEventHander<EntityDeleted<IoTParameter>>,
+        IEventHander<EntityUpdated<IoTGateway>>,
+        IEventHander<EntityInserted<IoTDevice>>,
+        IEventHander<EntityUpdated<IoTDevice>>,
+        IEventHander<EntityDeleted<IoTDevice>>,
+        IEventHander<EntityInserted<IoTData>>,
+        IEventHander<EntityUpdated<IoTData>>,
+        IEventHander<EntityDeleted<IoTData>>
     {
-        //private readonly ISceneTiggerService _sceneTiggerService;
         private readonly OnvifService _onvifService;
         private readonly IoTNodeClient _iotNodeClient;
 
         public IoTNodeToServerEventHandler(
-            //ISceneTiggerService sceneTiggerService, 
             OnvifService onvifService, IoTNodeClient iotNodeClient)
         {
-            //this._sceneTiggerService = sceneTiggerService;
             this._onvifService = onvifService;
             this._iotNodeClient = iotNodeClient;
         }
 
         private void ClientToServer<T>(BaseEvent<T> message)
         {
-            if (message is EntityInsertedEvent<T> || message is EntityUpdatedEvent<T>)
+            if (message is EntityInserted<T> || message is EntityUpdated<T>)
             {
                 _iotNodeClient.ClientToServer($"Edit{typeof(T).Name}", message.Data, null);
             }
-            else if (message is EntityDeletedEvent<T>)
+            else if (message is EntityDeleted<T>)
             {
                 _iotNodeClient.ClientToServer($"Delete{typeof(T).Name}", message.Data, null);
             }
         }
 
-        public void Handle(EntityInsertedEvent<IoTProduct> message)
+        public void Handle(EntityInserted<IoTProduct> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTProduct> message)
+        public void Handle(EntityUpdated<IoTProduct> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTProduct> message)
+        public void Handle(EntityDeleted<IoTProduct> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTApi> message)
+        public void Handle(EntityInserted<IoTApi> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTApi> message)
+        public void Handle(EntityUpdated<IoTApi> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTApi> message)
+        public void Handle(EntityDeleted<IoTApi> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTParameter> message)
+        public void Handle(EntityInserted<IoTParameter> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTParameter> message)
+        public void Handle(EntityUpdated<IoTParameter> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTParameter> message)
+        public void Handle(EntityDeleted<IoTParameter> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTGateway> message)
+        public void Handle(EntityUpdated<IoTGateway> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTDevice> message)
+        public void Handle(EntityInserted<IoTDevice> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTDevice> message)
+        public void Handle(EntityUpdated<IoTDevice> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTDevice> message)
+        public void Handle(EntityDeleted<IoTDevice> message)
         {
             this.ClientToServer(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTData> message)
+        public void Handle(EntityInserted<IoTData> message)
         {
             if (!message.Data.Hidden)
             {
@@ -133,7 +118,7 @@ namespace IoTNode.Services
             }
         }
 
-        public void Handle(EntityUpdatedEvent<IoTData> message)
+        public void Handle(EntityUpdated<IoTData> message)
         {
             if (!message.Data.Hidden)
             {
@@ -141,72 +126,12 @@ namespace IoTNode.Services
             }
         }
 
-        public void Handle(EntityDeletedEvent<IoTData> message)
+        public void Handle(EntityDeleted<IoTData> message)
         {
             if (!message.Data.Hidden)
             {
                 this.ClientToServer(message);
             }
         }
-
-        //public void Handle(EntityInsertedEvent<IoTCommand> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityUpdatedEvent<IoTCommand> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityDeletedEvent<IoTCommand> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityInsertedEvent<IoTScene> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityUpdatedEvent<IoTScene> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityDeletedEvent<IoTScene> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityInsertedEvent<IoTSceneTimer> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityUpdatedEvent<IoTSceneTimer> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityDeletedEvent<IoTSceneTimer> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityInsertedEvent<IoTSceneTigger> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityUpdatedEvent<IoTSceneTigger> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
-
-        //public void Handle(EntityDeletedEvent<IoTSceneTigger> message)
-        //{
-        //    this.ClientToServer(message);
-        //}
     }
 }

projects/Platform/Services/CacheEventHandler.cs

@@ -5,9 +5,9 @@ using Microsoft.Extensions.Caching.Distributed;
 namespace Platform.Services
 {
     public class CacheEventHandler :
-        IEventHander<EntityInsertedEvent<IoTTigger>>,
-        IEventHander<EntityUpdatedEvent<IoTTigger>>,
-        IEventHander<EntityDeletedEvent<IoTTigger>>
+        IEventHander<EntityInserted<IoTTigger>>,
+        IEventHander<EntityUpdated<IoTTigger>>,
+        IEventHander<EntityDeleted<IoTTigger>>
     {
         private readonly IDistributedCache _cache;
 
@@ -16,17 +16,17 @@ namespace Platform.Services
             this._cache = cache;
         }
 
-        public void Handle(EntityInsertedEvent<IoTTigger> message)
+        public void Handle(EntityInserted<IoTTigger> message)
         {
             this.Remove();
         }
 
-        public void Handle(EntityUpdatedEvent<IoTTigger> message)
+        public void Handle(EntityUpdated<IoTTigger> message)
         {
             this.Remove();
         }
 
-        public void Handle(EntityDeletedEvent<IoTTigger> message)
+        public void Handle(EntityDeleted<IoTTigger> message)
         {
             this.Remove();
         }

projects/Platform/Services/IoTCenterEventHandler.cs

@@ -25,30 +25,30 @@ using Vibrant.InfluxDB.Client.Rows;
 namespace Platform.Services
 {
     public class IoTCenterEventHandler :
-        IEventHander<EntityInsertedEvent<Organ>>,
-        IEventHander<EntityUpdatedEvent<Organ>>,
-        IEventHander<EntityDeletedEvent<Organ>>,
-        IEventHander<EntityInsertedEvent<Building>>,
-        IEventHander<EntityUpdatedEvent<Building>>,
-        IEventHander<EntityDeletedEvent<Building>>,
-        IEventHander<EntityInsertedEvent<IoTProduct>>,
-        IEventHander<EntityUpdatedEvent<IoTProduct>>,
-        IEventHander<EntityDeletedEvent<IoTProduct>>,
-        IEventHander<EntityInsertedEvent<IoTTimer>>,
-        IEventHander<EntityUpdatedEvent<IoTTimer>>,
-        IEventHander<EntityDeletedEvent<IoTTimer>>,
-        IEventHander<EntityInsertedEvent<IoTGateway>>,
-        IEventHander<EntityUpdatedEvent<IoTGateway>>,
-        IEventHander<EntityDeletedEvent<IoTGateway>>,
-        IEventHander<EntityInsertedEvent<IoTDevice>>,
-        IEventHander<EntityUpdatedEvent<IoTDevice>>,
-        IEventHander<EntityDeletedEvent<IoTDevice>>,
-        IEventHander<EntityInsertedEvent<IoTData>>,
-        IEventHander<EntityUpdatedEvent<IoTData>>,
-        IEventHander<EntityDeletedEvent<IoTData>>,
-        IEventHander<EntityInsertedEvent<IoTCommand>>,
-        IEventHander<EntityUpdatedEvent<IoTCommand>>,
-        IEventHander<EntityDeletedEvent<IoTCommand>>
+        IEventHander<EntityInserted<Organ>>,
+        IEventHander<EntityUpdated<Organ>>,
+        IEventHander<EntityDeleted<Organ>>,
+        IEventHander<EntityInserted<Building>>,
+        IEventHander<EntityUpdated<Building>>,
+        IEventHander<EntityDeleted<Building>>,
+        IEventHander<EntityInserted<IoTProduct>>,
+        IEventHander<EntityUpdated<IoTProduct>>,
+        IEventHander<EntityDeleted<IoTProduct>>,
+        IEventHander<EntityInserted<IoTTimer>>,
+        IEventHander<EntityUpdated<IoTTimer>>,
+        IEventHander<EntityDeleted<IoTTimer>>,
+        IEventHander<EntityInserted<IoTGateway>>,
+        IEventHander<EntityUpdated<IoTGateway>>,
+        IEventHander<EntityDeleted<IoTGateway>>,
+        IEventHander<EntityInserted<IoTDevice>>,
+        IEventHander<EntityUpdated<IoTDevice>>,
+        IEventHander<EntityDeleted<IoTDevice>>,
+        IEventHander<EntityInserted<IoTData>>,
+        IEventHander<EntityUpdated<IoTData>>,
+        IEventHander<EntityDeleted<IoTData>>,
+        IEventHander<EntityInserted<IoTCommand>>,
+        IEventHander<EntityUpdated<IoTCommand>>,
+        IEventHander<EntityDeleted<IoTCommand>>
     {
         private readonly IConfiguration _cfg;
 
@@ -106,45 +106,45 @@ namespace Platform.Services
         }
 
         //Organ
-        public void Handle(EntityInsertedEvent<Organ> message)
+        public void Handle(EntityInserted<Organ> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<Organ> message)
+        public void Handle(EntityUpdated<Organ> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<Organ> message)
+        public void Handle(EntityDeleted<Organ> message)
         {
             this.Notify(message);
         }
 
         //Building
-        public void Handle(EntityInsertedEvent<Building> message)
+        public void Handle(EntityInserted<Building> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<Building> message)
+        public void Handle(EntityUpdated<Building> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<Building> message)
+        public void Handle(EntityDeleted<Building> message)
         {
             this.Notify(message);
         }
 
         //Product
-        public void Handle(EntityInsertedEvent<IoTProduct> message)
+        public void Handle(EntityInserted<IoTProduct> message)
         {
             UpdateProduct(message.Data);
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTProduct> message)
+        public void Handle(EntityUpdated<IoTProduct> message)
         {
             UpdateProduct(message.Data);
             this.Notify(message);
@@ -163,24 +163,24 @@ namespace Platform.Services
             }
         }
 
-        public void Handle(EntityDeletedEvent<IoTProduct> message)
+        public void Handle(EntityDeleted<IoTProduct> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTTimer> message)
+        public void Handle(EntityInserted<IoTTimer> message)
         {
             var timer = message.Data;
             RecurringJob.AddOrUpdate(timer.Id.ToString(), () => Handle(timer.Id), timer.Cron, TimeZoneInfo.Local);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTTimer> message)
+        public void Handle(EntityUpdated<IoTTimer> message)
         {
             var timer = message.Data;
             RecurringJob.AddOrUpdate(timer.Id.ToString(), () => Handle(timer.Id), timer.Cron, TimeZoneInfo.Local);
         }
 
-        public void Handle(EntityDeletedEvent<IoTTimer> message)
+        public void Handle(EntityDeleted<IoTTimer> message)
         {
             var timer = message.Data;
             RecurringJob.RemoveIfExists(timer.Id.ToString());
@@ -209,37 +209,37 @@ namespace Platform.Services
             }
         }
 
-        public void Handle(EntityInsertedEvent<IoTGateway> message)
+        public void Handle(EntityInserted<IoTGateway> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTGateway> message)
+        public void Handle(EntityUpdated<IoTGateway> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTGateway> message)
+        public void Handle(EntityDeleted<IoTGateway> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTDevice> message)
+        public void Handle(EntityInserted<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTDevice> message)
+        public void Handle(EntityUpdated<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTDevice> message)
+        public void Handle(EntityDeleted<IoTDevice> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTData> message)
+        public void Handle(EntityInserted<IoTData> message)
         {
             message.Data.IoTDevice = _deviceRepo.ReadOnlyTable().Include(o => o.IoTGateway).Where(o => o.Id == message.Data.IoTDeviceId).FirstOrDefault();
             this.Notify(message);
@@ -247,7 +247,7 @@ namespace Platform.Services
             this.LogData(message.Data);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTData> message)
+        public void Handle(EntityUpdated<IoTData> message)
         {
             message.Data.IoTDevice = _deviceRepo.ReadOnlyTable().Include(o => o.IoTGateway).Where(o => o.Id == message.Data.IoTDeviceId).FirstOrDefault();
             this.Notify(message);
@@ -255,22 +255,22 @@ namespace Platform.Services
             this.LogData(message.Data);
         }
 
-        public void Handle(EntityDeletedEvent<IoTData> message)
+        public void Handle(EntityDeleted<IoTData> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityInsertedEvent<IoTCommand> message)
+        public void Handle(EntityInserted<IoTCommand> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityUpdatedEvent<IoTCommand> message)
+        public void Handle(EntityUpdated<IoTCommand> message)
         {
             this.Notify(message);
         }
 
-        public void Handle(EntityDeletedEvent<IoTCommand> message)
+        public void Handle(EntityDeleted<IoTCommand> message)
         {
             this.Notify(message);
         }

projects/Platform/Services/IoTCenterHub.cs

@@ -122,12 +122,12 @@ namespace Platform.Services
             try
             {
                 //网关上传
-                if (method == $"{nameof(IoTGateway)}EntityUpdated")//接收网关
+                if (method == $"{nameof(IoTGateway)}{nameof(EntityUpdated<IoTGateway>)}")//接收网关
                 {
                     var entity = message.FromJson<IoTGateway>();
                     this._dataService.Update(entity, o => o.Number == entity.Number, new string[] { nameof(IoTGateway.BuildingId) });
                 }
-                else if (method == $"{nameof(IoTProduct)}EntityUpdated")//接收产品
+                else if (method == $"{nameof(IoTProduct)}{nameof(EntityUpdated<IoTProduct>)}")//接收产品
                 {
                     var entity = message.FromJson<IoTProduct>();
                     this._dataService.Update(entity, o => o.Number == entity.Number, skips: new string[] { nameof(IoTProduct.IoTProductCategoryId), nameof(IoTProduct.DisplayOrder) });
@@ -136,12 +136,12 @@ namespace Platform.Services
                 {
                     this._dataService.UpdateList<IoTDevice>(message, o => o.IoTGateway.Number == from);
                 }
-                else if (method == $"{nameof(IoTDevice)}EntityUpdated")//接收设备
+                else if (method == $"{nameof(IoTDevice)}{nameof(EntityUpdated<IoTDevice>)}")//接收设备
                 {
                     var entity = message.FromJson<IoTDevice>();
                     this._dataService.Update(entity, o => o.Number == entity.Number);
                 }
-                else if (method == $"{nameof(IoTData)}EntityUpdated")//接收数据
+                else if (method == $"{nameof(IoTData)}{nameof(EntityUpdated<IoTData>)}")//接收数据
                 {
                     this._dataService.Update(message.FromJson<IoTData>());
                 }