diff --git a/src/main/java/com/corewing/app/modules/app/AppFirmwareController.java b/src/main/java/com/corewing/app/modules/app/AppFirmwareController.java index 4aad458..4bbb9ec 100644 --- a/src/main/java/com/corewing/app/modules/app/AppFirmwareController.java +++ b/src/main/java/com/corewing/app/modules/app/AppFirmwareController.java @@ -126,10 +126,10 @@ public class AppFirmwareController { * * @param firmwareType 固件类型 */ - @CommonLog("根据类型,型号查询固件版本") - @ApiOperation("根据类型,型号查询固件版本") - @GetMapping("/type/{firmwareType}/{modelId}") - public Result> listByType(@PathVariable Integer firmwareType, @PathVariable Integer modelId) { + @CommonLog("根据类型,型号,当前版本查询固件版本") + @ApiOperation("根据类型,当前版本查询固件版本") + @GetMapping("/type/{firmwareType}/{modelId}/{softwareVersion}") + public Result> listByType(@PathVariable Integer firmwareType, @PathVariable Integer modelId, @PathVariable Integer softwareVersion) { if (firmwareType == null && modelId == null) { return Result.error(I18nUtil.getMessage("firmware.type.or.model.required")); } @@ -144,6 +144,7 @@ public class AppFirmwareController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Firmware::getFirmwareType, firmwareType); wrapper.eq(Firmware::getModelId, bizDeviceCategory.getId()); + wrapper.ge(Firmware::getVersionId, softwareVersion); // 按版本号或创建时间倒序排列,最新版本在前 wrapper.orderByDesc(Firmware::getCreateTime);