diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java index b8a62e8f..bbe470b7 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java @@ -59,7 +59,7 @@ public class OtaController { @ApiOperation("删除升级包") @PostMapping("/package/delById") - public Boolean delChannelConfigById(@RequestBody @Valid Request request) { + public Boolean delChannelConfigById(@RequestBody @Valid Request request) { return otaService.delOtaPackageById(request.getData()); } @@ -84,7 +84,7 @@ public class OtaController { @ApiOperation("OTA升级") @PostMapping("/down") public void ota(@RequestBody PageRequest request) { - otaService.startUpgrade("0417d633-2806-4a0f-ab2a-afe35e2b2dc6", "16870054884740abcd123456000000103"); + otaService.startUpgrade(1L, "16870054884740abcd123456000000103"); } diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ota/DeviceUpgradeBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ota/DeviceUpgradeBo.java index 8bea7104..5ed85617 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ota/DeviceUpgradeBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ota/DeviceUpgradeBo.java @@ -18,5 +18,5 @@ import lombok.EqualsAndHashCode; public class DeviceUpgradeBo extends BaseDto { private static final long serialVersionUID = -1L; private String deviceId; - private String otaId; + private Long otaId; } diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java index 736758aa..2d0860f5 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java @@ -55,7 +55,7 @@ public class OtaService { return iOtaPackageData.save(otaPackage); } - public Boolean delOtaPackageById(String id) { + public Boolean delOtaPackageById(Long id) { iOtaPackageData.deleteById(id); return Boolean.TRUE; } @@ -71,7 +71,7 @@ public class OtaService { /** * 开始升级 */ - public String startUpgrade(String otaId, String deviceId) { + public String startUpgrade(Long otaId, String deviceId) { OtaPackage otaPackage = iOtaPackageData.findById(otaId); //构建升级包 return deviceService.otaUpgrade(deviceId, true, otaPackage);