From 3e30d72ef2ae9934a507ed2ffd51a46e046abece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sun, 21 Sep 2025 13:59:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mqtt):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除MQTT消息接收和设备消息处理的调试日志输出
将设备消息处理逻辑限制在特定主题下执行
---
 ZR.Service/mqtt/MqttService.cs | 60 ++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 28 deletions(-)

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<DeviceUploadDataGatWayDto>(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<DeviceUploadDataGatWayDto>(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;
         }