Kaynağa Gözat

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

荭琪枫 1 yıl önce
ebeveyn
işleme
2a59e21d80

+ 2 - 4
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 lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 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
 @Data
 @Builder
 @Builder
@@ -56,6 +53,7 @@ public class TbDeviceTag {
      * 标签值
      * 标签值
      */
      */
     @ApiModelProperty(value = "标签值")
     @ApiModelProperty(value = "标签值")
+    @Column(name = "[value]")
     private String value;
     private String value;
 
 
 }
 }

+ 2 - 2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java

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