diff --git a/ZR.Service/mqtt/MqttService.cs b/ZR.Service/mqtt/MqttService.cs index 310a558d..d1b5e918 100644 --- a/ZR.Service/mqtt/MqttService.cs +++ b/ZR.Service/mqtt/MqttService.cs @@ -199,9 +199,9 @@ namespace ZR.Service.mqtt try { var payload = Encoding.UTF8.GetString(e.ApplicationMessage.PayloadSegment); - _logger.LogInformation( + /*_logger.LogInformation( $"收到MQTT消息 - 主题: {e.ApplicationMessage.Topic}, QoS: {e.ApplicationMessage.QualityOfServiceLevel}" - ); + );*/ // 消息处理委托给专用的处理器 await ProcessMessageAsync(e.ApplicationMessage.Topic, payload); @@ -367,33 +367,37 @@ namespace ZR.Service.mqtt private Task HandleDeviceMessage(string topic, string payload) { - _logger.LogInformation($"处理设备消息: {topic} - {payload}"); - - DeviceUploadDataGatWayDto deviceUploadDataGatWayDto = JsonSerializer.Deserialize(payload); - // 这里添加设备消息处理逻辑 - string deviceCode = topic.Split("/")[2]; - DeviceUploadData deviceUploadData = new() + //_logger.LogInformation($"处理设备消息: {topic} - {payload}"); + // plc网关抓取数据上传 + if (topic.Contains("device/data/push")) { - FactoryCode = "上海干巷", - WorkshopCode = "涂装车间", - LineCode = "涂装生产线", - DeviceCode = deviceCode, - DictCode = "device_dict_plc_001", - Remark = "网关采集设备数据", - UploadTime = DateTime.Now, - CollectionTime = DateTimeOffset.FromUnixTimeMilliseconds(deviceUploadDataGatWayDto.Time).LocalDateTime, - Value01 = deviceUploadDataGatWayDto.DeviceParams.Value01.ToString(), - Value02 = deviceUploadDataGatWayDto.DeviceParams.Value02.ToString(), - Value03 = deviceUploadDataGatWayDto.DeviceParams.Value03.ToString(), - Value04 = deviceUploadDataGatWayDto.DeviceParams.Value04.ToString(), - Value05 = deviceUploadDataGatWayDto.DeviceParams.Value05.ToString(), - Value06 = deviceUploadDataGatWayDto.DeviceParams.Value06.ToString(), - Value07 = deviceUploadDataGatWayDto.DeviceParams.Value07.ToString(), - Value08 = deviceUploadDataGatWayDto.DeviceParams.Value08.ToString(), - Value09 = deviceUploadDataGatWayDto.DeviceParams.Value09.ToString(), - Value10 = deviceUploadDataGatWayDto.DeviceParams.Value10.ToString() - }; - Context.Insertable(deviceUploadData).ExecuteCommand(); + DeviceUploadDataGatWayDto deviceUploadDataGatWayDto = JsonSerializer.Deserialize(payload); + // 这里添加设备消息处理逻辑 + string deviceCode = topic.Split("/")[2]; + DeviceUploadData deviceUploadData = new() + { + FactoryCode = "上海干巷", + WorkshopCode = "涂装车间", + LineCode = "涂装生产线", + DeviceCode = deviceCode, + DictCode = "device_dict_plc_001", + Remark = "网关采集设备数据", + UploadTime = DateTime.Now, + CollectionTime = DateTimeOffset.FromUnixTimeMilliseconds(deviceUploadDataGatWayDto.Time).LocalDateTime, + Value01 = deviceUploadDataGatWayDto.DeviceParams.Value01.ToString(), + Value02 = deviceUploadDataGatWayDto.DeviceParams.Value02.ToString(), + Value03 = deviceUploadDataGatWayDto.DeviceParams.Value03.ToString(), + Value04 = deviceUploadDataGatWayDto.DeviceParams.Value04.ToString(), + Value05 = deviceUploadDataGatWayDto.DeviceParams.Value05.ToString(), + Value06 = deviceUploadDataGatWayDto.DeviceParams.Value06.ToString(), + Value07 = deviceUploadDataGatWayDto.DeviceParams.Value07.ToString(), + Value08 = deviceUploadDataGatWayDto.DeviceParams.Value08.ToString(), + Value09 = deviceUploadDataGatWayDto.DeviceParams.Value09.ToString(), + Value10 = deviceUploadDataGatWayDto.DeviceParams.Value10.ToString() + }; + Context.Insertable(deviceUploadData).ExecuteCommand(); + } + return Task.CompletedTask; }