From 557d1ee5b07e3edd541dc6669f9f513356cbd116 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Fri, 9 May 2025 14:07:46 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=8F=96=E6=B6=88=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=B8=80=E8=BF=9E=E6=8E=A5=E5=B0=B1=E5=BC=BA=E5=88=B6=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E6=94=B9=E6=88=90=E7=BB=91=E5=AE=9A=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=A0=B9=E6=8D=AE=E5=8D=87=E7=BA=A7=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/xiaozhi/modules/device/dao/DeviceDao.java | 6 +++--- .../modules/device/service/impl/DeviceServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/dao/DeviceDao.java b/main/manager-api/src/main/java/xiaozhi/modules/device/dao/DeviceDao.java index 6570b89b..f3fdb7a3 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/dao/DeviceDao.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/dao/DeviceDao.java @@ -1,18 +1,18 @@ package xiaozhi.modules.device.dao; +import java.util.Date; + import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import xiaozhi.modules.device.entity.DeviceEntity; -import java.util.Date; -import java.util.List; - @Mapper public interface DeviceDao extends BaseMapper { /** * 获取此智能体全部设备的最后连接时间 + * * @param agentId 智能体id * @return */ diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java index 515aea7f..19ab7178 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java @@ -118,7 +118,8 @@ public class DeviceServiceImpl extends BaseServiceImpl DeviceEntity deviceById = getDeviceByMacAddress(macAddress); - if (deviceById == null || deviceById.getAutoUpdate() != 0) { + // 只有在设备已绑定且autoUpdate不为0的情况下才返回固件升级信息 + if (deviceById != null && deviceById.getAutoUpdate() != 0) { String type = deviceReport.getBoard() == null ? null : deviceReport.getBoard().getType(); DeviceReportRespDTO.Firmware firmware = buildFirmwareInfo(type, deviceReport.getApplication() == null ? null : deviceReport.getApplication().getVersion());