From 0f165b50ffbabdbd6186fa36183dcda7a419518a Mon Sep 17 00:00:00 2001
From: yuhaiming <40624989@qq.com>
Date: Tue, 23 Jun 2026 15:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20MQTT=20=E6=8E=92=E7=A8=8B=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=9B=9E=E8=B0=83=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=20LoginHelper.getUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MQTT 消息处理线程没有登录上下文，LoginHelper.getUserId() 取不到值
还会覆盖 buildWateringLog 里基于设备查询设置的 userId

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../java/org/dromara/app/handler/ScheduleFinishHandler.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/water-modules/water-app/src/main/java/org/dromara/app/handler/ScheduleFinishHandler.java b/water-modules/water-app/src/main/java/org/dromara/app/handler/ScheduleFinishHandler.java
index 2c1399b..e09e6fd 100644
--- a/water-modules/water-app/src/main/java/org/dromara/app/handler/ScheduleFinishHandler.java
+++ b/water-modules/water-app/src/main/java/org/dromara/app/handler/ScheduleFinishHandler.java
@@ -12,7 +12,6 @@ import org.dromara.app.service.IAppDeviceService;
 import org.dromara.app.service.IAppWateringLogService;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
@@ -54,7 +53,6 @@ public class ScheduleFinishHandler implements MqttTopicHandler {
             }
             Map<String, Object> dto = JsonUtils.parseObject(payload, Map.class);
             AppWateringLogBo logBo = buildWateringLog(deviceNo, dto);
-            logBo.setUserId(LoginHelper.getUserId());
             appWateringLogService.confirmScheduleLog(logBo);
             log.info("[MQTT] 浇水排程上报已保存 时间={} 设备编号={} 消息体={}", HandlerLogTime.now(), deviceNo, payload);
         } catch (Exception e) {