From 2a59e21d8079c73d199ccf5515c205267aa815d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=AD=E7=90=AA=E6=9E=AB?= <374696376@qq.com>
Date: Tue, 18 Jul 2023 22:44:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cc/iotkit/data/model/TbDeviceTag.java     | 6 ++----
 .../src/main/java/cc/iotkit/manager/service/OtaService.java | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

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<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())