zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: OTA_ID类型

V0.5.x
jay 2023-06-17 22:21:35 +08:00
parent d746490c57
commit 983f29c4ea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java
View File

@ -59,7 +59,7 @@ public class OtaController {
@ApiOperation("删除升级包")
@PostMapping("/package/delById")
public Boolean delChannelConfigById(@RequestBody @Valid Request<String> request) {
public Boolean delChannelConfigById(@RequestBody @Valid Request<Long> request) {
return otaService.delOtaPackageById(request.getData());
}
@ -84,7 +84,7 @@ public class OtaController {
@ApiOperation("OTA升级")
@PostMapping("/down")
public void ota(@RequestBody PageRequest<DeviceOtaInfoBo> request) {
otaService.startUpgrade("0417d633-2806-4a0f-ab2a-afe35e2b2dc6", "16870054884740abcd123456000000103");
otaService.startUpgrade(1L, "16870054884740abcd123456000000103");
}

2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ota/DeviceUpgradeBo.java
View File

@ -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;
}

4
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java
View File

@ -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);