diff --git a/OpenAuth.WebApi/Model/mqtt/HmsAlarmParser.cs b/OpenAuth.WebApi/Model/mqtt/HmsAlarmParser.cs index 377278b..f609ebd 100644 --- a/OpenAuth.WebApi/Model/mqtt/HmsAlarmParser.cs +++ b/OpenAuth.WebApi/Model/mqtt/HmsAlarmParser.cs @@ -6,11 +6,12 @@ namespace OpenAuth.WebApi.Model.mqtt public class HmsAlarmParser { private readonly JsonObject _hmsMessages; - - public HmsAlarmParser(string hmsJsonPath) + private readonly string _getway; + public HmsAlarmParser(string hmsJsonPath, string getway) { string json = File.ReadAllText(hmsJsonPath); _hmsMessages = JsonNode.Parse(json)?.AsObject() ?? throw new Exception("hms.json 格式错误"); + _getway = getway; } public List ParseAlarmMessages(string rawJson) @@ -72,6 +73,7 @@ namespace OpenAuth.WebApi.Model.mqtt BId = bid, TId = tid, Level = level, + Sn = _getway, Module = module, CreateTime = DateTime.Now, MessageEn = en, diff --git a/OpenAuth.WebApi/Model/mqtt/ThingEventHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingEventHandler.cs index 0c52729..332d014 100644 --- a/OpenAuth.WebApi/Model/mqtt/ThingEventHandler.cs +++ b/OpenAuth.WebApi/Model/mqtt/ThingEventHandler.cs @@ -36,8 +36,8 @@ namespace OpenAuth.WebApi.Model.mqtt var jsondata = JsonSerializer.Deserialize(payload); var path = Path.Combine(AppContext.BaseDirectory, "hms.json"); - var parser = new HmsAlarmParser(path); - + string getway = topic.Split('/')[2]; + var parser = new HmsAlarmParser(path, getway); List alarmMessages = null; if (jsondata.data != null && jsondata.data.list?.Count > 0) {