固件升级完善

springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java

@@ -87,6 +87,17 @@ public class FirmwareController extends BaseController
         return AjaxResult.success(firmwareService.selectFirmwareByFirmwareId(firmwareId));
     }
 
+    /**
+     * 获取设备最新固件
+     */
+    @ApiOperation("获取设备最新固件")
+    @PreAuthorize("@ss.hasPermi('iot:firmware:query')")
+    @GetMapping(value = "/getLatest/{deviceId}")
+    public AjaxResult getLatest(@PathVariable("deviceId") Long deviceId)
+    {
+        return AjaxResult.success(firmwareService.selectLatestFirmware(deviceId));
+    }
+
     /**
      * 新增产品固件
      */

springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Firmware.java

@@ -43,6 +43,10 @@ public class Firmware extends BaseEntity
     @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
     private Integer isSys;
 
+    /** 是否最新版（0-否，1-是） */
+    @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
+    private Integer isLatest;
+
     /** 固件版本 */
     @Excel(name = "固件版本")
     private BigDecimal version;
@@ -54,7 +58,15 @@ public class Firmware extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setFirmwareId(Long firmwareId) 
+    public Integer getIsLatest() {
+        return isLatest;
+    }
+
+    public void setIsLatest(Integer isLatest) {
+        this.isLatest = isLatest;
+    }
+
+    public void setFirmwareId(Long firmwareId)
     {
         this.firmwareId = firmwareId;
     }

springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/FirmwareMapper.java

@@ -21,6 +21,14 @@ public interface FirmwareMapper
      */
     public Firmware selectFirmwareByFirmwareId(Long firmwareId);
 
+    /**
+     * 查询设备最新固件
+     *
+     * @param deviceId 产品固件主键
+     * @return 产品固件
+     */
+    public Firmware selectLatestFirmware(Long deviceId);
+
     /**
      * 查询产品固件列表
      * 

springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IFirmwareService.java

@@ -19,6 +19,14 @@ public interface IFirmwareService
      */
     public Firmware selectFirmwareByFirmwareId(Long firmwareId);
 
+    /**
+     * 查询设备最新固件
+     *
+     * @param deviceId 产品固件主键
+     * @return 产品固件
+     */
+    public Firmware selectLatestFirmware(Long deviceId);
+
     /**
      * 查询产品固件列表
      * 

springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java

@@ -37,6 +37,18 @@ public class FirmwareServiceImpl implements IFirmwareService
         return firmwareMapper.selectFirmwareByFirmwareId(firmwareId);
     }
 
+    /**
+     * 查询设备最新固件
+     *
+     * @param deviceId 产品固件主键
+     * @return 产品固件
+     */
+    @Override
+    public Firmware selectLatestFirmware(Long deviceId)
+    {
+        return firmwareMapper.selectLatestFirmware(deviceId);
+    }
+
     /**
      * 查询产品固件列表
      *