清理旧的状态处理。

280780363 · Oct 9, 2022 · f013701 · f013701
1 parent c7ab0d6
commit f013701
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 168 deletions.
diff --git a/IoTSharp.Contracts/Enums.cs b/IoTSharp.Contracts/Enums.cs
@@ -40,17 +40,7 @@ public enum ApiCode : int
         Empty = 10019,
     }
 
-    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum DeviceStatus
-    {
-        Deleted=-1,
-        UnKnow = 0,
-        Good = 1,
-        PartGood = 2,
-        Bad = 3
-
-    }
+
 
     [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
     [JsonConverter(typeof(StringEnumConverter))]

diff --git a/IoTSharp.Data/PlayloadData.cs b/IoTSharp.Data/PlayloadData.cs
@@ -10,7 +10,6 @@ namespace IoTSharp.Data
     public class PlayloadData
     {
         public DateTime ts { get; set; } = DateTime.Now;
-        public DeviceStatus DeviceStatus { get; set; } = DeviceStatus.Good;
         public Guid DeviceId { get;   set; }
         public Dictionary<string, object> MsgBody { get;  set; }
         public DataSide DataSide { get;  set; }

diff --git a/IoTSharp.EventBus.CAP/CapPublisher.cs b/IoTSharp.EventBus.CAP/CapPublisher.cs
@@ -57,11 +57,7 @@ public  async Task PublishTelemetryData( PlayloadData msg)
         {
             await _queue.PublishAsync("iotsharp.services.datastream.telemetrydata", msg);
         }
-
-        public  async Task PublishDeviceStatus( Guid devid, DeviceStatus devicestatus)
-        {
-            await _queue.PublishAsync("iotsharp.services.datastream.devicestatus", new PlayloadData { DeviceId = devid, DeviceStatus = devicestatus });
-        }
+
 
         public  async Task PublishDeviceAlarm( CreateAlarmDto alarmDto)
         {

diff --git a/IoTSharp.EventBus.CAP/CapSubscriber.cs b/IoTSharp.EventBus.CAP/CapSubscriber.cs
@@ -41,11 +41,7 @@ public async Task alarm(CreateAlarmDto alarmDto)
         }
 
 
-        [CapSubscribe("iotsharp.services.datastream.devicestatus")]
-        public async Task devicestatus(PlayloadData status)
-        {
-            await DeviceStatusEvent(status);
-        }
+
 
         [CapSubscribe("iotsharp.services.datastream.telemetrydata")]
         public async Task telemetrydata(PlayloadData msg)

diff --git a/IoTSharp.EventBus.Shashlik/Events.cs b/IoTSharp.EventBus.Shashlik/Events.cs
@@ -16,11 +16,7 @@ public class TelemetryDataEvent : ShashlikEvent<PlayloadData>
     {
 
     }
-    public class DeviceStatusEvent : IEvent
-    {
-        public Guid DeviceId { get; set; }
-        public DeviceStatus DeviceStatus { get; set; }
-    }
+
     public class CreateDeviceEvent : IEvent
     {
         public Guid DeviceId { get; set; }

diff --git a/IoTSharp.EventBus.Shashlik/ShashlikPublisher.cs b/IoTSharp.EventBus.Shashlik/ShashlikPublisher.cs
@@ -31,10 +31,7 @@ public async Task PublishTelemetryData( PlayloadData msg)
             await _queue.PublishAsync((TelemetryDataEvent)msg, null);
         }
 
-        public async Task PublishDeviceStatus( Guid devid, DeviceStatus devicestatus)
-        {
-            await _queue.PublishAsync(new DeviceStatusEvent() { DeviceId = devid, DeviceStatus = devicestatus },null);
-        }
+
 
         public async Task PublishDeviceAlarm( CreateAlarmDto alarmDto)
         {

diff --git a/IoTSharp.EventBus.Shashlik/ShashlikSubscriber.cs b/IoTSharp.EventBus.Shashlik/ShashlikSubscriber.cs
@@ -67,20 +67,7 @@ public async Task Execute(AlarmEvent @event, IDictionary<string, string> items)
         }
     }
 
-    public class DeviceStatusEventHandler : IEventHandler<DeviceStatusEvent>
-    {
-        private readonly ISubscriber _subscriber;
-
-        public DeviceStatusEventHandler(ISubscriber subscriber)
-        {
-            _subscriber = subscriber;
-        }
-        public async Task Execute(DeviceStatusEvent @event, IDictionary<string, string> items)
-        {
-            await _subscriber.DeviceStatusEvent(new PlayloadData() { DeviceId = @event.DeviceId, DeviceStatus = @event.DeviceStatus });
-        }
-    }
-
+
     public class CreateDeviceEventHandler : IEventHandler<CreateDeviceEvent>
     {
         private readonly ISubscriber _subscriber;

diff --git a/IoTSharp.EventBus/EventBusPublisher.cs b/IoTSharp.EventBus/EventBusPublisher.cs
@@ -45,16 +45,6 @@ public static void PublishTelemetryData(this IPublisher _queue, Device device, D
         {
             _queue.PublishTelemetryData(new PlayloadData() { DeviceId = device.Id, MsgBody = keyValues, DataSide = DataSide.ClientSide, DataCatalog = DataCatalog.TelemetryData });
         }
-        /// <summary>
-        /// 发布设备状态到属性当中。 
-        /// </summary>
-        /// <param name="_queue"></param>
-        /// <param name="device"></param>
-        /// <param name="status"></param>
-        public static void PublishStatus(this IPublisher _queue, Device device, DeviceStatus status)
-        {
-            _queue.PublishAttributeData(device, msg => msg.MsgBody.Add("Status", status));
-        }
 
     }
 }
diff --git a/IoTSharp.EventBus/EventBusSubscriber.cs b/IoTSharp.EventBus/EventBusSubscriber.cs
@@ -111,45 +111,6 @@ public async Task OccurredAlarm(CreateAlarmDto alarmDto)
             }
         }
 
-
-        public async Task DeviceStatusEvent(PlayloadData status)
-        {
-            try
-            {
-                using (var _scope = _scopeFactor.CreateScope())
-                {
-                    using (var _dbContext = _scope.ServiceProvider.GetRequiredService<ApplicationDbContext>())
-                    {
-                        var dev = _dbContext.Device.FirstOrDefault(d => d.Id == status.DeviceId);
-                        if (dev != null)
-                        {
-                            if (status.DeviceStatus != DeviceStatus.Good)
-                            {
-                                await RunRules(dev.Id, status, EventType.Disconnected);
-                                //真正离线
-                            }
-                            else if (status.DeviceStatus == DeviceStatus.Good)
-                            {
-                                await RunRules(dev.Id, status, EventType.Connected);
-                                //真正掉线
-                            }
-                            var result2 = await _dbContext.SaveAsync<AttributeLatest>(status.ToDictionary(), dev.Id, DataSide.ServerSide);
-                            _dbContext.SaveChanges();
-                        }
-                        else
-                        {
-                            _logger.LogWarning($"未找到设备{status.DeviceId} ，因此无法处理设备状态");
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, $"处理{status.DeviceId} 的状态{status.DeviceStatus} 时遇到异常:{ex.Message}");
-
-            }
-        }
-
         public async Task StoreTelemetryData(PlayloadData msg)
         {
             var result = await _storage.StoreTelemetryAsync(msg);

diff --git a/IoTSharp.EventBus/IPublisher.cs b/IoTSharp.EventBus/IPublisher.cs
@@ -13,8 +13,7 @@ public interface IPublisher
 
         public Task PublishAttributeData(PlayloadData msg);
         public Task PublishTelemetryData(PlayloadData msg);
-        [Obsolete]
-        public Task PublishDeviceStatus(Guid devid, DeviceStatus devicestatus);
+
         public Task PublishConnect(Guid devid, ConnectStatus devicestatus);
         public Task PublishActive(Guid devid, ActivityStatus  activity);
         public Task PublishDeviceAlarm(CreateAlarmDto alarmDto);

diff --git a/IoTSharp.EventBus/ISubscriber.cs b/IoTSharp.EventBus/ISubscriber.cs
@@ -9,7 +9,6 @@ public interface ISubscriber
     {
         public Task StoreAttributeData(PlayloadData msg);
         public Task OccurredAlarm(CreateAlarmDto alarmDto);
-        public Task DeviceStatusEvent(PlayloadData status);
         public Task StoreTelemetryData(PlayloadData msg);
         public Task DeleteDevice(Guid deviceId);
         public Task CreateDevice(Guid deviceId);

diff --git a/IoTSharp/Dtos/GatewayPlayload.cs b/IoTSharp/Dtos/GatewayPlayload.cs
@@ -9,8 +9,7 @@ public class GatewayPlayload
     {
         [JsonProperty(PropertyName = "ts")]
         public long Ticks { get; set; } = DateTime.Now.Ticks;
-        [JsonProperty(PropertyName = "deviceStatus")]
-        public DeviceStatus DeviceStatus { get; set; } = DeviceStatus.Good;
+
         [JsonProperty(PropertyName = "values")]
         public Dictionary<string, object> Values { get; set; } = new();
     }

diff --git a/IoTSharp/Services/MQTTControllers/GatewayController.cs b/IoTSharp/Services/MQTTControllers/GatewayController.cs
@@ -65,7 +65,7 @@ public async Task telemetry()
                 _logger.LogInformation($"{ClientId}的网关数据正在处理设备{dev}， 设备ID为{_dev?.Id}");
                 plst.ForEach(p =>
                 {
-                    _queue.PublishTelemetryData(new PlayloadData() { DeviceId = device.Id, DeviceStatus = p.DeviceStatus, ts = new DateTime(p.Ticks), MsgBody = p.Values, DataSide = DataSide.ClientSide, DataCatalog = DataCatalog.TelemetryData });
+                    _queue.PublishTelemetryData(new PlayloadData() { DeviceId = device.Id,  ts = new DateTime(p.Ticks), MsgBody = p.Values, DataSide = DataSide.ClientSide, DataCatalog = DataCatalog.TelemetryData });
                 });
                 _logger.LogInformation($"{ClientId}的网关数据处理完成，设备{dev}ID为{device?.Id}共计{plst.Count}条");
             });
@@ -87,7 +87,7 @@ public async Task Attributes()
                 _logger.LogInformation($"{ClientId}的网关数据正在处理设备{dev}， 设备ID为{device?.Id}");
                 plst.ForEach(async p =>
                 {
-                    await _queue.PublishAttributeData(new PlayloadData() { DeviceId = device.Id, DeviceStatus = p.DeviceStatus, ts = new DateTime(p.Ticks), MsgBody = p.Values, DataSide = DataSide.ClientSide, DataCatalog = DataCatalog.TelemetryData });
+                    await _queue.PublishAttributeData(new PlayloadData() { DeviceId = device.Id,   ts = new DateTime(p.Ticks), MsgBody = p.Values, DataSide = DataSide.ClientSide, DataCatalog = DataCatalog.TelemetryData });
                 });
                 _logger.LogInformation($"{ClientId}的网关数据处理完成，设备{dev}ID为{device?.Id}共计{plst.Count}条");
             });

diff --git a/IoTSharp/Services/MQTTControllers/StatusController.cs b/IoTSharp/Services/MQTTControllers/StatusController.cs