fix:【IoT 物联网】修复启动报错

puhui999
1 parent ea1f0cb4
Showing 3 changed files with 18 additions and 13 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaFirmwareDO.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeTaskDO.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java
@@ -2,9 +2,12 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.ota;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 /**
  * IoT OTA 固件 DO
@@ -24,7 +27,7 @@ public class IotOtaFirmwareDO extends BaseDO {
     /**
      * 固件编号
      */
-    @TableField
+    @TableId
     private Long id;
     /**
      * 固件名称
@@ -4,9 +4,13 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import java.util.List;
@@ -26,7 +30,7 @@ public class IotOtaUpgradeTaskDO extends BaseDO {
     /**
      * 任务编号
      */
-    @TableField
+    @TableId
     private Long id;
     /**
      * 任务名称
@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.iot.service.rule.action.databridge;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
-import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.*;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataSinkDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.*;
 import cn.iocoder.yudao.module.iot.service.rule.data.action.*;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
@@ -16,8 +16,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
-import java.time.LocalDateTime;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
@@ -42,10 +40,10 @@ public class IotDataBridgeExecuteTest extends BaseMockitoUnitTest {
     @BeforeEach
     public void setUp() {
         // 创建共享的测试消息
-        message = IotDeviceMessage.builder().messageId("TEST-001").reportTime(LocalDateTime.now())
-                .productKey("testProduct").deviceName("testDevice")
-                .type("property").identifier("temperature").data("{\"value\": 60}")
-                .build();
+        //message = IotDeviceMessage.builder().messageId("TEST-001").reportTime(LocalDateTime.now())
+        //        .productKey("testProduct").deviceName("testDevice")
+        //        .type("property").identifier("temperature").data("{\"value\": 60}")
+        //        .build();
     }
     @Test
@@ -142,7 +140,7 @@ public class IotDataBridgeExecuteTest extends BaseMockitoUnitTest {
      * @param type MQ 类型
      * @throws Exception 如果执行过程中发生异常
      */
-    private void executeAndVerifyCache(IotDataRuleAction<?> action, IotAbstractDataSinkConfig config, String type)
+    private void executeAndVerifyCache(IotDataRuleAction action, IotAbstractDataSinkConfig config, String type)
             throws Exception {
         log.info("[test{}DataBridge][第一次执行，应该会创建新的 producer]", type);
         action.execute(message, new IotDataSinkDO().setType(action.getType()).setConfig(config));