diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java index 7287b461..825232bf 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java @@ -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; } 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 b595385a..253c985d 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 @@ -160,11 +160,11 @@ public class OtaService { AtomicReference 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())