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

fix:添加批量升级创建时间

V0.5.x
荭琪枫 2023-07-18 22:44:21 +08:00
parent 5fb249f765
commit 2a59e21d80
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java
View File

@ -17,10 +17,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
@Data
@Builder
@ -56,6 +53,7 @@ public class TbDeviceTag {
* 标签值
*/
@ApiModelProperty(value = "标签值")
@Column(name = "[value]")
private String value;
}

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

@ -160,11 +160,11 @@ public class OtaService {
AtomicReference<Integer> fail = new AtomicReference<>(0);
deviceIds.forEach(deviceId -> {
try {
//DeviceInfo deviceInfo = deviceInfoData.findByDeviceId(deviceId);
DeviceInfo deviceInfo = deviceInfoData.findByDeviceId(deviceId);
String taskId = deviceService.otaUpgrade(deviceId, true, otaPackage);
deviceOtaDetails.add(DeviceOtaDetail.builder()
.taskId(taskId)
//.deviceName(deviceInfo.getDeviceName())
.deviceName(deviceInfo.getDeviceName())
.otaInfoId(deviceOtaInfo.getId())
.module(otaPackage.getModule())
.version(otaPackage.getVersion())