iot相关

yudao-module-iot/yudao-module-iot-biz/pom.xml

@@ -20,8 +20,8 @@
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-system</artifactId>
-            <version>${revision}</version>
+            <artifactId>yudao-module-system-api</artifactId>
+            <version>2.4.2-jdk8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>

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

@@ -79,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/pom.xml

@@ -52,12 +52,14 @@
         <dependency>
             <groupId>com.ghgande</groupId>
             <artifactId>j2mod</artifactId>
+            <version>3.3.0</version>
         </dependency>
 
         <!-- CoAP 相关 - Eclipse Californium -->
         <dependency>
             <groupId>org.eclipse.californium</groupId>
             <artifactId>californium-core</artifactId>
+            <version>3.14.0</version>
         </dependency>
 
         <!-- 测试相关 -->

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

@@ -33,7 +33,7 @@ yudao:
     gateway:
       # 设备 RPC 配置
       rpc:
-        url: http://127.0.0.1:48080 # 主程序 API 地址
+        url: http://127.0.0.1:58080 # 主程序 API 地址
         connect-timeout: 30s
         read-timeout: 30s
       # 设备 Token 配置