iot提交

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/rule/IotSceneRuleDO.java

@@ -16,6 +16,7 @@ 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -78,6 +79,7 @@ public class IotSceneRuleDO extends TenantBaseDO {
      * 场景定义配置
      */
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Trigger {
 
         // ========== 事件部分 ==========

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @author 芋道源码
  */
 public interface IotDeviceMessageService {
-
+    void createDeviceLogAsync(IotDeviceMessage message);
     /**
      * 初始化设备消息的 TDengine 超级表
      *

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageServiceImpl.java

@@ -84,7 +84,7 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService {
     }
 
     @Async
-    void createDeviceLogAsync(IotDeviceMessage message) {
+    public void createDeviceLogAsync(IotDeviceMessage message) {
         IotDeviceMessageDO messageDO = BeanUtils.toBean(message, IotDeviceMessageDO.class)
                 .setUpstream(IotDeviceMessageUtils.isUpstreamMessage(message))
                 .setReply(IotDeviceMessageUtils.isReplyMessage(message))
@@ -384,8 +384,8 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService {
         });
     }
 
-    private IotDeviceMessageServiceImpl getSelf() {
-        return SpringUtil.getBean(getClass());
+    private IotDeviceMessageService getSelf() {
+        return SpringUtil.getBean(IotDeviceMessageService.class);
     }
 
 }

yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml

@@ -6,10 +6,9 @@ spring:
 
   # Redis 配置
   redis:
-    host: 127.0.0.1 # 地址
+    host: localhost # 地址
     port: 6379 # 端口
-    database: 5 # 数据库索引
-    username: default
+    database: 0  # 数据库索引
     password: 123456
 
 --- #################### 消息队列相关 ####################
@@ -33,7 +32,7 @@ yudao:
     gateway:
       # 设备 RPC 配置
       rpc:
-        url: http://127.0.0.1:48080 # 主程序 API 地址
+        url: http://127.0.0.1:7808 # 主程序 API 地址
         connect-timeout: 30s
         read-timeout: 30s
       # 设备 Token 配置

yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 芋道源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"})
+@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module","cn.iocoder.yudao.module.iot" })
 public class YudaoServerApplication {
 
     public static void main(String[] args) {