From d39c595828b9ee78c8038f229c563f0eb68ed24c Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Thu, 24 Apr 2025 18:36:04 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B0=E5=9B=BA=E4=BB=B6=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/device/service/impl/DeviceServiceImpl.java | 2 +- .../xiaozhi/modules/device/service/impl/OtaServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 5e6928ef..b442275a 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 @@ -138,7 +138,7 @@ public class DeviceServiceImpl extends BaseServiceImpl } DeviceReportRespDTO.Firmware firmware = new DeviceReportRespDTO.Firmware(); - firmware.setVersion(ota.getVersion()); + firmware.setVersion(ota == null ? null : ota.getVersion()); firmware.setUrl(downloadUrl); response.setFirmware(firmware); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java index e06b088f..ef9ac01d 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java @@ -74,6 +74,10 @@ public class OtaServiceImpl extends BaseServiceImpl implement @Override public OtaEntity getLatestOta(String type) { - return baseDao.selectOne(new QueryWrapper().eq("type", type).orderByDesc("update_date")); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("type", type) + .orderByDesc("update_date") + .last("LIMIT 1"); + return baseDao.selectOne(wrapper); } } \ No newline at end of file