admin/core_wing_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【改进】查询固件版本增加当前版本参数

Browse Source
This commit is contained in:
MichaelWin
2026-03-06 14:58:52 +08:00
parent c0896c199d
commit e472a3207f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/corewing/app/modules/app/AppFirmwareController.java
View File

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