Commit fa159b4bef4a0c4d4bb90b734aeea0f2a0041452
Merge branch 'feature/iot-protocol' of https://gitee.com/zhijiantianya/ruoyi-vue…
…-pro into feature/iot-modbus # Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java # yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/IotDeviceCommonApi.java # yudao-module-iot/yudao-module-iot-gateway/pom.xml # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayConfiguration.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java # yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml # yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-binary-packet-examples.md # yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-json-packet-examples.md
Showing
220 changed files
with
15082 additions
and
4745 deletions
Too many changes.
To preserve performance only 100 of 220 files are displayed.
pom.xml
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 32 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 33 | 33 | ||
| 34 | <properties> | 34 | <properties> |
| 35 | - <revision>2025.12-SNAPSHOT</revision> | 35 | + <revision>2026.01-SNAPSHOT</revision> |
| 36 | <!-- Maven 相关 --> | 36 | <!-- Maven 相关 --> |
| 37 | <java.version>17</java.version> | 37 | <java.version>17</java.version> |
| 38 | <maven.compiler.source>${java.version}</maven.compiler.source> | 38 | <maven.compiler.source>${java.version}</maven.compiler.source> |
yudao-dependencies/pom.xml
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 15 | 15 | ||
| 16 | <properties> | 16 | <properties> |
| 17 | - <revision>2025.12-SNAPSHOT</revision> | 17 | + <revision>2026.01-SNAPSHOT</revision> |
| 18 | <flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version> | 18 | <flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version> |
| 19 | <!-- 统一依赖管理 --> | 19 | <!-- 统一依赖管理 --> |
| 20 | <spring.boot.version>3.5.9</spring.boot.version> | 20 | <spring.boot.version>3.5.9</spring.boot.version> |
| @@ -68,6 +68,8 @@ | @@ -68,6 +68,8 @@ | ||
| 68 | <netty.version>4.2.9.Final</netty.version> | 68 | <netty.version>4.2.9.Final</netty.version> |
| 69 | <mqtt.version>1.2.5</mqtt.version> | 69 | <mqtt.version>1.2.5</mqtt.version> |
| 70 | <vertx.version>4.5.22</vertx.version> | 70 | <vertx.version>4.5.22</vertx.version> |
| 71 | + <okhttp.version>4.12.0</okhttp.version> | ||
| 72 | + <californium.version>3.12.0</californium.version> | ||
| 71 | <!-- 三方云服务相关 --> | 73 | <!-- 三方云服务相关 --> |
| 72 | <awssdk.version>2.40.15</awssdk.version> | 74 | <awssdk.version>2.40.15</awssdk.version> |
| 73 | <justauth.version>1.16.7</justauth.version> | 75 | <justauth.version>1.16.7</justauth.version> |
| @@ -555,6 +557,50 @@ | @@ -555,6 +557,50 @@ | ||
| 555 | <version>${jsoup.version}</version> | 557 | <version>${jsoup.version}</version> |
| 556 | </dependency> | 558 | </dependency> |
| 557 | 559 | ||
| 560 | + <!-- Vert.x --> | ||
| 561 | + <dependency> | ||
| 562 | + <groupId>io.vertx</groupId> | ||
| 563 | + <artifactId>vertx-core</artifactId> | ||
| 564 | + <version>${vertx.version}</version> | ||
| 565 | + </dependency> | ||
| 566 | + <dependency> | ||
| 567 | + <groupId>io.vertx</groupId> | ||
| 568 | + <artifactId>vertx-web</artifactId> | ||
| 569 | + <version>${vertx.version}</version> | ||
| 570 | + </dependency> | ||
| 571 | + <dependency> | ||
| 572 | + <groupId>io.vertx</groupId> | ||
| 573 | + <artifactId>vertx-mqtt</artifactId> | ||
| 574 | + <version>${vertx.version}</version> | ||
| 575 | + </dependency> | ||
| 576 | + | ||
| 577 | + <!-- MQTT --> | ||
| 578 | + <dependency> | ||
| 579 | + <groupId>org.eclipse.paho</groupId> | ||
| 580 | + <artifactId>org.eclipse.paho.client.mqttv3</artifactId> | ||
| 581 | + <version>${mqtt.version}</version> | ||
| 582 | + </dependency> | ||
| 583 | + | ||
| 584 | + <!-- OkHttp --> | ||
| 585 | + <dependency> | ||
| 586 | + <groupId>com.squareup.okhttp3</groupId> | ||
| 587 | + <artifactId>okhttp</artifactId> | ||
| 588 | + <version>${okhttp.version}</version> | ||
| 589 | + </dependency> | ||
| 590 | + <dependency> | ||
| 591 | + <groupId>com.squareup.okhttp3</groupId> | ||
| 592 | + <artifactId>mockwebserver</artifactId> | ||
| 593 | + <version>${okhttp.version}</version> | ||
| 594 | + <scope>test</scope> | ||
| 595 | + </dependency> | ||
| 596 | + | ||
| 597 | + <!-- CoAP - Eclipse Californium --> | ||
| 598 | + <dependency> | ||
| 599 | + <groupId>org.eclipse.californium</groupId> | ||
| 600 | + <artifactId>californium-core</artifactId> | ||
| 601 | + <version>${californium.version}</version> | ||
| 602 | + </dependency> | ||
| 603 | + | ||
| 558 | <!-- 三方云服务相关 --> | 604 | <!-- 三方云服务相关 --> |
| 559 | <dependency> | 605 | <dependency> |
| 560 | <groupId>software.amazon.awssdk</groupId> | 606 | <groupId>software.amazon.awssdk</groupId> |
| @@ -629,30 +675,6 @@ | @@ -629,30 +675,6 @@ | ||
| 629 | </exclusion> | 675 | </exclusion> |
| 630 | </exclusions> | 676 | </exclusions> |
| 631 | </dependency> | 677 | </dependency> |
| 632 | - | ||
| 633 | - <!-- Vert.x --> | ||
| 634 | - <dependency> | ||
| 635 | - <groupId>io.vertx</groupId> | ||
| 636 | - <artifactId>vertx-core</artifactId> | ||
| 637 | - <version>${vertx.version}</version> | ||
| 638 | - </dependency> | ||
| 639 | - <dependency> | ||
| 640 | - <groupId>io.vertx</groupId> | ||
| 641 | - <artifactId>vertx-web</artifactId> | ||
| 642 | - <version>${vertx.version}</version> | ||
| 643 | - </dependency> | ||
| 644 | - <dependency> | ||
| 645 | - <groupId>io.vertx</groupId> | ||
| 646 | - <artifactId>vertx-mqtt</artifactId> | ||
| 647 | - <version>${vertx.version}</version> | ||
| 648 | - </dependency> | ||
| 649 | - | ||
| 650 | - <!-- MQTT --> | ||
| 651 | - <dependency> | ||
| 652 | - <groupId>org.eclipse.paho</groupId> | ||
| 653 | - <artifactId>org.eclipse.paho.client.mqttv3</artifactId> | ||
| 654 | - <version>${mqtt.version}</version> | ||
| 655 | - </dependency> | ||
| 656 | </dependencies> | 678 | </dependencies> |
| 657 | </dependencyManagement> | 679 | </dependencyManagement> |
| 658 | 680 |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/MapUtils.java
| @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; | @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; | ||
| 7 | import com.google.common.collect.Maps; | 7 | import com.google.common.collect.Maps; |
| 8 | import com.google.common.collect.Multimap; | 8 | import com.google.common.collect.Multimap; |
| 9 | 9 | ||
| 10 | +import java.math.BigDecimal; | ||
| 10 | import java.util.ArrayList; | 11 | import java.util.ArrayList; |
| 11 | import java.util.Collection; | 12 | import java.util.Collection; |
| 12 | import java.util.List; | 13 | import java.util.List; |
| @@ -65,4 +66,47 @@ public class MapUtils { | @@ -65,4 +66,47 @@ public class MapUtils { | ||
| 65 | return map; | 66 | return map; |
| 66 | } | 67 | } |
| 67 | 68 | ||
| 69 | + /** | ||
| 70 | + * 从 Map 中获取 BigDecimal 值 | ||
| 71 | + * | ||
| 72 | + * @param map Map 数据源 | ||
| 73 | + * @param key 键名 | ||
| 74 | + * @return BigDecimal 值，解析失败或值为 null 时返回 null | ||
| 75 | + */ | ||
| 76 | + public static BigDecimal getBigDecimal(Map<String, ?> map, String key) { | ||
| 77 | + return getBigDecimal(map, key, null); | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + /** | ||
| 81 | + * 从 Map 中获取 BigDecimal 值 | ||
| 82 | + * | ||
| 83 | + * @param map Map 数据源 | ||
| 84 | + * @param key 键名 | ||
| 85 | + * @param defaultValue 默认值 | ||
| 86 | + * @return BigDecimal 值，解析失败或值为 null 时返回默认值 | ||
| 87 | + */ | ||
| 88 | + public static BigDecimal getBigDecimal(Map<String, ?> map, String key, BigDecimal defaultValue) { | ||
| 89 | + if (map == null) { | ||
| 90 | + return defaultValue; | ||
| 91 | + } | ||
| 92 | + Object value = map.get(key); | ||
| 93 | + if (value == null) { | ||
| 94 | + return defaultValue; | ||
| 95 | + } | ||
| 96 | + if (value instanceof BigDecimal) { | ||
| 97 | + return (BigDecimal) value; | ||
| 98 | + } | ||
| 99 | + if (value instanceof Number) { | ||
| 100 | + return BigDecimal.valueOf(((Number) value).doubleValue()); | ||
| 101 | + } | ||
| 102 | + if (value instanceof String) { | ||
| 103 | + try { | ||
| 104 | + return new BigDecimal((String) value); | ||
| 105 | + } catch (NumberFormatException e) { | ||
| 106 | + return defaultValue; | ||
| 107 | + } | ||
| 108 | + } | ||
| 109 | + return defaultValue; | ||
| 110 | + } | ||
| 111 | + | ||
| 68 | } | 112 | } |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java
| @@ -229,4 +229,53 @@ public class JsonUtils { | @@ -229,4 +229,53 @@ public class JsonUtils { | ||
| 229 | return JSONUtil.isTypeJSONObject(str); | 229 | return JSONUtil.isTypeJSONObject(str); |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | + /** | ||
| 233 | + * 将 Object 转换为目标类型 | ||
| 234 | + * <p> | ||
| 235 | + * 避免先转 jsonString 再 parseObject 的性能损耗 | ||
| 236 | + * | ||
| 237 | + * @param obj 源对象（可以是 Map、POJO 等） | ||
| 238 | + * @param clazz 目标类型 | ||
| 239 | + * @return 转换后的对象 | ||
| 240 | + */ | ||
| 241 | + public static <T> T convertObject(Object obj, Class<T> clazz) { | ||
| 242 | + if (obj == null) { | ||
| 243 | + return null; | ||
| 244 | + } | ||
| 245 | + if (clazz.isInstance(obj)) { | ||
| 246 | + return clazz.cast(obj); | ||
| 247 | + } | ||
| 248 | + return objectMapper.convertValue(obj, clazz); | ||
| 249 | + } | ||
| 250 | + | ||
| 251 | + /** | ||
| 252 | + * 将 Object 转换为目标类型（支持泛型） | ||
| 253 | + * | ||
| 254 | + * @param obj 源对象 | ||
| 255 | + * @param typeReference 目标类型引用 | ||
| 256 | + * @return 转换后的对象 | ||
| 257 | + */ | ||
| 258 | + public static <T> T convertObject(Object obj, TypeReference<T> typeReference) { | ||
| 259 | + if (obj == null) { | ||
| 260 | + return null; | ||
| 261 | + } | ||
| 262 | + return objectMapper.convertValue(obj, typeReference); | ||
| 263 | + } | ||
| 264 | + | ||
| 265 | + /** | ||
| 266 | + * 将 Object 转换为 List 类型 | ||
| 267 | + * <p> | ||
| 268 | + * 避免先转 jsonString 再 parseArray 的性能损耗 | ||
| 269 | + * | ||
| 270 | + * @param obj 源对象（可以是 List、数组等） | ||
| 271 | + * @param clazz 目标元素类型 | ||
| 272 | + * @return 转换后的 List | ||
| 273 | + */ | ||
| 274 | + public static <T> List<T> convertList(Object obj, Class<T> clazz) { | ||
| 275 | + if (obj == null) { | ||
| 276 | + return new ArrayList<>(); | ||
| 277 | + } | ||
| 278 | + return objectMapper.convertValue(obj, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz)); | ||
| 279 | + } | ||
| 280 | + | ||
| 232 | } | 281 | } |
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
| @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; | @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; | ||
| 19 | import net.sf.jsqlparser.expression.Alias; | 19 | import net.sf.jsqlparser.expression.Alias; |
| 20 | import net.sf.jsqlparser.expression.Expression; | 20 | import net.sf.jsqlparser.expression.Expression; |
| 21 | import net.sf.jsqlparser.expression.LongValue; | 21 | import net.sf.jsqlparser.expression.LongValue; |
| 22 | -import net.sf.jsqlparser.expression.NullValue; | ||
| 23 | import net.sf.jsqlparser.expression.operators.conditional.OrExpression; | 22 | import net.sf.jsqlparser.expression.operators.conditional.OrExpression; |
| 24 | import net.sf.jsqlparser.expression.operators.relational.EqualsTo; | 23 | import net.sf.jsqlparser.expression.operators.relational.EqualsTo; |
| 25 | import net.sf.jsqlparser.expression.operators.relational.ExpressionList; | 24 | import net.sf.jsqlparser.expression.operators.relational.ExpressionList; |
| @@ -60,8 +59,6 @@ public class DeptDataPermissionRule implements DataPermissionRule { | @@ -60,8 +59,6 @@ public class DeptDataPermissionRule implements DataPermissionRule { | ||
| 60 | private static final String DEPT_COLUMN_NAME = "dept_id"; | 59 | private static final String DEPT_COLUMN_NAME = "dept_id"; |
| 61 | private static final String USER_COLUMN_NAME = "user_id"; | 60 | private static final String USER_COLUMN_NAME = "user_id"; |
| 62 | 61 | ||
| 63 | - static final Expression EXPRESSION_NULL = new NullValue(); | ||
| 64 | - | ||
| 65 | private final PermissionCommonApi permissionApi; | 62 | private final PermissionCommonApi permissionApi; |
| 66 | 63 | ||
| 67 | /** | 64 | /** |
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java
| @@ -19,7 +19,6 @@ import org.mockito.MockedStatic; | @@ -19,7 +19,6 @@ import org.mockito.MockedStatic; | ||
| 19 | 19 | ||
| 20 | import java.util.Map; | 20 | import java.util.Map; |
| 21 | 21 | ||
| 22 | -import static cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule.EXPRESSION_NULL; | ||
| 23 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; | 22 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; |
| 24 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; | 23 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; |
| 25 | import static org.junit.jupiter.api.Assertions.*; | 24 | import static org.junit.jupiter.api.Assertions.*; |
| @@ -150,7 +149,7 @@ class DeptDataPermissionRuleTest extends BaseMockitoUnitTest { | @@ -150,7 +149,7 @@ class DeptDataPermissionRuleTest extends BaseMockitoUnitTest { | ||
| 150 | // 调用 | 149 | // 调用 |
| 151 | Expression expression = rule.getExpression(tableName, tableAlias); | 150 | Expression expression = rule.getExpression(tableName, tableAlias); |
| 152 | // 断言 | 151 | // 断言 |
| 153 | - assertSame(EXPRESSION_NULL, expression); | 152 | + assertEquals("null = null", expression.toString()); |
| 154 | assertSame(deptDataPermission, loginUser.getContext(DeptDataPermissionRule.CONTEXT_KEY, DeptDataPermissionRespDTO.class)); | 153 | assertSame(deptDataPermission, loginUser.getContext(DeptDataPermissionRule.CONTEXT_KEY, DeptDataPermissionRespDTO.class)); |
| 155 | } | 154 | } |
| 156 | } | 155 | } |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
| @@ -15,6 +15,7 @@ import java.util.function.Consumer; | @@ -15,6 +15,7 @@ import java.util.function.Consumer; | ||
| 15 | * <p> | 15 | * <p> |
| 16 | * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。 | 16 | * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。 |
| 17 | * 2. SFunction<S, ?> column + <S> 泛型：支持任意类字段（主表、子表、三表），推荐写法, 让编译器自动推断 S 类型 | 17 | * 2. SFunction<S, ?> column + <S> 泛型：支持任意类字段（主表、子表、三表），推荐写法, 让编译器自动推断 S 类型 |
| 18 | + * | ||
| 18 | * @param <T> 数据类型 | 19 | * @param <T> 数据类型 |
| 19 | */ | 20 | */ |
| 20 | public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | 21 | public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { |
| @@ -123,6 +124,12 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -123,6 +124,12 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 123 | } | 124 | } |
| 124 | 125 | ||
| 125 | @Override | 126 | @Override |
| 127 | + public <X> MPJLambdaWrapperX<T> orderByAsc(SFunction<X, ?> column) { | ||
| 128 | + super.orderByAsc(true, column); | ||
| 129 | + return this; | ||
| 130 | + } | ||
| 131 | + | ||
| 132 | + @Override | ||
| 126 | public MPJLambdaWrapperX<T> last(String lastSql) { | 133 | public MPJLambdaWrapperX<T> last(String lastSql) { |
| 127 | super.last(lastSql); | 134 | super.last(lastSql); |
| 128 | return this; | 135 | return this; |
yudao-module-ai/pom.xml
| @@ -204,6 +204,12 @@ | @@ -204,6 +204,12 @@ | ||
| 204 | <groupId>org.springframework.ai</groupId> | 204 | <groupId>org.springframework.ai</groupId> |
| 205 | <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId> | 205 | <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId> |
| 206 | <version>${spring-ai.version}</version> | 206 | <version>${spring-ai.version}</version> |
| 207 | + <exclusions> | ||
| 208 | + <exclusion> | ||
| 209 | + <groupId>io.swagger.core.v3</groupId> | ||
| 210 | + <artifactId>swagger-annotations-jakarta</artifactId> | ||
| 211 | + </exclusion> | ||
| 212 | + </exclusions> | ||
| 207 | </dependency> | 213 | </dependency> |
| 208 | <dependency> | 214 | <dependency> |
| 209 | <!-- 客户端 --> | 215 | <!-- 客户端 --> |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
| @@ -15,7 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean | @@ -15,7 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean | ||
| 15 | import org.springframework.context.ApplicationEventPublisher; | 15 | import org.springframework.context.ApplicationEventPublisher; |
| 16 | import org.springframework.context.annotation.Bean; | 16 | import org.springframework.context.annotation.Bean; |
| 17 | import org.springframework.context.annotation.Configuration; | 17 | import org.springframework.context.annotation.Configuration; |
| 18 | -import org.springframework.core.task.AsyncListenableTaskExecutor; | 18 | +import org.springframework.core.task.AsyncTaskExecutor; |
| 19 | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | 19 | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; |
| 20 | 20 | ||
| 21 | import java.util.List; | 21 | import java.util.List; |
| @@ -30,12 +30,12 @@ public class BpmFlowableConfiguration { | @@ -30,12 +30,12 @@ public class BpmFlowableConfiguration { | ||
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 参考 {@link org.flowable.spring.boot.FlowableJobConfiguration} 类，创建对应的 AsyncListenableTaskExecutor Bean | 32 | * 参考 {@link org.flowable.spring.boot.FlowableJobConfiguration} 类，创建对应的 AsyncListenableTaskExecutor Bean |
| 33 | - * | 33 | + * <p> |
| 34 | * 如果不创建，会导致项目启动时，Flowable 报错的问题 | 34 | * 如果不创建，会导致项目启动时，Flowable 报错的问题 |
| 35 | */ | 35 | */ |
| 36 | @Bean(name = "applicationTaskExecutor") | 36 | @Bean(name = "applicationTaskExecutor") |
| 37 | @ConditionalOnMissingBean(name = "applicationTaskExecutor") | 37 | @ConditionalOnMissingBean(name = "applicationTaskExecutor") |
| 38 | - public AsyncListenableTaskExecutor taskExecutor() { | 38 | + public AsyncTaskExecutor taskExecutor() { |
| 39 | ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); | 39 | ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); |
| 40 | executor.setCorePoolSize(8); | 40 | executor.setCorePoolSize(8); |
| 41 | executor.setMaxPoolSize(8); | 41 | executor.setMaxPoolSize(8); |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
| @@ -14,6 +14,7 @@ import org.flowable.bpmn.model.UserTask; | @@ -14,6 +14,7 @@ import org.flowable.bpmn.model.UserTask; | ||
| 14 | import org.flowable.engine.delegate.DelegateExecution; | 14 | import org.flowable.engine.delegate.DelegateExecution; |
| 15 | import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; | 15 | import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; |
| 16 | import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; | 16 | import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; |
| 17 | +import org.flowable.common.engine.api.delegate.Expression; | ||
| 17 | 18 | ||
| 18 | import java.util.List; | 19 | import java.util.List; |
| 19 | import java.util.Set; | 20 | import java.util.Set; |
| @@ -56,14 +57,7 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | @@ -56,14 +57,7 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | ||
| 56 | protected int resolveNrOfInstances(DelegateExecution execution) { | 57 | protected int resolveNrOfInstances(DelegateExecution execution) { |
| 57 | // 情况一：UserTask 节点 | 58 | // 情况一：UserTask 节点 |
| 58 | if (execution.getCurrentFlowElement() instanceof UserTask) { | 59 | if (execution.getCurrentFlowElement() instanceof UserTask) { |
| 59 | - // 第一步，设置 collectionVariable 和 CollectionVariable | ||
| 60 | - // 从 execution.getVariable() 读取所有任务处理人的 key | ||
| 61 | - super.collectionExpression = null; // collectionExpression 和 collectionVariable 是互斥的 | ||
| 62 | - super.collectionVariable = FlowableUtils.formatExecutionCollectionVariable(execution.getCurrentActivityId()); | ||
| 63 | - // 从 execution.getVariable() 读取当前所有任务处理的人的 key | ||
| 64 | - super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId()); | ||
| 65 | - | ||
| 66 | - // 第二步，获取任务的所有处理人 | 60 | + // 获取任务的所有处理人 |
| 67 | @SuppressWarnings("unchecked") | 61 | @SuppressWarnings("unchecked") |
| 68 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariable(super.collectionVariable, Set.class); | 62 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariable(super.collectionVariable, Set.class); |
| 69 | if (assigneeUserIds == null) { | 63 | if (assigneeUserIds == null) { |
| @@ -94,4 +88,21 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | @@ -94,4 +88,21 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | ||
| 94 | return super.resolveNrOfInstances(execution); | 88 | return super.resolveNrOfInstances(execution); |
| 95 | } | 89 | } |
| 96 | 90 | ||
| 91 | + // ========== 屏蔽解析器覆写 ========== | ||
| 92 | + | ||
| 93 | + @Override | ||
| 94 | + public void setCollectionExpression(Expression collectionExpression) { | ||
| 95 | + // 保持自定义变量名，忽略解析器写入的 collection 表达式 | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + @Override | ||
| 99 | + public void setCollectionVariable(String collectionVariable) { | ||
| 100 | + // 保持自定义变量名，忽略解析器写入的 collection 变量名 | ||
| 101 | + } | ||
| 102 | + | ||
| 103 | + @Override | ||
| 104 | + public void setCollectionElementVariable(String collectionElementVariable) { | ||
| 105 | + // 保持自定义变量名，忽略解析器写入的单元素变量名 | ||
| 106 | + } | ||
| 107 | + | ||
| 97 | } | 108 | } |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
| @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; | @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; | ||
| 8 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; | 8 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; |
| 9 | import lombok.Setter; | 9 | import lombok.Setter; |
| 10 | import org.flowable.bpmn.model.*; | 10 | import org.flowable.bpmn.model.*; |
| 11 | +import org.flowable.common.engine.api.delegate.Expression; | ||
| 11 | import org.flowable.engine.delegate.DelegateExecution; | 12 | import org.flowable.engine.delegate.DelegateExecution; |
| 12 | import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; | 13 | import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; |
| 13 | import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; | 14 | import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; |
| @@ -47,14 +48,7 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | @@ -47,14 +48,7 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | ||
| 47 | protected int resolveNrOfInstances(DelegateExecution execution) { | 48 | protected int resolveNrOfInstances(DelegateExecution execution) { |
| 48 | // 情况一：UserTask 节点 | 49 | // 情况一：UserTask 节点 |
| 49 | if (execution.getCurrentFlowElement() instanceof UserTask) { | 50 | if (execution.getCurrentFlowElement() instanceof UserTask) { |
| 50 | - // 第一步，设置 collectionVariable 和 CollectionVariable | ||
| 51 | - // 从 execution.getVariable() 读取所有任务处理人的 key | ||
| 52 | - super.collectionExpression = null; // collectionExpression 和 collectionVariable 是互斥的 | ||
| 53 | - super.collectionVariable = FlowableUtils.formatExecutionCollectionVariable(execution.getCurrentActivityId()); | ||
| 54 | - // 从 execution.getVariable() 读取当前所有任务处理的人的 key | ||
| 55 | - super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId()); | ||
| 56 | - | ||
| 57 | - // 第二步，获取任务的所有处理人 | 51 | + // 获取任务的所有处理人 |
| 58 | // 不使用 execution.getVariable 原因：目前依次审批任务回退后 collectionVariable 变量没有清理， 如果重新进入该任务不会重新分配审批人 | 52 | // 不使用 execution.getVariable 原因：目前依次审批任务回退后 collectionVariable 变量没有清理， 如果重新进入该任务不会重新分配审批人 |
| 59 | @SuppressWarnings("unchecked") | 53 | @SuppressWarnings("unchecked") |
| 60 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariableLocal(super.collectionVariable, Set.class); | 54 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariableLocal(super.collectionVariable, Set.class); |
| @@ -97,4 +91,21 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | @@ -97,4 +91,21 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | ||
| 97 | super.executeOriginalBehavior(execution, multiInstanceRootExecution, loopCounter); | 91 | super.executeOriginalBehavior(execution, multiInstanceRootExecution, loopCounter); |
| 98 | } | 92 | } |
| 99 | 93 | ||
| 94 | + // ========== 屏蔽解析器覆写 ========== | ||
| 95 | + | ||
| 96 | + @Override | ||
| 97 | + public void setCollectionExpression(Expression collectionExpression) { | ||
| 98 | + // 保持自定义变量名，忽略解析器写入的 collection 表达式 | ||
| 99 | + } | ||
| 100 | + | ||
| 101 | + @Override | ||
| 102 | + public void setCollectionVariable(String collectionVariable) { | ||
| 103 | + // 保持自定义变量名，忽略解析器写入的 collection 变量名 | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + @Override | ||
| 107 | + public void setCollectionElementVariable(String collectionElementVariable) { | ||
| 108 | + // 保持自定义变量名，忽略解析器写入的单元素变量名 | ||
| 109 | + } | ||
| 110 | + | ||
| 100 | } | 111 | } |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentItemMapper.java
| @@ -31,14 +31,14 @@ public interface ErpFinancePaymentItemMapper extends BaseMapperX<ErpFinancePayme | @@ -31,14 +31,14 @@ public interface ErpFinancePaymentItemMapper extends BaseMapperX<ErpFinancePayme | ||
| 31 | default BigDecimal selectPaymentPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { | 31 | default BigDecimal selectPaymentPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { |
| 32 | // SQL sum 查询 | 32 | // SQL sum 查询 |
| 33 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentItemDO>() | 33 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentItemDO>() |
| 34 | - .select("SUM(payment_price) AS paymentPriceSum") | 34 | + .select("SUM(payment_price) AS payment_price_sum") |
| 35 | .eq("biz_id", bizId) | 35 | .eq("biz_id", bizId) |
| 36 | .eq("biz_type", bizType)); | 36 | .eq("biz_type", bizType)); |
| 37 | // 获得数量 | 37 | // 获得数量 |
| 38 | if (CollUtil.isEmpty(result)) { | 38 | if (CollUtil.isEmpty(result)) { |
| 39 | return BigDecimal.ZERO; | 39 | return BigDecimal.ZERO; |
| 40 | } | 40 | } |
| 41 | - return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "paymentPriceSum", 0D)); | 41 | + return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "payment_price_sum", 0D)); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | } | 44 | } |
| 45 | \ No newline at end of file | 45 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptItemMapper.java
| @@ -31,14 +31,14 @@ public interface ErpFinanceReceiptItemMapper extends BaseMapperX<ErpFinanceRecei | @@ -31,14 +31,14 @@ public interface ErpFinanceReceiptItemMapper extends BaseMapperX<ErpFinanceRecei | ||
| 31 | default BigDecimal selectReceiptPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { | 31 | default BigDecimal selectReceiptPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { |
| 32 | // SQL sum 查询 | 32 | // SQL sum 查询 |
| 33 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinanceReceiptItemDO>() | 33 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinanceReceiptItemDO>() |
| 34 | - .select("SUM(receipt_price) AS receiptPriceSum") | 34 | + .select("SUM(receipt_price) AS receipt_price_sum") |
| 35 | .eq("biz_id", bizId) | 35 | .eq("biz_id", bizId) |
| 36 | .eq("biz_type", bizType)); | 36 | .eq("biz_type", bizType)); |
| 37 | // 获得数量 | 37 | // 获得数量 |
| 38 | if (CollUtil.isEmpty(result)) { | 38 | if (CollUtil.isEmpty(result)) { |
| 39 | return BigDecimal.ZERO; | 39 | return BigDecimal.ZERO; |
| 40 | } | 40 | } |
| 41 | - return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "receiptPriceSum", 0D)); | 41 | + return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "receipt_price_sum", 0D)); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | } | 44 | } |
| 45 | \ No newline at end of file | 45 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java
| @@ -46,11 +46,11 @@ public interface ErpPurchaseInItemMapper extends BaseMapperX<ErpPurchaseInItemDO | @@ -46,11 +46,11 @@ public interface ErpPurchaseInItemMapper extends BaseMapperX<ErpPurchaseInItemDO | ||
| 46 | } | 46 | } |
| 47 | // SQL sum 查询 | 47 | // SQL sum 查询 |
| 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseInItemDO>() | 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseInItemDO>() |
| 49 | - .select("order_item_id, SUM(count) AS sumCount") | 49 | + .select("order_item_id, SUM(count) AS sum_count") |
| 50 | .groupBy("order_item_id") | 50 | .groupBy("order_item_id") |
| 51 | .in("in_id", inIds)); | 51 | .in("in_id", inIds)); |
| 52 | // 获得数量 | 52 | // 获得数量 |
| 53 | - return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); | 53 | + return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count")); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | } | 56 | } |
| 57 | \ No newline at end of file | 57 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java
| @@ -46,11 +46,11 @@ public interface ErpPurchaseReturnItemMapper extends BaseMapperX<ErpPurchaseRetu | @@ -46,11 +46,11 @@ public interface ErpPurchaseReturnItemMapper extends BaseMapperX<ErpPurchaseRetu | ||
| 46 | } | 46 | } |
| 47 | // SQL sum 查询 | 47 | // SQL sum 查询 |
| 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseReturnItemDO>() | 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseReturnItemDO>() |
| 49 | - .select("order_item_id, SUM(count) AS sumCount") | 49 | + .select("order_item_id, SUM(count) AS sum_count") |
| 50 | .groupBy("order_item_id") | 50 | .groupBy("order_item_id") |
| 51 | .in("return_id", returnIds)); | 51 | .in("return_id", returnIds)); |
| 52 | // 获得数量 | 52 | // 获得数量 |
| 53 | - return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); | 53 | + return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count")); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | } | 56 | } |
| 57 | \ No newline at end of file | 57 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutItemMapper.java
| @@ -46,11 +46,11 @@ public interface ErpSaleOutItemMapper extends BaseMapperX<ErpSaleOutItemDO> { | @@ -46,11 +46,11 @@ public interface ErpSaleOutItemMapper extends BaseMapperX<ErpSaleOutItemDO> { | ||
| 46 | } | 46 | } |
| 47 | // SQL sum 查询 | 47 | // SQL sum 查询 |
| 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleOutItemDO>() | 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleOutItemDO>() |
| 49 | - .select("order_item_id, SUM(count) AS sumCount") | 49 | + .select("order_item_id, SUM(count) AS sum_count") |
| 50 | .groupBy("order_item_id") | 50 | .groupBy("order_item_id") |
| 51 | .in("out_id", outIds)); | 51 | .in("out_id", outIds)); |
| 52 | // 获得数量 | 52 | // 获得数量 |
| 53 | - return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); | 53 | + return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count")); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | } | 56 | } |
| 57 | \ No newline at end of file | 57 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnItemMapper.java
| @@ -46,11 +46,11 @@ public interface ErpSaleReturnItemMapper extends BaseMapperX<ErpSaleReturnItemDO | @@ -46,11 +46,11 @@ public interface ErpSaleReturnItemMapper extends BaseMapperX<ErpSaleReturnItemDO | ||
| 46 | } | 46 | } |
| 47 | // SQL sum 查询 | 47 | // SQL sum 查询 |
| 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleReturnItemDO>() | 48 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleReturnItemDO>() |
| 49 | - .select("order_item_id, SUM(count) AS sumCount") | 49 | + .select("order_item_id, SUM(count) AS sum_count") |
| 50 | .groupBy("order_item_id") | 50 | .groupBy("order_item_id") |
| 51 | .in("return_id", returnIds)); | 51 | .in("return_id", returnIds)); |
| 52 | // 获得数量 | 52 | // 获得数量 |
| 53 | - return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); | 53 | + return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count")); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | } | 56 | } |
| 57 | \ No newline at end of file | 57 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java
| @@ -52,13 +52,13 @@ public interface ErpStockMapper extends BaseMapperX<ErpStockDO> { | @@ -52,13 +52,13 @@ public interface ErpStockMapper extends BaseMapperX<ErpStockDO> { | ||
| 52 | default BigDecimal selectSumByProductId(Long productId) { | 52 | default BigDecimal selectSumByProductId(Long productId) { |
| 53 | // SQL sum 查询 | 53 | // SQL sum 查询 |
| 54 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpStockDO>() | 54 | List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpStockDO>() |
| 55 | - .select("SUM(count) AS sumCount") | 55 | + .select("SUM(count) AS sum_count") |
| 56 | .eq("product_id", productId)); | 56 | .eq("product_id", productId)); |
| 57 | // 获得数量 | 57 | // 获得数量 |
| 58 | if (CollUtil.isEmpty(result)) { | 58 | if (CollUtil.isEmpty(result)) { |
| 59 | return BigDecimal.ZERO; | 59 | return BigDecimal.ZERO; |
| 60 | } | 60 | } |
| 61 | - return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "sumCount", 0D)); | 61 | + return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "sum_count", 0D)); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | \ No newline at end of file | 65 | \ No newline at end of file |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java
| @@ -70,7 +70,7 @@ public class ApiAccessLogRespVO { | @@ -70,7 +70,7 @@ public class ApiAccessLogRespVO { | ||
| 70 | 70 | ||
| 71 | @Schema(description = "操作分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 71 | @Schema(description = "操作分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 72 | @ExcelProperty(value = "操作分类", converter = DictConvert.class) | 72 | @ExcelProperty(value = "操作分类", converter = DictConvert.class) |
| 73 | - @DictFormat(cn.iocoder.yudao.module.infra.enums.DictTypeConstants.OPERATE_TYPE) | 73 | + @DictFormat(DictTypeConstants.OPERATE_TYPE) |
| 74 | private Integer operateType; | 74 | private Integer operateType; |
| 75 | 75 | ||
| 76 | @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED) | 76 | @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED) |
yudao-module-iot/yudao-module-iot-biz/pom.xml
| @@ -73,6 +73,17 @@ | @@ -73,6 +73,17 @@ | ||
| 73 | <artifactId>yudao-spring-boot-starter-excel</artifactId> | 73 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 74 | </dependency> | 74 | </dependency> |
| 75 | 75 | ||
| 76 | + <!-- OkHttp --> | ||
| 77 | + <dependency> | ||
| 78 | + <groupId>com.squareup.okhttp3</groupId> | ||
| 79 | + <artifactId>okhttp</artifactId> | ||
| 80 | + </dependency> | ||
| 81 | + <dependency> | ||
| 82 | + <groupId>com.squareup.okhttp3</groupId> | ||
| 83 | + <artifactId>mockwebserver</artifactId> | ||
| 84 | + <scope>test</scope> | ||
| 85 | + </dependency> | ||
| 86 | + | ||
| 76 | <!-- 消息队列相关 --> | 87 | <!-- 消息队列相关 --> |
| 77 | <!-- TODO @芋艿：临时打开 --> | 88 | <!-- TODO @芋艿：临时打开 --> |
| 78 | <dependency> | 89 | <dependency> |
| @@ -90,18 +101,6 @@ | @@ -90,18 +101,6 @@ | ||
| 90 | <artifactId>spring-boot-starter-amqp</artifactId> | 101 | <artifactId>spring-boot-starter-amqp</artifactId> |
| 91 | <optional>true</optional> | 102 | <optional>true</optional> |
| 92 | </dependency> | 103 | </dependency> |
| 93 | - | ||
| 94 | - <!-- IoT 网络组件：接收来自设备的上行数据 --> | ||
| 95 | - <!-- <dependency>--> | ||
| 96 | - <!-- <groupId>cn.iocoder.boot</groupId>--> | ||
| 97 | - <!-- <artifactId>yudao-module-iot-net-component-http</artifactId>--> | ||
| 98 | - <!-- <version>${revision}</version>--> | ||
| 99 | - <!-- </dependency>--> | ||
| 100 | - <!-- <dependency>--> | ||
| 101 | - <!-- <groupId>cn.iocoder.boot</groupId>--> | ||
| 102 | - <!-- <artifactId>yudao-module-iot-net-component-emqx</artifactId>--> | ||
| 103 | - <!-- <version>${revision}</version>--> | ||
| 104 | - <!-- </dependency>--> | ||
| 105 | </dependencies> | 104 | </dependencies> |
| 106 | 105 | ||
| 107 | </project> | 106 | </project> |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
| @@ -7,6 +7,13 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | @@ -7,6 +7,13 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | ||
| 7 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; | 7 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; |
| 8 | import cn.iocoder.yudao.module.iot.core.biz.IotDeviceCommonApi; | 8 | import cn.iocoder.yudao.module.iot.core.biz.IotDeviceCommonApi; |
| 9 | import cn.iocoder.yudao.module.iot.core.biz.dto.*; | 9 | import cn.iocoder.yudao.module.iot.core.biz.dto.*; |
| 10 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; | ||
| 11 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceGetReqDTO; | ||
| 12 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceRespDTO; | ||
| 13 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotSubDeviceRegisterFullReqDTO; | ||
| 14 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO; | ||
| 15 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO; | ||
| 16 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterRespDTO; | ||
| 10 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 17 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 11 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceModbusConfigDO; | 18 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceModbusConfigDO; |
| 12 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceModbusPointDO; | 19 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceModbusPointDO; |
| @@ -28,6 +35,8 @@ import java.util.List; | @@ -28,6 +35,8 @@ import java.util.List; | ||
| 28 | import java.util.Map; | 35 | import java.util.Map; |
| 29 | import java.util.Set; | 36 | import java.util.Set; |
| 30 | 37 | ||
| 38 | +import java.util.List; | ||
| 39 | + | ||
| 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 40 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 32 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | 41 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; |
| 33 | 42 | ||
| @@ -107,4 +116,18 @@ public class IoTDeviceApiImpl implements IotDeviceCommonApi { | @@ -107,4 +116,18 @@ public class IoTDeviceApiImpl implements IotDeviceCommonApi { | ||
| 107 | return success(result); | 116 | return success(result); |
| 108 | } | 117 | } |
| 109 | 118 | ||
| 119 | + @Override | ||
| 120 | + @PostMapping(RpcConstants.RPC_API_PREFIX + "/iot/device/register") | ||
| 121 | + @PermitAll | ||
| 122 | + public CommonResult<IotDeviceRegisterRespDTO> registerDevice(@RequestBody IotDeviceRegisterReqDTO reqDTO) { | ||
| 123 | + return success(deviceService.registerDevice(reqDTO)); | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + @Override | ||
| 127 | + @PostMapping(RpcConstants.RPC_API_PREFIX + "/iot/device/register-sub") | ||
| 128 | + @PermitAll | ||
| 129 | + public CommonResult<List<IotSubDeviceRegisterRespDTO>> registerSubDevices(@RequestBody IotSubDeviceRegisterFullReqDTO reqDTO) { | ||
| 130 | + return success(deviceService.registerSubDevices(reqDTO)); | ||
| 131 | + } | ||
| 132 | + | ||
| 110 | } | 133 | } |
| 111 | \ No newline at end of file | 134 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java
| 1 | package cn.iocoder.yudao.module.iot.controller.admin.device; | 1 | package cn.iocoder.yudao.module.iot.controller.admin.device; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.collection.CollUtil; | ||
| 3 | import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; | 4 | import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; | ||
| 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 9 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 8 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 10 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 9 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; | 11 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; |
| 10 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 12 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 11 | -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum; | 13 | +import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; |
| 12 | import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; | 14 | import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; |
| 15 | +import cn.iocoder.yudao.module.iot.service.product.IotProductService; | ||
| 13 | import io.swagger.v3.oas.annotations.Operation; | 16 | import io.swagger.v3.oas.annotations.Operation; |
| 14 | import io.swagger.v3.oas.annotations.Parameter; | 17 | import io.swagger.v3.oas.annotations.Parameter; |
| 15 | import io.swagger.v3.oas.annotations.Parameters; | 18 | import io.swagger.v3.oas.annotations.Parameters; |
| @@ -23,13 +26,12 @@ import org.springframework.web.bind.annotation.*; | @@ -23,13 +26,12 @@ import org.springframework.web.bind.annotation.*; | ||
| 23 | import org.springframework.web.multipart.MultipartFile; | 26 | import org.springframework.web.multipart.MultipartFile; |
| 24 | 27 | ||
| 25 | import java.io.IOException; | 28 | import java.io.IOException; |
| 26 | -import java.util.Arrays; | ||
| 27 | -import java.util.Collection; | ||
| 28 | -import java.util.List; | 29 | +import java.util.*; |
| 29 | 30 | ||
| 30 | import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; | 31 | import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; |
| 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 32 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 32 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; | 33 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 34 | +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; | ||
| 33 | 35 | ||
| 34 | @Tag(name = "管理后台 - IoT 设备") | 36 | @Tag(name = "管理后台 - IoT 设备") |
| 35 | @RestController | 37 | @RestController |
| @@ -39,6 +41,8 @@ public class IotDeviceController { | @@ -39,6 +41,8 @@ public class IotDeviceController { | ||
| 39 | 41 | ||
| 40 | @Resource | 42 | @Resource |
| 41 | private IotDeviceService deviceService; | 43 | private IotDeviceService deviceService; |
| 44 | + @Resource | ||
| 45 | + private IotProductService productService; | ||
| 42 | 46 | ||
| 43 | @PostMapping("/create") | 47 | @PostMapping("/create") |
| 44 | @Operation(summary = "创建设备") | 48 | @Operation(summary = "创建设备") |
| @@ -47,6 +51,7 @@ public class IotDeviceController { | @@ -47,6 +51,7 @@ public class IotDeviceController { | ||
| 47 | return success(deviceService.createDevice(createReqVO)); | 51 | return success(deviceService.createDevice(createReqVO)); |
| 48 | } | 52 | } |
| 49 | 53 | ||
| 54 | + | ||
| 50 | @PutMapping("/update") | 55 | @PutMapping("/update") |
| 51 | @Operation(summary = "更新设备") | 56 | @Operation(summary = "更新设备") |
| 52 | @PreAuthorize("@ss.hasPermission('iot:device:update')") | 57 | @PreAuthorize("@ss.hasPermission('iot:device:update')") |
| @@ -55,7 +60,57 @@ public class IotDeviceController { | @@ -55,7 +60,57 @@ public class IotDeviceController { | ||
| 55 | return success(true); | 60 | return success(true); |
| 56 | } | 61 | } |
| 57 | 62 | ||
| 58 | - // TODO @芋艿：参考阿里云：1）绑定网关；2）解绑网关 | 63 | + @PutMapping("/bind-gateway") |
| 64 | + @Operation(summary = "绑定子设备到网关") | ||
| 65 | + @PreAuthorize("@ss.hasPermission('iot:device:update')") | ||
| 66 | + public CommonResult<Boolean> bindDeviceGateway(@Valid @RequestBody IotDeviceBindGatewayReqVO reqVO) { | ||
| 67 | + deviceService.bindDeviceGateway(reqVO.getSubIds(), reqVO.getGatewayId()); | ||
| 68 | + return success(true); | ||
| 69 | + } | ||
| 70 | + | ||
| 71 | + @PutMapping("/unbind-gateway") | ||
| 72 | + @Operation(summary = "解绑子设备与网关") | ||
| 73 | + @PreAuthorize("@ss.hasPermission('iot:device:update')") | ||
| 74 | + public CommonResult<Boolean> unbindDeviceGateway(@Valid @RequestBody IotDeviceUnbindGatewayReqVO reqVO) { | ||
| 75 | + deviceService.unbindDeviceGateway(reqVO.getSubIds(), reqVO.getGatewayId()); | ||
| 76 | + return success(true); | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + @GetMapping("/sub-device-list") | ||
| 80 | + @Operation(summary = "获取网关的子设备列表") | ||
| 81 | + @Parameter(name = "gatewayId", description = "网关设备编号", required = true, example = "1") | ||
| 82 | + @PreAuthorize("@ss.hasPermission('iot:device:query')") | ||
| 83 | + public CommonResult<List<IotDeviceRespVO>> getSubDeviceList(@RequestParam("gatewayId") Long gatewayId) { | ||
| 84 | + List<IotDeviceDO> list = deviceService.getDeviceListByGatewayId(gatewayId); | ||
| 85 | + if (CollUtil.isEmpty(list)) { | ||
| 86 | + return success(Collections.emptyList()); | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + // 补充产品名称 | ||
| 90 | + Map<Long, IotProductDO> productMap = convertMap(productService.getProductList(), IotProductDO::getId); | ||
| 91 | + return success(convertList(list, device -> { | ||
| 92 | + IotDeviceRespVO respVO = BeanUtils.toBean(device, IotDeviceRespVO.class); | ||
| 93 | + MapUtils.findAndThen(productMap, device.getProductId(), | ||
| 94 | + product -> respVO.setProductName(product.getName())); | ||
| 95 | + return respVO; | ||
| 96 | + })); | ||
| 97 | + } | ||
| 98 | + | ||
| 99 | + @GetMapping("/unbound-sub-device-page") | ||
| 100 | + @Operation(summary = "获取未绑定网关的子设备分页") | ||
| 101 | + @PreAuthorize("@ss.hasPermission('iot:device:query')") | ||
| 102 | + public CommonResult<PageResult<IotDeviceRespVO>> getUnboundSubDevicePage(@Valid IotDevicePageReqVO pageReqVO) { | ||
| 103 | + PageResult<IotDeviceDO> pageResult = deviceService.getUnboundSubDevicePage(pageReqVO); | ||
| 104 | + if (CollUtil.isEmpty(pageResult.getList())) { | ||
| 105 | + return success(PageResult.empty()); | ||
| 106 | + } | ||
| 107 | + | ||
| 108 | + // 补充产品名称 | ||
| 109 | + Map<Long, IotProductDO> productMap = convertMap(productService.getProductList(), IotProductDO::getId); | ||
| 110 | + PageResult<IotDeviceRespVO> result = BeanUtils.toBean(pageResult, IotDeviceRespVO.class, device -> | ||
| 111 | + MapUtils.findAndThen(productMap, device.getProductId(), product -> device.setProductName(product.getName()))); | ||
| 112 | + return success(result); | ||
| 113 | + } | ||
| 59 | 114 | ||
| 60 | @PutMapping("/update-group") | 115 | @PutMapping("/update-group") |
| 61 | @Operation(summary = "更新设备分组") | 116 | @Operation(summary = "更新设备分组") |
| @@ -136,6 +191,26 @@ public class IotDeviceController { | @@ -136,6 +191,26 @@ public class IotDeviceController { | ||
| 136 | .setProductId(device.getProductId()).setState(device.getState()))); | 191 | .setProductId(device.getProductId()).setState(device.getState()))); |
| 137 | } | 192 | } |
| 138 | 193 | ||
| 194 | + @GetMapping("/location-list") | ||
| 195 | + @Operation(summary = "获取设备位置列表", description = "获取有经纬度信息的设备列表，用于地图展示") | ||
| 196 | + @PreAuthorize("@ss.hasPermission('iot:device:query')") | ||
| 197 | + public CommonResult<List<IotDeviceRespVO>> getDeviceLocationList() { | ||
| 198 | + // 1. 获取有位置信息的设备列表 | ||
| 199 | + List<IotDeviceDO> devices = deviceService.getDeviceListByHasLocation(); | ||
| 200 | + if (CollUtil.isEmpty(devices)) { | ||
| 201 | + return success(Collections.emptyList()); | ||
| 202 | + } | ||
| 203 | + | ||
| 204 | + // 2. 转换并返回 | ||
| 205 | + Map<Long, IotProductDO> productMap = convertMap(productService.getProductList(), IotProductDO::getId); | ||
| 206 | + return success(convertList(devices, device -> { | ||
| 207 | + IotDeviceRespVO respVO = BeanUtils.toBean(device, IotDeviceRespVO.class); | ||
| 208 | + MapUtils.findAndThen(productMap, device.getProductId(), | ||
| 209 | + product -> respVO.setProductName(product.getName())); | ||
| 210 | + return respVO; | ||
| 211 | + })); | ||
| 212 | + } | ||
| 213 | + | ||
| 139 | @PostMapping("/import") | 214 | @PostMapping("/import") |
| 140 | @Operation(summary = "导入设备") | 215 | @Operation(summary = "导入设备") |
| 141 | @PreAuthorize("@ss.hasPermission('iot:device:import')") | 216 | @PreAuthorize("@ss.hasPermission('iot:device:import')") |
| @@ -153,10 +228,9 @@ public class IotDeviceController { | @@ -153,10 +228,9 @@ public class IotDeviceController { | ||
| 153 | // 手动创建导出 demo | 228 | // 手动创建导出 demo |
| 154 | List<IotDeviceImportExcelVO> list = Arrays.asList( | 229 | List<IotDeviceImportExcelVO> list = Arrays.asList( |
| 155 | IotDeviceImportExcelVO.builder().deviceName("温度传感器001").parentDeviceName("gateway110") | 230 | IotDeviceImportExcelVO.builder().deviceName("温度传感器001").parentDeviceName("gateway110") |
| 156 | - .productKey("1de24640dfe").groupNames("灰度分组,生产分组") | ||
| 157 | - .locationType(IotLocationTypeEnum.IP.getType()).build(), | 231 | + .productKey("1de24640dfe").groupNames("灰度分组,生产分组").build(), |
| 158 | IotDeviceImportExcelVO.builder().deviceName("biubiu").productKey("YzvHxd4r67sT4s2B") | 232 | IotDeviceImportExcelVO.builder().deviceName("biubiu").productKey("YzvHxd4r67sT4s2B") |
| 159 | - .groupNames("").locationType(IotLocationTypeEnum.MANUAL.getType()).build()); | 233 | + .groupNames("").build()); |
| 160 | // 输出 | 234 | // 输出 |
| 161 | ExcelUtils.write(response, "设备导入模板.xls", "数据", IotDeviceImportExcelVO.class, list); | 235 | ExcelUtils.write(response, "设备导入模板.xls", "数据", IotDeviceImportExcelVO.class, list); |
| 162 | } | 236 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceBindGatewayReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; | ||
| 2 | + | ||
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | ||
| 4 | +import jakarta.validation.constraints.NotEmpty; | ||
| 5 | +import jakarta.validation.constraints.NotNull; | ||
| 6 | +import lombok.Data; | ||
| 7 | + | ||
| 8 | +import java.util.Set; | ||
| 9 | + | ||
| 10 | +@Schema(description = "管理后台 - IoT 设备绑定网关 Request VO") | ||
| 11 | +@Data | ||
| 12 | +public class IotDeviceBindGatewayReqVO { | ||
| 13 | + | ||
| 14 | + @Schema(description = "子设备编号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3") | ||
| 15 | + @NotEmpty(message = "子设备编号列表不能为空") | ||
| 16 | + private Set<Long> subIds; | ||
| 17 | + | ||
| 18 | + @Schema(description = "网关设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | ||
| 19 | + @NotNull(message = "网关设备编号不能为空") | ||
| 20 | + private Long gatewayId; | ||
| 21 | + | ||
| 22 | +} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
| 1 | package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; | 1 | package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; |
| 2 | 2 | ||
| 3 | import cn.idev.excel.annotation.ExcelProperty; | 3 | import cn.idev.excel.annotation.ExcelProperty; |
| 4 | -import cn.iocoder.yudao.framework.common.validation.InEnum; | ||
| 5 | -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import jakarta.validation.constraints.NotEmpty; | 5 | import jakarta.validation.constraints.NotEmpty; |
| 8 | -import jakarta.validation.constraints.NotNull; | ||
| 9 | import lombok.AllArgsConstructor; | 6 | import lombok.AllArgsConstructor; |
| 10 | import lombok.Builder; | 7 | import lombok.Builder; |
| 11 | import lombok.Data; | 8 | import lombok.Data; |
| @@ -35,9 +32,4 @@ public class IotDeviceImportExcelVO { | @@ -35,9 +32,4 @@ public class IotDeviceImportExcelVO { | ||
| 35 | @ExcelProperty("设备分组") | 32 | @ExcelProperty("设备分组") |
| 36 | private String groupNames; | 33 | private String groupNames; |
| 37 | 34 | ||
| 38 | - @ExcelProperty("上报方式(1:IP 定位， 2:设备上报，3:手动定位)") | ||
| 39 | - @NotNull(message = "上报方式不能为空") | ||
| 40 | - @InEnum(IotLocationTypeEnum.class) | ||
| 41 | - private Integer locationType; | ||
| 42 | - | ||
| 43 | } | 35 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java
| @@ -4,7 +4,6 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | @@ -4,7 +4,6 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | import cn.idev.excel.annotation.ExcelProperty; | 4 | import cn.idev.excel.annotation.ExcelProperty; |
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | -import cn.iocoder.yudao.module.iot.enums.DictTypeConstants; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 8 | import lombok.Data; |
| 10 | 9 | ||
| @@ -45,6 +44,9 @@ public class IotDeviceRespVO { | @@ -45,6 +44,9 @@ public class IotDeviceRespVO { | ||
| 45 | @ExcelProperty("产品编号") | 44 | @ExcelProperty("产品编号") |
| 46 | private Long productId; | 45 | private Long productId; |
| 47 | 46 | ||
| 47 | + @Schema(description = "产品名称", example = "温湿度传感器") | ||
| 48 | + private String productName; // 只有部分接口返回，例如 getDeviceLocationList | ||
| 49 | + | ||
| 48 | @Schema(description = "产品标识", requiredMode = Schema.RequiredMode.REQUIRED) | 50 | @Schema(description = "产品标识", requiredMode = Schema.RequiredMode.REQUIRED) |
| 49 | @ExcelProperty("产品 Key") | 51 | @ExcelProperty("产品 Key") |
| 50 | private String productKey; | 52 | private String productKey; |
| @@ -77,18 +79,9 @@ public class IotDeviceRespVO { | @@ -77,18 +79,9 @@ public class IotDeviceRespVO { | ||
| 77 | @ExcelProperty("设备密钥") | 79 | @ExcelProperty("设备密钥") |
| 78 | private String deviceSecret; | 80 | private String deviceSecret; |
| 79 | 81 | ||
| 80 | - @Schema(description = "认证类型（如一机一密、动态注册）", example = "2") | ||
| 81 | - @ExcelProperty("认证类型（如一机一密、动态注册）") | ||
| 82 | - private String authType; | ||
| 83 | - | ||
| 84 | @Schema(description = "设备配置", example = "{\"abc\": \"efg\"}") | 82 | @Schema(description = "设备配置", example = "{\"abc\": \"efg\"}") |
| 85 | private String config; | 83 | private String config; |
| 86 | 84 | ||
| 87 | - @Schema(description = "定位方式", example = "2") | ||
| 88 | - @ExcelProperty(value = "定位方式", converter = DictConvert.class) | ||
| 89 | - @DictFormat(DictTypeConstants.LOCATION_TYPE) | ||
| 90 | - private Integer locationType; | ||
| 91 | - | ||
| 92 | @Schema(description = "设备位置的纬度", example = "45.000000") | 85 | @Schema(description = "设备位置的纬度", example = "45.000000") |
| 93 | private BigDecimal latitude; | 86 | private BigDecimal latitude; |
| 94 | 87 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceSaveReqVO.java
| 1 | package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; | 1 | package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.common.validation.InEnum; | ||
| 4 | -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | +import jakarta.validation.constraints.DecimalMax; | ||
| 5 | +import jakarta.validation.constraints.DecimalMin; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| @@ -39,14 +39,14 @@ public class IotDeviceSaveReqVO { | @@ -39,14 +39,14 @@ public class IotDeviceSaveReqVO { | ||
| 39 | @Schema(description = "设备配置", example = "{\"abc\": \"efg\"}") | 39 | @Schema(description = "设备配置", example = "{\"abc\": \"efg\"}") |
| 40 | private String config; | 40 | private String config; |
| 41 | 41 | ||
| 42 | - @Schema(description = "定位类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") | ||
| 43 | - @InEnum(value = IotLocationTypeEnum.class, message = "定位方式必须是 {value}") | ||
| 44 | - private Integer locationType; | ||
| 45 | - | ||
| 46 | - @Schema(description = "设备位置的纬度", example = "16380") | 42 | + @Schema(description = "设备位置的纬度", example = "39.915") |
| 43 | + @DecimalMin(value = "-90", message = "纬度范围为 -90 到 90") | ||
| 44 | + @DecimalMax(value = "90", message = "纬度范围为 -90 到 90") | ||
| 47 | private BigDecimal latitude; | 45 | private BigDecimal latitude; |
| 48 | 46 | ||
| 49 | - @Schema(description = "设备位置的经度", example = "16380") | 47 | + @Schema(description = "设备位置的经度", example = "116.404") |
| 48 | + @DecimalMin(value = "-180", message = "经度范围为 -180 到 180") | ||
| 49 | + @DecimalMax(value = "180", message = "经度范围为 -180 到 180") | ||
| 50 | private BigDecimal longitude; | 50 | private BigDecimal longitude; |
| 51 | 51 | ||
| 52 | } | 52 | } |
| 53 | \ No newline at end of file | 53 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceUnbindGatewayReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; | ||
| 2 | + | ||
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | ||
| 4 | +import jakarta.validation.constraints.NotEmpty; | ||
| 5 | +import jakarta.validation.constraints.NotNull; | ||
| 6 | +import lombok.Data; | ||
| 7 | + | ||
| 8 | +import java.util.Set; | ||
| 9 | + | ||
| 10 | +@Schema(description = "管理后台 - IoT 设备解绑网关 Request VO") | ||
| 11 | +@Data | ||
| 12 | +public class IotDeviceUnbindGatewayReqVO { | ||
| 13 | + | ||
| 14 | + @Schema(description = "子设备编号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3") | ||
| 15 | + @NotEmpty(message = "子设备编号列表不能为空") | ||
| 16 | + private Set<Long> subIds; | ||
| 17 | + | ||
| 18 | + @Schema(description = "网关设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | ||
| 19 | + @NotNull(message = "网关设备编号不能为空") | ||
| 20 | + private Long gatewayId; | ||
| 21 | + | ||
| 22 | +} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
| @@ -143,11 +143,13 @@ public class IotProductController { | @@ -143,11 +143,13 @@ public class IotProductController { | ||
| 143 | 143 | ||
| 144 | @GetMapping("/simple-list") | 144 | @GetMapping("/simple-list") |
| 145 | @Operation(summary = "获取产品的精简信息列表", description = "主要用于前端的下拉选项") | 145 | @Operation(summary = "获取产品的精简信息列表", description = "主要用于前端的下拉选项") |
| 146 | - public CommonResult<List<IotProductRespVO>> getProductSimpleList() { | ||
| 147 | - List<IotProductDO> list = productService.getProductList(); | ||
| 148 | - return success(convertList(list, product -> // 只返回 id、name 字段 | 146 | + @Parameter(name = "deviceType", description = "设备类型", example = "1") |
| 147 | + public CommonResult<List<IotProductRespVO>> getProductSimpleList( | ||
| 148 | + @RequestParam(value = "deviceType", required = false) Integer deviceType) { | ||
| 149 | + List<IotProductDO> list = productService.getProductList(deviceType); | ||
| 150 | + return success(convertList(list, product -> // 只返回 id、name、productKey 字段 | ||
| 149 | new IotProductRespVO().setId(product.getId()).setName(product.getName()).setStatus(product.getStatus()) | 151 | new IotProductRespVO().setId(product.getId()).setName(product.getName()).setStatus(product.getStatus()) |
| 150 | - .setDeviceType(product.getDeviceType()).setLocationType(product.getLocationType()))); | 152 | + .setDeviceType(product.getDeviceType()).setProductKey(product.getProductKey()))); |
| 151 | } | 153 | } |
| 152 | 154 | ||
| 153 | } | 155 | } |
| 154 | \ No newline at end of file | 156 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java
| @@ -27,6 +27,12 @@ public class IotProductRespVO { | @@ -27,6 +27,12 @@ public class IotProductRespVO { | ||
| 27 | @ExcelProperty("产品标识") | 27 | @ExcelProperty("产品标识") |
| 28 | private String productKey; | 28 | private String productKey; |
| 29 | 29 | ||
| 30 | + @Schema(description = "产品密钥", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 31 | + private String productSecret; | ||
| 32 | + | ||
| 33 | + @Schema(description = "是否开启动态注册", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") | ||
| 34 | + private Boolean registerEnabled; | ||
| 35 | + | ||
| 30 | @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 36 | @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 31 | private Long categoryId; | 37 | private Long categoryId; |
| 32 | 38 | ||
| @@ -61,11 +67,6 @@ public class IotProductRespVO { | @@ -61,11 +67,6 @@ public class IotProductRespVO { | ||
| 61 | @DictFormat(DictTypeConstants.NET_TYPE) | 67 | @DictFormat(DictTypeConstants.NET_TYPE) |
| 62 | private Integer netType; | 68 | private Integer netType; |
| 63 | 69 | ||
| 64 | - @Schema(description = "定位方式", example = "2") | ||
| 65 | - @ExcelProperty(value = "定位方式", converter = DictConvert.class) | ||
| 66 | - @DictFormat(DictTypeConstants.LOCATION_TYPE) | ||
| 67 | - private Integer locationType; | ||
| 68 | - | ||
| 69 | @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") | 70 | @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") |
| 70 | @ExcelProperty(value = "数据格式", converter = DictConvert.class) | 71 | @ExcelProperty(value = "数据格式", converter = DictConvert.class) |
| 71 | @DictFormat(DictTypeConstants.CODEC_TYPE) | 72 | @DictFormat(DictTypeConstants.CODEC_TYPE) |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductSaveReqVO.java
| 1 | package cn.iocoder.yudao.module.iot.controller.admin.product.vo.product; | 1 | package cn.iocoder.yudao.module.iot.controller.admin.product.vo.product; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 3 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| 4 | -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum; | ||
| 5 | import cn.iocoder.yudao.module.iot.enums.product.IotNetTypeEnum; | 4 | import cn.iocoder.yudao.module.iot.enums.product.IotNetTypeEnum; |
| 6 | import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum; | 5 | import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum; |
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| @@ -45,12 +44,12 @@ public class IotProductSaveReqVO { | @@ -45,12 +44,12 @@ public class IotProductSaveReqVO { | ||
| 45 | @InEnum(value = IotNetTypeEnum.class, message = "联网方式必须是 {value}") | 44 | @InEnum(value = IotNetTypeEnum.class, message = "联网方式必须是 {value}") |
| 46 | private Integer netType; | 45 | private Integer netType; |
| 47 | 46 | ||
| 48 | - @Schema(description = "定位类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") | ||
| 49 | - @InEnum(value = IotLocationTypeEnum.class, message = "定位方式必须是 {value}") | ||
| 50 | - private Integer locationType; | ||
| 51 | - | ||
| 52 | @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") | 47 | @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") |
| 53 | @NotEmpty(message = "数据格式不能为空") | 48 | @NotEmpty(message = "数据格式不能为空") |
| 54 | private String codecType; | 49 | private String codecType; |
| 55 | 50 | ||
| 51 | + @Schema(description = "是否开启动态注册", example = "false") | ||
| 52 | + @NotNull(message = "是否开启动态注册不能为空") | ||
| 53 | + private Boolean registerEnabled; | ||
| 54 | + | ||
| 56 | } | 55 | } |
| 57 | \ No newline at end of file | 56 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/data/sink/IotDataSinkPageReqVO.java
| @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.data.sink; | @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.data.sink; | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 5 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 5 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| 6 | +import cn.iocoder.yudao.module.iot.enums.rule.IotDataSinkTypeEnum; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 8 | import lombok.Data; |
| 8 | import org.springframework.format.annotation.DateTimeFormat; | 9 | import org.springframework.format.annotation.DateTimeFormat; |
| @@ -22,6 +23,10 @@ public class IotDataSinkPageReqVO extends PageParam { | @@ -22,6 +23,10 @@ public class IotDataSinkPageReqVO extends PageParam { | ||
| 22 | @InEnum(CommonStatusEnum.class) | 23 | @InEnum(CommonStatusEnum.class) |
| 23 | private Integer status; | 24 | private Integer status; |
| 24 | 25 | ||
| 26 | + @Schema(description = "数据目的类型", example = "1") | ||
| 27 | + @InEnum(IotDataSinkTypeEnum.class) | ||
| 28 | + private Integer type; | ||
| 29 | + | ||
| 25 | @Schema(description = "创建时间") | 30 | @Schema(description = "创建时间") |
| 26 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 31 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 27 | private LocalDateTime[] createTime; | 32 | private LocalDateTime[] createTime; |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java
| @@ -123,19 +123,8 @@ public class IotDeviceDO extends TenantBaseDO { | @@ -123,19 +123,8 @@ public class IotDeviceDO extends TenantBaseDO { | ||
| 123 | * 设备密钥，用于设备认证 | 123 | * 设备密钥，用于设备认证 |
| 124 | */ | 124 | */ |
| 125 | private String deviceSecret; | 125 | private String deviceSecret; |
| 126 | - /** | ||
| 127 | - * 认证类型（如一机一密、动态注册） | ||
| 128 | - */ | ||
| 129 | - // TODO @haohao：是不是要枚举哈 | ||
| 130 | - private String authType; | ||
| 131 | 126 | ||
| 132 | /** | 127 | /** |
| 133 | - * 定位方式 | ||
| 134 | - * <p> | ||
| 135 | - * 枚举 {@link cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum} | ||
| 136 | - */ | ||
| 137 | - private Integer locationType; | ||
| 138 | - /** | ||
| 139 | * 设备位置的纬度 | 128 | * 设备位置的纬度 |
| 140 | */ | 129 | */ |
| 141 | private BigDecimal latitude; | 130 | private BigDecimal latitude; |
| @@ -143,16 +132,6 @@ public class IotDeviceDO extends TenantBaseDO { | @@ -143,16 +132,6 @@ public class IotDeviceDO extends TenantBaseDO { | ||
| 143 | * 设备位置的经度 | 132 | * 设备位置的经度 |
| 144 | */ | 133 | */ |
| 145 | private BigDecimal longitude; | 134 | private BigDecimal longitude; |
| 146 | - /** | ||
| 147 | - * 地区编码 | ||
| 148 | - * <p> | ||
| 149 | - * 关联 Area 的 id | ||
| 150 | - */ | ||
| 151 | - private Integer areaId; | ||
| 152 | - /** | ||
| 153 | - * 设备详细地址 | ||
| 154 | - */ | ||
| 155 | - private String address; | ||
| 156 | 135 | ||
| 157 | /** | 136 | /** |
| 158 | * 设备配置 | 137 | * 设备配置 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductDO.java
| @@ -33,6 +33,14 @@ public class IotProductDO extends TenantBaseDO { | @@ -33,6 +33,14 @@ public class IotProductDO extends TenantBaseDO { | ||
| 33 | */ | 33 | */ |
| 34 | private String productKey; | 34 | private String productKey; |
| 35 | /** | 35 | /** |
| 36 | + * 产品密钥，用于一型一密动态注册 | ||
| 37 | + */ | ||
| 38 | + private String productSecret; | ||
| 39 | + /** | ||
| 40 | + * 是否开启动态注册 | ||
| 41 | + */ | ||
| 42 | + private Boolean registerEnabled; | ||
| 43 | + /** | ||
| 36 | * 产品分类编号 | 44 | * 产品分类编号 |
| 37 | * <p> | 45 | * <p> |
| 38 | * 关联 {@link IotProductCategoryDO#getId()} | 46 | * 关联 {@link IotProductCategoryDO#getId()} |
| @@ -70,12 +78,6 @@ public class IotProductDO extends TenantBaseDO { | @@ -70,12 +78,6 @@ public class IotProductDO extends TenantBaseDO { | ||
| 70 | */ | 78 | */ |
| 71 | private Integer netType; | 79 | private Integer netType; |
| 72 | /** | 80 | /** |
| 73 | - * 定位方式 | ||
| 74 | - * <p> | ||
| 75 | - * 枚举 {@link cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum} | ||
| 76 | - */ | ||
| 77 | - private Integer locationType; | ||
| 78 | - /** | ||
| 79 | * 数据格式（编解码器类型） | 81 | * 数据格式（编解码器类型） |
| 80 | * <p> | 82 | * <p> |
| 81 | * 字典 {@link cn.iocoder.yudao.module.iot.enums.DictTypeConstants#CODEC_TYPE} | 83 | * 字典 {@link cn.iocoder.yudao.module.iot.enums.DictTypeConstants#CODEC_TYPE} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
| @@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | @@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | ||
| 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 7 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.IotDevicePageReqVO; | 7 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.IotDevicePageReqVO; |
| 8 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 8 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 9 | +import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum; | ||
| 9 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 10 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 11 | +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | ||
| 10 | import jakarta.annotation.Nullable; | 12 | import jakarta.annotation.Nullable; |
| 11 | import org.apache.ibatis.annotations.Mapper; | 13 | import org.apache.ibatis.annotations.Mapper; |
| 12 | 14 | ||
| @@ -118,4 +120,56 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> { | @@ -118,4 +120,56 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> { | ||
| 118 | )); | 120 | )); |
| 119 | } | 121 | } |
| 120 | 122 | ||
| 123 | + /** | ||
| 124 | + * 查询有位置信息的设备列表 | ||
| 125 | + * | ||
| 126 | + * @return 设备列表 | ||
| 127 | + */ | ||
| 128 | + default List<IotDeviceDO> selectListByHasLocation() { | ||
| 129 | + return selectList(new LambdaQueryWrapperX<IotDeviceDO>() | ||
| 130 | + .isNotNull(IotDeviceDO::getLatitude) | ||
| 131 | + .isNotNull(IotDeviceDO::getLongitude)); | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + // ========== 网关-子设备绑定相关 ========== | ||
| 135 | + | ||
| 136 | + /** | ||
| 137 | + * 根据网关编号查询子设备列表 | ||
| 138 | + * | ||
| 139 | + * @param gatewayId 网关设备编号 | ||
| 140 | + * @return 子设备列表 | ||
| 141 | + */ | ||
| 142 | + default List<IotDeviceDO> selectListByGatewayId(Long gatewayId) { | ||
| 143 | + return selectList(IotDeviceDO::getGatewayId, gatewayId); | ||
| 144 | + } | ||
| 145 | + | ||
| 146 | + /** | ||
| 147 | + * 分页查询未绑定网关的子设备 | ||
| 148 | + * | ||
| 149 | + * @param reqVO 分页查询参数 | ||
| 150 | + * @return 子设备分页 | ||
| 151 | + */ | ||
| 152 | + default PageResult<IotDeviceDO> selectUnboundSubDevicePage(IotDevicePageReqVO reqVO) { | ||
| 153 | + return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceDO>() | ||
| 154 | + .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName()) | ||
| 155 | + .likeIfPresent(IotDeviceDO::getNickname, reqVO.getNickname()) | ||
| 156 | + .eqIfPresent(IotDeviceDO::getProductId, reqVO.getProductId()) | ||
| 157 | + // 仅查询子设备 + 未绑定网关 | ||
| 158 | + .eq(IotDeviceDO::getDeviceType, IotProductDeviceTypeEnum.GATEWAY_SUB.getType()) | ||
| 159 | + .isNull(IotDeviceDO::getGatewayId) | ||
| 160 | + .orderByDesc(IotDeviceDO::getId)); | ||
| 161 | + } | ||
| 162 | + | ||
| 163 | + /** | ||
| 164 | + * 批量更新设备的网关编号 | ||
| 165 | + * | ||
| 166 | + * @param ids 设备编号列表 | ||
| 167 | + * @param gatewayId 网关设备编号（可以为 null，表示解绑） | ||
| 168 | + */ | ||
| 169 | + default void updateGatewayIdBatch(Collection<Long> ids, Long gatewayId) { | ||
| 170 | + update(null, new LambdaUpdateWrapper<IotDeviceDO>() | ||
| 171 | + .set(IotDeviceDO::getGatewayId, gatewayId) | ||
| 172 | + .in(IotDeviceDO::getId, ids)); | ||
| 173 | + } | ||
| 174 | + | ||
| 121 | } | 175 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java
| @@ -27,6 +27,12 @@ public interface IotProductMapper extends BaseMapperX<IotProductDO> { | @@ -27,6 +27,12 @@ public interface IotProductMapper extends BaseMapperX<IotProductDO> { | ||
| 27 | .orderByDesc(IotProductDO::getId)); | 27 | .orderByDesc(IotProductDO::getId)); |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | + default List<IotProductDO> selectList(Integer deviceType) { | ||
| 31 | + return selectList(new LambdaQueryWrapperX<IotProductDO>() | ||
| 32 | + .eqIfPresent(IotProductDO::getDeviceType, deviceType) | ||
| 33 | + .orderByDesc(IotProductDO::getId)); | ||
| 34 | + } | ||
| 35 | + | ||
| 30 | default IotProductDO selectByProductKey(String productKey) { | 36 | default IotProductDO selectByProductKey(String productKey) { |
| 31 | return selectOne(new LambdaQueryWrapper<IotProductDO>() | 37 | return selectOne(new LambdaQueryWrapper<IotProductDO>() |
| 32 | .apply("LOWER(product_key) = {0}", productKey.toLowerCase())); | 38 | .apply("LOWER(product_key) = {0}", productKey.toLowerCase())); |
| @@ -37,5 +43,4 @@ public interface IotProductMapper extends BaseMapperX<IotProductDO> { | @@ -37,5 +43,4 @@ public interface IotProductMapper extends BaseMapperX<IotProductDO> { | ||
| 37 | .geIfPresent(IotProductDO::getCreateTime, createTime)); | 43 | .geIfPresent(IotProductDO::getCreateTime, createTime)); |
| 38 | } | 44 | } |
| 39 | 45 | ||
| 40 | - | ||
| 41 | } | 46 | } |
| 42 | \ No newline at end of file | 47 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataRuleMapper.java
| @@ -35,4 +35,8 @@ public interface IotDataRuleMapper extends BaseMapperX<IotDataRuleDO> { | @@ -35,4 +35,8 @@ public interface IotDataRuleMapper extends BaseMapperX<IotDataRuleDO> { | ||
| 35 | return selectList(IotDataRuleDO::getStatus, status); | 35 | return selectList(IotDataRuleDO::getStatus, status); |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | + default IotDataRuleDO selectByName(String name) { | ||
| 39 | + return selectOne(IotDataRuleDO::getName, name); | ||
| 40 | + } | ||
| 41 | + | ||
| 38 | } | 42 | } |
| 39 | \ No newline at end of file | 43 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataSinkMapper.java
| @@ -21,6 +21,7 @@ public interface IotDataSinkMapper extends BaseMapperX<IotDataSinkDO> { | @@ -21,6 +21,7 @@ public interface IotDataSinkMapper extends BaseMapperX<IotDataSinkDO> { | ||
| 21 | return selectPage(reqVO, new LambdaQueryWrapperX<IotDataSinkDO>() | 21 | return selectPage(reqVO, new LambdaQueryWrapperX<IotDataSinkDO>() |
| 22 | .likeIfPresent(IotDataSinkDO::getName, reqVO.getName()) | 22 | .likeIfPresent(IotDataSinkDO::getName, reqVO.getName()) |
| 23 | .eqIfPresent(IotDataSinkDO::getStatus, reqVO.getStatus()) | 23 | .eqIfPresent(IotDataSinkDO::getStatus, reqVO.getStatus()) |
| 24 | + .eqIfPresent(IotDataSinkDO::getType, reqVO.getType()) | ||
| 24 | .betweenIfPresent(IotDataSinkDO::getCreateTime, reqVO.getCreateTime()) | 25 | .betweenIfPresent(IotDataSinkDO::getCreateTime, reqVO.getCreateTime()) |
| 25 | .orderByDesc(IotDataSinkDO::getId)); | 26 | .orderByDesc(IotDataSinkDO::getId)); |
| 26 | } | 27 | } |
| @@ -29,4 +30,8 @@ public interface IotDataSinkMapper extends BaseMapperX<IotDataSinkDO> { | @@ -29,4 +30,8 @@ public interface IotDataSinkMapper extends BaseMapperX<IotDataSinkDO> { | ||
| 29 | return selectList(IotDataSinkDO::getStatus, status); | 30 | return selectList(IotDataSinkDO::getStatus, status); |
| 30 | } | 31 | } |
| 31 | 32 | ||
| 33 | + default IotDataSinkDO selectByName(String name) { | ||
| 34 | + return selectOne(IotDataSinkDO::getName, name); | ||
| 35 | + } | ||
| 36 | + | ||
| 32 | } | 37 | } |
| 33 | \ No newline at end of file | 38 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/redis/RedisKeyConstants.java
| @@ -84,4 +84,12 @@ public interface RedisKeyConstants { | @@ -84,4 +84,12 @@ public interface RedisKeyConstants { | ||
| 84 | */ | 84 | */ |
| 85 | String SCENE_RULE_LIST = "iot:scene_rule_list"; | 85 | String SCENE_RULE_LIST = "iot:scene_rule_list"; |
| 86 | 86 | ||
| 87 | + /** | ||
| 88 | + * WebSocket 连接分布式锁 | ||
| 89 | + * <p> | ||
| 90 | + * KEY 格式：websocket_connect_lock:${serverUrl} | ||
| 91 | + * 用于保证 WebSocket 重连操作的线程安全 | ||
| 92 | + */ | ||
| 93 | + String WEBSOCKET_CONNECT_LOCK = "iot:websocket_connect_lock:%s"; | ||
| 94 | + | ||
| 87 | } | 95 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
| @@ -26,13 +26,26 @@ public interface ErrorCodeConstants { | @@ -26,13 +26,26 @@ public interface ErrorCodeConstants { | ||
| 26 | // ========== 设备 1-050-003-000 ============ | 26 | // ========== 设备 1-050-003-000 ============ |
| 27 | ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_050_003_000, "设备不存在"); | 27 | ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_050_003_000, "设备不存在"); |
| 28 | ErrorCode DEVICE_NAME_EXISTS = new ErrorCode(1_050_003_001, "设备名称在同一产品下必须唯一"); | 28 | ErrorCode DEVICE_NAME_EXISTS = new ErrorCode(1_050_003_001, "设备名称在同一产品下必须唯一"); |
| 29 | - ErrorCode DEVICE_HAS_CHILDREN = new ErrorCode(1_050_003_002, "有子设备，不允许删除"); | 29 | + ErrorCode DEVICE_GATEWAY_HAS_SUB = new ErrorCode(1_050_003_002, "网关设备存在已绑定的子设备，不允许删除"); |
| 30 | ErrorCode DEVICE_KEY_EXISTS = new ErrorCode(1_050_003_003, "设备标识已经存在"); | 30 | ErrorCode DEVICE_KEY_EXISTS = new ErrorCode(1_050_003_003, "设备标识已经存在"); |
| 31 | ErrorCode DEVICE_GATEWAY_NOT_EXISTS = new ErrorCode(1_050_003_004, "网关设备不存在"); | 31 | ErrorCode DEVICE_GATEWAY_NOT_EXISTS = new ErrorCode(1_050_003_004, "网关设备不存在"); |
| 32 | ErrorCode DEVICE_NOT_GATEWAY = new ErrorCode(1_050_003_005, "设备不是网关设备"); | 32 | ErrorCode DEVICE_NOT_GATEWAY = new ErrorCode(1_050_003_005, "设备不是网关设备"); |
| 33 | ErrorCode DEVICE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_050_003_006, "导入设备数据不能为空！"); | 33 | ErrorCode DEVICE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_050_003_006, "导入设备数据不能为空！"); |
| 34 | ErrorCode DEVICE_DOWNSTREAM_FAILED_SERVER_ID_NULL = new ErrorCode(1_050_003_007, "下行设备消息失败，原因：设备未连接网关"); | 34 | ErrorCode DEVICE_DOWNSTREAM_FAILED_SERVER_ID_NULL = new ErrorCode(1_050_003_007, "下行设备消息失败，原因：设备未连接网关"); |
| 35 | ErrorCode DEVICE_SERIAL_NUMBER_EXISTS = new ErrorCode(1_050_003_008, "设备序列号已存在，序列号必须全局唯一"); | 35 | ErrorCode DEVICE_SERIAL_NUMBER_EXISTS = new ErrorCode(1_050_003_008, "设备序列号已存在，序列号必须全局唯一"); |
| 36 | + ErrorCode DEVICE_NOT_GATEWAY_SUB = new ErrorCode(1_050_003_009, "设备【{}/{}】不是网关子设备类型，无法绑定到网关"); | ||
| 37 | + ErrorCode DEVICE_GATEWAY_BINDTO_EXISTS = new ErrorCode(1_050_003_010, "设备【{}/{}】已绑定到其他网关，请先解绑"); | ||
| 38 | + // 拓扑管理相关错误码 1-050-003-100 | ||
| 39 | + ErrorCode DEVICE_TOPO_PARAMS_INVALID = new ErrorCode(1_050_003_100, "拓扑管理参数无效"); | ||
| 40 | + ErrorCode DEVICE_TOPO_SUB_DEVICE_USERNAME_INVALID = new ErrorCode(1_050_003_101, "子设备用户名格式无效"); | ||
| 41 | + ErrorCode DEVICE_TOPO_SUB_DEVICE_AUTH_FAILED = new ErrorCode(1_050_003_102, "子设备认证失败"); | ||
| 42 | + ErrorCode DEVICE_TOPO_SUB_NOT_BINDTO_GATEWAY = new ErrorCode(1_050_003_103, "子设备【{}/{}】未绑定到该网关"); | ||
| 43 | + // 设备注册相关错误码 1-050-003-200 | ||
| 44 | + ErrorCode DEVICE_SUB_REGISTER_PARAMS_INVALID = new ErrorCode(1_050_003_200, "子设备注册参数无效"); | ||
| 45 | + ErrorCode DEVICE_SUB_REGISTER_PRODUCT_NOT_GATEWAY_SUB = new ErrorCode(1_050_003_201, "产品【{}】不是网关子设备类型"); | ||
| 46 | + ErrorCode DEVICE_REGISTER_DISABLED = new ErrorCode(1_050_003_210, "该产品未开启动态注册功能"); | ||
| 47 | + ErrorCode DEVICE_REGISTER_SECRET_INVALID = new ErrorCode(1_050_003_211, "产品密钥验证失败"); | ||
| 48 | + ErrorCode DEVICE_REGISTER_ALREADY_EXISTS = new ErrorCode(1_050_003_212, "设备已存在，不允许重复注册"); | ||
| 36 | 49 | ||
| 37 | // ========== 产品分类 1-050-004-000 ========== | 50 | // ========== 产品分类 1-050-004-000 ========== |
| 38 | ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_050_004_000, "产品分类不存在"); | 51 | ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_050_004_000, "产品分类不存在"); |
| @@ -73,10 +86,12 @@ public interface ErrorCodeConstants { | @@ -73,10 +86,12 @@ public interface ErrorCodeConstants { | ||
| 73 | 86 | ||
| 74 | // ========== IoT 数据流转规则 1-050-010-000 ========== | 87 | // ========== IoT 数据流转规则 1-050-010-000 ========== |
| 75 | ErrorCode DATA_RULE_NOT_EXISTS = new ErrorCode(1_050_010_000, "数据流转规则不存在"); | 88 | ErrorCode DATA_RULE_NOT_EXISTS = new ErrorCode(1_050_010_000, "数据流转规则不存在"); |
| 89 | + ErrorCode DATA_RULE_NAME_EXISTS = new ErrorCode(1_050_010_001, "数据流转规则名称已存在"); | ||
| 76 | 90 | ||
| 77 | // ========== IoT 数据流转目的 1-050-011-000 ========== | 91 | // ========== IoT 数据流转目的 1-050-011-000 ========== |
| 78 | ErrorCode DATA_SINK_NOT_EXISTS = new ErrorCode(1_050_011_000, "数据桥梁不存在"); | 92 | ErrorCode DATA_SINK_NOT_EXISTS = new ErrorCode(1_050_011_000, "数据桥梁不存在"); |
| 79 | ErrorCode DATA_SINK_DELETE_FAIL_USED_BY_RULE = new ErrorCode(1_050_011_001, "数据流转目的正在被数据流转规则使用，无法删除"); | 93 | ErrorCode DATA_SINK_DELETE_FAIL_USED_BY_RULE = new ErrorCode(1_050_011_001, "数据流转目的正在被数据流转规则使用，无法删除"); |
| 94 | + ErrorCode DATA_SINK_NAME_EXISTS = new ErrorCode(1_050_011_002, "数据流转目的名称已存在"); | ||
| 80 | 95 | ||
| 81 | // ========== IoT 场景联动 1-050-012-000 ========== | 96 | // ========== IoT 场景联动 1-050-012-000 ========== |
| 82 | ErrorCode RULE_SCENE_NOT_EXISTS = new ErrorCode(1_050_012_000, "场景联动不存在"); | 97 | ErrorCode RULE_SCENE_NOT_EXISTS = new ErrorCode(1_050_012_000, "场景联动不存在"); |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/device/IotDeviceMessageIdentifierEnum.java deleted
| 1 | -package cn.iocoder.yudao.module.iot.enums.device; | ||
| 2 | - | ||
| 3 | -import lombok.Getter; | ||
| 4 | -import lombok.RequiredArgsConstructor; | ||
| 5 | - | ||
| 6 | -// TODO @芋艿：需要添加对应的 DTO，以及上下行的链路，网关、网关服务、设备等 | ||
| 7 | -/** | ||
| 8 | - * IoT 设备消息标识符枚举 | ||
| 9 | - */ | ||
| 10 | -@Deprecated | ||
| 11 | -@Getter | ||
| 12 | -@RequiredArgsConstructor | ||
| 13 | -public enum IotDeviceMessageIdentifierEnum { | ||
| 14 | - | ||
| 15 | - PROPERTY_GET("get"), // 下行 | ||
| 16 | - PROPERTY_SET("set"), // 下行 | ||
| 17 | - PROPERTY_REPORT("report"), // 上行 | ||
| 18 | - | ||
| 19 | - STATE_ONLINE("online"), // 上行 | ||
| 20 | - STATE_OFFLINE("offline"), // 上行 | ||
| 21 | - | ||
| 22 | - CONFIG_GET("get"), // 上行 TODO 芋艿：【讨论】暂时没有上行的场景 | ||
| 23 | - CONFIG_SET("set"), // 下行 | ||
| 24 | - | ||
| 25 | - SERVICE_INVOKE("${identifier}"), // 下行 | ||
| 26 | - SERVICE_REPLY_SUFFIX("_reply"), // 芋艿：TODO 芋艿：【讨论】上行 or 下行 | ||
| 27 | - | ||
| 28 | - OTA_UPGRADE("upgrade"), // 下行 | ||
| 29 | - OTA_PULL("pull"), // 上行 | ||
| 30 | - OTA_PROGRESS("progress"), // 上行 | ||
| 31 | - OTA_REPORT("report"), // 上行 | ||
| 32 | - | ||
| 33 | - REGISTER_REGISTER("register"), // 上行 | ||
| 34 | - REGISTER_REGISTER_SUB("register_sub"), // 上行 | ||
| 35 | - REGISTER_UNREGISTER_SUB("unregister_sub"), // 下行 | ||
| 36 | - | ||
| 37 | - TOPOLOGY_ADD("topology_add"), // 下行; | ||
| 38 | - ; | ||
| 39 | - | ||
| 40 | - /** | ||
| 41 | - * 标志符 | ||
| 42 | - */ | ||
| 43 | - private final String identifier; | ||
| 44 | - | ||
| 45 | -} | ||
| 46 | \ No newline at end of file | 0 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/device/IotDeviceMessageTypeEnum.java deleted
| 1 | -package cn.iocoder.yudao.module.iot.enums.device; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 4 | -import lombok.Getter; | ||
| 5 | -import lombok.RequiredArgsConstructor; | ||
| 6 | - | ||
| 7 | -import java.util.Arrays; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * IoT 设备消息类型枚举 | ||
| 11 | - */ | ||
| 12 | -@Deprecated | ||
| 13 | -@Getter | ||
| 14 | -@RequiredArgsConstructor | ||
| 15 | -public enum IotDeviceMessageTypeEnum implements ArrayValuable<String> { | ||
| 16 | - | ||
| 17 | - STATE("state"), // 设备状态 | ||
| 18 | - PROPERTY("property"), // 设备属性：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 19 | - EVENT("event"), // 设备事件：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 20 | - SERVICE("service"), // 设备服务：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 21 | - CONFIG("config"), // 设备配置：可参考 https://help.aliyun.com/zh/iot/user-guide/remote-configuration-1 远程配置 | ||
| 22 | - OTA("ota"), // 设备 OTA：可参考 https://help.aliyun.com/zh/iot/user-guide/ota-update OTA 升级 | ||
| 23 | - REGISTER("register"), // 设备注册：可参考 https://help.aliyun.com/zh/iot/user-guide/register-devices 设备身份注册 | ||
| 24 | - TOPOLOGY("topology"),; // 设备拓扑：可参考 https://help.aliyun.com/zh/iot/user-guide/manage-topological-relationships 设备拓扑 | ||
| 25 | - | ||
| 26 | - public static final String[] ARRAYS = Arrays.stream(values()).map(IotDeviceMessageTypeEnum::getType).toArray(String[]::new); | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * 属性 | ||
| 30 | - */ | ||
| 31 | - private final String type; | ||
| 32 | - | ||
| 33 | - @Override | ||
| 34 | - public String[] array() { | ||
| 35 | - return ARRAYS; | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | -} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java deleted
| 1 | -package cn.iocoder.yudao.module.iot.enums.product; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 4 | -import lombok.AllArgsConstructor; | ||
| 5 | -import lombok.Getter; | ||
| 6 | - | ||
| 7 | -import java.util.Arrays; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * IoT 定位方式枚举类 | ||
| 11 | - * | ||
| 12 | - * @author alwayssuper | ||
| 13 | - */ | ||
| 14 | -@AllArgsConstructor | ||
| 15 | -@Getter | ||
| 16 | -public enum IotLocationTypeEnum implements ArrayValuable<Integer> { | ||
| 17 | - | ||
| 18 | - IP(1, "IP 定位"), | ||
| 19 | - DEVICE(2, "设备上报"), | ||
| 20 | - MANUAL(3, "手动定位"); | ||
| 21 | - | ||
| 22 | - public static final Integer[] ARRAYS = Arrays.stream(values()).map(IotLocationTypeEnum::getType).toArray(Integer[]::new); | ||
| 23 | - | ||
| 24 | - /** | ||
| 25 | - * 类型 | ||
| 26 | - */ | ||
| 27 | - private final Integer type; | ||
| 28 | - /** | ||
| 29 | - * 描述 | ||
| 30 | - */ | ||
| 31 | - private final String description; | ||
| 32 | - | ||
| 33 | - @Override | ||
| 34 | - public Integer[] array() { | ||
| 35 | - return ARRAYS; | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | -} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
| @@ -3,11 +3,19 @@ package cn.iocoder.yudao.module.iot.service.device; | @@ -3,11 +3,19 @@ package cn.iocoder.yudao.module.iot.service.device; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; | 4 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; |
| 5 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; | 5 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; |
| 6 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotSubDeviceRegisterFullReqDTO; | ||
| 6 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; | 7 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; |
| 8 | +import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | ||
| 9 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 10 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO; | ||
| 11 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO; | ||
| 12 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterRespDTO; | ||
| 13 | +import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoGetRespDTO; | ||
| 7 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 14 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 8 | import jakarta.validation.Valid; | 15 | import jakarta.validation.Valid; |
| 9 | 16 | ||
| 10 | import javax.annotation.Nullable; | 17 | import javax.annotation.Nullable; |
| 18 | +import java.math.BigDecimal; | ||
| 11 | import java.time.LocalDateTime; | 19 | import java.time.LocalDateTime; |
| 12 | import java.util.Collection; | 20 | import java.util.Collection; |
| 13 | import java.util.List; | 21 | import java.util.List; |
| @@ -37,18 +45,6 @@ public interface IotDeviceService { | @@ -37,18 +45,6 @@ public interface IotDeviceService { | ||
| 37 | */ | 45 | */ |
| 38 | void updateDevice(@Valid IotDeviceSaveReqVO updateReqVO); | 46 | void updateDevice(@Valid IotDeviceSaveReqVO updateReqVO); |
| 39 | 47 | ||
| 40 | - // TODO @芋艿：先这么实现。未来看情况，要不要自己实现 | ||
| 41 | - | ||
| 42 | - /** | ||
| 43 | - * 更新设备的所属网关 | ||
| 44 | - * | ||
| 45 | - * @param id 编号 | ||
| 46 | - * @param gatewayId 网关设备 ID | ||
| 47 | - */ | ||
| 48 | - default void updateDeviceGateway(Long id, Long gatewayId) { | ||
| 49 | - updateDevice(new IotDeviceSaveReqVO().setId(id).setGatewayId(gatewayId)); | ||
| 50 | - } | ||
| 51 | - | ||
| 52 | /** | 48 | /** |
| 53 | * 更新设备状态 | 49 | * 更新设备状态 |
| 54 | * | 50 | * |
| @@ -271,4 +267,112 @@ public interface IotDeviceService { | @@ -271,4 +267,112 @@ public interface IotDeviceService { | ||
| 271 | */ | 267 | */ |
| 272 | void updateDeviceFirmware(Long deviceId, Long firmwareId); | 268 | void updateDeviceFirmware(Long deviceId, Long firmwareId); |
| 273 | 269 | ||
| 270 | + /** | ||
| 271 | + * 更新设备定位信息（GeoLocation 上报时调用） | ||
| 272 | + * | ||
| 273 | + * @param device 设备信息（用于清除缓存） | ||
| 274 | + * @param longitude 经度 | ||
| 275 | + * @param latitude 纬度 | ||
| 276 | + */ | ||
| 277 | + void updateDeviceLocation(IotDeviceDO device, BigDecimal longitude, BigDecimal latitude); | ||
| 278 | + | ||
| 279 | + /** | ||
| 280 | + * 获得有位置信息的设备列表 | ||
| 281 | + * | ||
| 282 | + * @return 设备列表 | ||
| 283 | + */ | ||
| 284 | + List<IotDeviceDO> getDeviceListByHasLocation(); | ||
| 285 | + | ||
| 286 | + // ========== 网关-拓扑管理（后台操作） ========== | ||
| 287 | + | ||
| 288 | + /** | ||
| 289 | + * 绑定子设备到网关 | ||
| 290 | + * | ||
| 291 | + * @param subIds 子设备编号列表 | ||
| 292 | + * @param gatewayId 网关设备编号 | ||
| 293 | + */ | ||
| 294 | + void bindDeviceGateway(Collection<Long> subIds, Long gatewayId); | ||
| 295 | + | ||
| 296 | + /** | ||
| 297 | + * 解绑子设备与网关 | ||
| 298 | + * | ||
| 299 | + * @param subIds 子设备编号列表 | ||
| 300 | + * @param gatewayId 网关设备编号 | ||
| 301 | + */ | ||
| 302 | + void unbindDeviceGateway(Collection<Long> subIds, Long gatewayId); | ||
| 303 | + | ||
| 304 | + /** | ||
| 305 | + * 获取未绑定网关的子设备分页 | ||
| 306 | + * | ||
| 307 | + * @param pageReqVO 分页查询参数（仅使用 productId、deviceName、nickname） | ||
| 308 | + * @return 子设备分页 | ||
| 309 | + */ | ||
| 310 | + PageResult<IotDeviceDO> getUnboundSubDevicePage(IotDevicePageReqVO pageReqVO); | ||
| 311 | + | ||
| 312 | + /** | ||
| 313 | + * 根据网关编号获取子设备列表 | ||
| 314 | + * | ||
| 315 | + * @param gatewayId 网关设备编号 | ||
| 316 | + * @return 子设备列表 | ||
| 317 | + */ | ||
| 318 | + List<IotDeviceDO> getDeviceListByGatewayId(Long gatewayId); | ||
| 319 | + | ||
| 320 | + // ========== 网关-拓扑管理（设备上报） ========== | ||
| 321 | + | ||
| 322 | + /** | ||
| 323 | + * 处理添加拓扑关系消息（网关设备上报） | ||
| 324 | + * | ||
| 325 | + * @param message 消息 | ||
| 326 | + * @param gatewayDevice 网关设备 | ||
| 327 | + * @return 成功添加的子设备列表 | ||
| 328 | + */ | ||
| 329 | + List<IotDeviceIdentity> handleTopoAddMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice); | ||
| 330 | + | ||
| 331 | + /** | ||
| 332 | + * 处理删除拓扑关系消息（网关设备上报） | ||
| 333 | + * | ||
| 334 | + * @param message 消息 | ||
| 335 | + * @param gatewayDevice 网关设备 | ||
| 336 | + * @return 成功删除的子设备列表 | ||
| 337 | + */ | ||
| 338 | + List<IotDeviceIdentity> handleTopoDeleteMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice); | ||
| 339 | + | ||
| 340 | + /** | ||
| 341 | + * 处理获取拓扑关系消息（网关设备上报） | ||
| 342 | + * | ||
| 343 | + * @param gatewayDevice 网关设备 | ||
| 344 | + * @return 拓扑关系响应 | ||
| 345 | + */ | ||
| 346 | + IotDeviceTopoGetRespDTO handleTopoGetMessage(IotDeviceDO gatewayDevice); | ||
| 347 | + | ||
| 348 | + // ========== 设备动态注册 ========== | ||
| 349 | + | ||
| 350 | + /** | ||
| 351 | + * 直连/网关设备动态注册 | ||
| 352 | + * | ||
| 353 | + * @param reqDTO 动态注册请求 | ||
| 354 | + * @return 注册结果（包含 DeviceSecret） | ||
| 355 | + */ | ||
| 356 | + IotDeviceRegisterRespDTO registerDevice(@Valid IotDeviceRegisterReqDTO reqDTO); | ||
| 357 | + | ||
| 358 | + /** | ||
| 359 | + * 网关子设备动态注册 | ||
| 360 | + * <p> | ||
| 361 | + * 与 {@link #handleSubDeviceRegisterMessage} 方法的区别： | ||
| 362 | + * 该方法网关设备信息通过 reqDTO 参数传入，而 {@link #handleSubDeviceRegisterMessage} 方法通过 gatewayDevice 参数传入 | ||
| 363 | + * | ||
| 364 | + * @param reqDTO 子设备注册请求（包含网关设备信息） | ||
| 365 | + * @return 注册结果列表 | ||
| 366 | + */ | ||
| 367 | + List<IotSubDeviceRegisterRespDTO> registerSubDevices(@Valid IotSubDeviceRegisterFullReqDTO reqDTO); | ||
| 368 | + | ||
| 369 | + /** | ||
| 370 | + * 处理子设备动态注册消息（网关设备上报） | ||
| 371 | + * | ||
| 372 | + * @param message 消息 | ||
| 373 | + * @param gatewayDevice 网关设备 | ||
| 374 | + * @return 注册结果列表 | ||
| 375 | + */ | ||
| 376 | + List<IotSubDeviceRegisterRespDTO> handleSubDeviceRegisterMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice); | ||
| 377 | + | ||
| 274 | } | 378 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
| 1 | package cn.iocoder.yudao.module.iot.service.device; | 1 | package cn.iocoder.yudao.module.iot.service.device; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | +import cn.hutool.core.util.BooleanUtil; | ||
| 4 | import cn.hutool.core.util.IdUtil; | 5 | import cn.hutool.core.util.IdUtil; |
| 5 | import cn.hutool.core.util.ObjUtil; | 6 | import cn.hutool.core.util.ObjUtil; |
| 6 | import cn.hutool.core.util.StrUtil; | 7 | import cn.hutool.core.util.StrUtil; |
| 7 | import cn.hutool.extra.spring.SpringUtil; | 8 | import cn.hutool.extra.spring.SpringUtil; |
| 8 | import cn.iocoder.yudao.framework.common.exception.ServiceException; | 9 | import cn.iocoder.yudao.framework.common.exception.ServiceException; |
| 9 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 10 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 11 | +import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | ||
| 10 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 12 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 11 | import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; | 13 | import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; |
| 12 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; | 14 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; |
| 13 | import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; | 15 | import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; |
| 14 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; | 16 | import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.*; |
| 15 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; | 17 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; |
| 18 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotSubDeviceRegisterFullReqDTO; | ||
| 19 | +import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; | ||
| 16 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; | 20 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; |
| 21 | +import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | ||
| 22 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 23 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO; | ||
| 24 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO; | ||
| 25 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterReqDTO; | ||
| 26 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterRespDTO; | ||
| 27 | +import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoAddReqDTO; | ||
| 28 | +import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoChangeReqDTO; | ||
| 29 | +import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoDeleteReqDTO; | ||
| 30 | +import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoGetRespDTO; | ||
| 17 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils; | 31 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils; |
| 18 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 32 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 19 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceGroupDO; | 33 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceGroupDO; |
| @@ -21,6 +35,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; | @@ -21,6 +35,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; | ||
| 21 | import cn.iocoder.yudao.module.iot.dal.mysql.device.IotDeviceMapper; | 35 | import cn.iocoder.yudao.module.iot.dal.mysql.device.IotDeviceMapper; |
| 22 | import cn.iocoder.yudao.module.iot.dal.redis.RedisKeyConstants; | 36 | import cn.iocoder.yudao.module.iot.dal.redis.RedisKeyConstants; |
| 23 | import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum; | 37 | import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum; |
| 38 | +import cn.iocoder.yudao.module.iot.service.device.message.IotDeviceMessageService; | ||
| 24 | import cn.iocoder.yudao.module.iot.service.product.IotProductService; | 39 | import cn.iocoder.yudao.module.iot.service.product.IotProductService; |
| 25 | import jakarta.annotation.Resource; | 40 | import jakarta.annotation.Resource; |
| 26 | import jakarta.validation.ConstraintViolationException; | 41 | import jakarta.validation.ConstraintViolationException; |
| @@ -34,12 +49,14 @@ import org.springframework.transaction.annotation.Transactional; | @@ -34,12 +49,14 @@ import org.springframework.transaction.annotation.Transactional; | ||
| 34 | import org.springframework.validation.annotation.Validated; | 49 | import org.springframework.validation.annotation.Validated; |
| 35 | 50 | ||
| 36 | import javax.annotation.Nullable; | 51 | import javax.annotation.Nullable; |
| 52 | +import java.math.BigDecimal; | ||
| 37 | import java.time.LocalDateTime; | 53 | import java.time.LocalDateTime; |
| 38 | import java.util.*; | 54 | import java.util.*; |
| 39 | 55 | ||
| 40 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 56 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 41 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; | 57 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 42 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; | 58 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; |
| 59 | +import static java.util.Collections.singletonList; | ||
| 43 | 60 | ||
| 44 | /** | 61 | /** |
| 45 | * IoT 设备 Service 实现类 | 62 | * IoT 设备 Service 实现类 |
| @@ -60,9 +77,20 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -60,9 +77,20 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 60 | @Resource | 77 | @Resource |
| 61 | @Lazy // 延迟加载，解决循环依赖 | 78 | @Lazy // 延迟加载，解决循环依赖 |
| 62 | private IotDeviceGroupService deviceGroupService; | 79 | private IotDeviceGroupService deviceGroupService; |
| 80 | + @Resource | ||
| 81 | + @Lazy // 延迟加载，解决循环依赖 | ||
| 82 | + private IotDeviceMessageService deviceMessageService; | ||
| 83 | + | ||
| 84 | + private IotDeviceServiceImpl getSelf() { | ||
| 85 | + return SpringUtil.getBean(getClass()); | ||
| 86 | + } | ||
| 63 | 87 | ||
| 64 | @Override | 88 | @Override |
| 65 | public Long createDevice(IotDeviceSaveReqVO createReqVO) { | 89 | public Long createDevice(IotDeviceSaveReqVO createReqVO) { |
| 90 | + return createDevice0(createReqVO).getId(); | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + private IotDeviceDO createDevice0(IotDeviceSaveReqVO createReqVO) { | ||
| 66 | // 1.1 校验产品是否存在 | 94 | // 1.1 校验产品是否存在 |
| 67 | IotProductDO product = productService.getProduct(createReqVO.getProductId()); | 95 | IotProductDO product = productService.getProduct(createReqVO.getProductId()); |
| 68 | if (product == null) { | 96 | if (product == null) { |
| @@ -80,7 +108,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -80,7 +108,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 80 | IotDeviceDO device = BeanUtils.toBean(createReqVO, IotDeviceDO.class); | 108 | IotDeviceDO device = BeanUtils.toBean(createReqVO, IotDeviceDO.class); |
| 81 | initDevice(device, product); | 109 | initDevice(device, product); |
| 82 | deviceMapper.insert(device); | 110 | deviceMapper.insert(device); |
| 83 | - return device.getId(); | 111 | + return device; |
| 84 | } | 112 | } |
| 85 | 113 | ||
| 86 | private void validateCreateDeviceParam(String productKey, String deviceName, | 114 | private void validateCreateDeviceParam(String productKey, String deviceName, |
| @@ -116,11 +144,13 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -116,11 +144,13 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 116 | 144 | ||
| 117 | private void initDevice(IotDeviceDO device, IotProductDO product) { | 145 | private void initDevice(IotDeviceDO device, IotProductDO product) { |
| 118 | device.setProductId(product.getId()).setProductKey(product.getProductKey()) | 146 | device.setProductId(product.getId()).setProductKey(product.getProductKey()) |
| 119 | - .setDeviceType(product.getDeviceType()); | ||
| 120 | - // 生成密钥 | ||
| 121 | - device.setDeviceSecret(generateDeviceSecret()); | ||
| 122 | - // 设置设备状态为未激活 | ||
| 123 | - device.setState(IotDeviceStateEnum.INACTIVE.getState()); | 147 | + .setDeviceType(product.getDeviceType()) |
| 148 | + .setDeviceSecret(generateDeviceSecret()) // 生成密钥 | ||
| 149 | + .setState(IotDeviceStateEnum.INACTIVE.getState()); // 默认未激活 | ||
| 150 | + } | ||
| 151 | + | ||
| 152 | + private String generateDeviceSecret() { | ||
| 153 | + return IdUtil.fastSimpleUUID(); | ||
| 124 | } | 154 | } |
| 125 | 155 | ||
| 126 | @Override | 156 | @Override |
| @@ -169,9 +199,10 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -169,9 +199,10 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 169 | public void deleteDevice(Long id) { | 199 | public void deleteDevice(Long id) { |
| 170 | // 1.1 校验存在 | 200 | // 1.1 校验存在 |
| 171 | IotDeviceDO device = validateDeviceExists(id); | 201 | IotDeviceDO device = validateDeviceExists(id); |
| 172 | - // 1.2 如果是网关设备，检查是否有子设备 | ||
| 173 | - if (device.getGatewayId() != null && deviceMapper.selectCountByGatewayId(id) > 0) { | ||
| 174 | - throw exception(DEVICE_HAS_CHILDREN); | 202 | + // 1.2 如果是网关设备，检查是否有子设备绑定 |
| 203 | + if (IotProductDeviceTypeEnum.isGateway(device.getDeviceType()) | ||
| 204 | + && deviceMapper.selectCountByGatewayId(id) > 0) { | ||
| 205 | + throw exception(DEVICE_GATEWAY_HAS_SUB); | ||
| 175 | } | 206 | } |
| 176 | 207 | ||
| 177 | // 2. 删除设备 | 208 | // 2. 删除设备 |
| @@ -192,10 +223,11 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -192,10 +223,11 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 192 | if (CollUtil.isEmpty(devices)) { | 223 | if (CollUtil.isEmpty(devices)) { |
| 193 | return; | 224 | return; |
| 194 | } | 225 | } |
| 195 | - // 1.2 校验网关设备是否存在 | 226 | + // 1.2 如果是网关设备，检查是否有子设备绑定 |
| 196 | for (IotDeviceDO device : devices) { | 227 | for (IotDeviceDO device : devices) { |
| 197 | - if (device.getGatewayId() != null && deviceMapper.selectCountByGatewayId(device.getId()) > 0) { | ||
| 198 | - throw exception(DEVICE_HAS_CHILDREN); | 228 | + if (IotProductDeviceTypeEnum.isGateway(device.getDeviceType()) |
| 229 | + && deviceMapper.selectCountByGatewayId(device.getId()) > 0) { | ||
| 230 | + throw exception(DEVICE_GATEWAY_HAS_SUB); | ||
| 199 | } | 231 | } |
| 200 | } | 232 | } |
| 201 | 233 | ||
| @@ -295,6 +327,37 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -295,6 +327,37 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 295 | 327 | ||
| 296 | // 2. 清空对应缓存 | 328 | // 2. 清空对应缓存 |
| 297 | deleteDeviceCache(device); | 329 | deleteDeviceCache(device); |
| 330 | + | ||
| 331 | + // 3. 网关设备下线时，联动所有子设备下线 | ||
| 332 | + if (Objects.equals(state, IotDeviceStateEnum.OFFLINE.getState()) | ||
| 333 | + && IotProductDeviceTypeEnum.isGateway(device.getDeviceType())) { | ||
| 334 | + handleGatewayOffline(device); | ||
| 335 | + } | ||
| 336 | + } | ||
| 337 | + | ||
| 338 | + /** | ||
| 339 | + * 处理网关下线，联动所有子设备下线 | ||
| 340 | + * | ||
| 341 | + * @param gatewayDevice 网关设备 | ||
| 342 | + */ | ||
| 343 | + private void handleGatewayOffline(IotDeviceDO gatewayDevice) { | ||
| 344 | + List<IotDeviceDO> subDevices = deviceMapper.selectListByGatewayId(gatewayDevice.getId()); | ||
| 345 | + if (CollUtil.isEmpty(subDevices)) { | ||
| 346 | + return; | ||
| 347 | + } | ||
| 348 | + for (IotDeviceDO subDevice : subDevices) { | ||
| 349 | + if (Objects.equals(subDevice.getState(), IotDeviceStateEnum.ONLINE.getState())) { | ||
| 350 | + try { | ||
| 351 | + updateDeviceState(subDevice, IotDeviceStateEnum.OFFLINE.getState()); | ||
| 352 | + log.info("[handleGatewayOffline][网关({}/{}) 下线，子设备({}/{}) 联动下线]", | ||
| 353 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 354 | + subDevice.getProductKey(), subDevice.getDeviceName()); | ||
| 355 | + } catch (Exception ex) { | ||
| 356 | + log.error("[handleGatewayOffline][子设备({}/{}) 下线失败]", | ||
| 357 | + subDevice.getProductKey(), subDevice.getDeviceName(), ex); | ||
| 358 | + } | ||
| 359 | + } | ||
| 360 | + } | ||
| 298 | } | 361 | } |
| 299 | 362 | ||
| 300 | @Override | 363 | @Override |
| @@ -315,15 +378,6 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -315,15 +378,6 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 315 | return deviceMapper.selectCountByGroupId(groupId); | 378 | return deviceMapper.selectCountByGroupId(groupId); |
| 316 | } | 379 | } |
| 317 | 380 | ||
| 318 | - /** | ||
| 319 | - * 生成 deviceSecret | ||
| 320 | - * | ||
| 321 | - * @return 生成的 deviceSecret | ||
| 322 | - */ | ||
| 323 | - private String generateDeviceSecret() { | ||
| 324 | - return IdUtil.fastSimpleUUID(); | ||
| 325 | - } | ||
| 326 | - | ||
| 327 | @Override | 381 | @Override |
| 328 | @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入 | 382 | @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入 |
| 329 | public IotDeviceImportRespVO importDevice(List<IotDeviceImportExcelVO> importDevices, boolean updateSupport) { | 383 | public IotDeviceImportRespVO importDevice(List<IotDeviceImportExcelVO> importDevices, boolean updateSupport) { |
| @@ -376,8 +430,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -376,8 +430,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 376 | if (existDevice == null) { | 430 | if (existDevice == null) { |
| 377 | createDevice(new IotDeviceSaveReqVO() | 431 | createDevice(new IotDeviceSaveReqVO() |
| 378 | .setDeviceName(importDevice.getDeviceName()) | 432 | .setDeviceName(importDevice.getDeviceName()) |
| 379 | - .setProductId(product.getId()).setGatewayId(gatewayId).setGroupIds(groupIds) | ||
| 380 | - .setLocationType(importDevice.getLocationType())); | 433 | + .setProductId(product.getId()).setGatewayId(gatewayId).setGroupIds(groupIds)); |
| 381 | respVO.getCreateDeviceNames().add(importDevice.getDeviceName()); | 434 | respVO.getCreateDeviceNames().add(importDevice.getDeviceName()); |
| 382 | return; | 435 | return; |
| 383 | } | 436 | } |
| @@ -386,7 +439,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -386,7 +439,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 386 | throw exception(DEVICE_KEY_EXISTS); | 439 | throw exception(DEVICE_KEY_EXISTS); |
| 387 | } | 440 | } |
| 388 | updateDevice(new IotDeviceSaveReqVO().setId(existDevice.getId()) | 441 | updateDevice(new IotDeviceSaveReqVO().setId(existDevice.getId()) |
| 389 | - .setGatewayId(gatewayId).setGroupIds(groupIds).setLocationType(importDevice.getLocationType())); | 442 | + .setGatewayId(gatewayId).setGroupIds(groupIds)); |
| 390 | respVO.getUpdateDeviceNames().add(importDevice.getDeviceName()); | 443 | respVO.getUpdateDeviceNames().add(importDevice.getDeviceName()); |
| 391 | } catch (ServiceException ex) { | 444 | } catch (ServiceException ex) { |
| 392 | respVO.getFailureDeviceNames().put(importDevice.getDeviceName(), ex.getMessage()); | 445 | respVO.getFailureDeviceNames().put(importDevice.getDeviceName(), ex.getMessage()); |
| @@ -399,7 +452,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -399,7 +452,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 399 | public IotDeviceAuthInfoRespVO getDeviceAuthInfo(Long id) { | 452 | public IotDeviceAuthInfoRespVO getDeviceAuthInfo(Long id) { |
| 400 | IotDeviceDO device = validateDeviceExists(id); | 453 | IotDeviceDO device = validateDeviceExists(id); |
| 401 | // 使用 IotDeviceAuthUtils 生成认证信息 | 454 | // 使用 IotDeviceAuthUtils 生成认证信息 |
| 402 | - IotDeviceAuthUtils.AuthInfo authInfo = IotDeviceAuthUtils.getAuthInfo( | 455 | + IotDeviceAuthReqDTO authInfo = IotDeviceAuthUtils.getAuthInfo( |
| 403 | device.getProductKey(), device.getDeviceName(), device.getDeviceSecret()); | 456 | device.getProductKey(), device.getDeviceName(), device.getDeviceSecret()); |
| 404 | return BeanUtils.toBean(authInfo, IotDeviceAuthInfoRespVO.class); | 457 | return BeanUtils.toBean(authInfo, IotDeviceAuthInfoRespVO.class); |
| 405 | } | 458 | } |
| @@ -447,7 +500,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -447,7 +500,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 447 | @Override | 500 | @Override |
| 448 | public boolean authDevice(IotDeviceAuthReqDTO authReqDTO) { | 501 | public boolean authDevice(IotDeviceAuthReqDTO authReqDTO) { |
| 449 | // 1. 校验设备是否存在 | 502 | // 1. 校验设备是否存在 |
| 450 | - IotDeviceAuthUtils.DeviceInfo deviceInfo = IotDeviceAuthUtils.parseUsername(authReqDTO.getUsername()); | 503 | + IotDeviceIdentity deviceInfo = IotDeviceAuthUtils.parseUsername(authReqDTO.getUsername()); |
| 451 | if (deviceInfo == null) { | 504 | if (deviceInfo == null) { |
| 452 | log.error("[authDevice][认证失败，username({}) 格式不正确]", authReqDTO.getUsername()); | 505 | log.error("[authDevice][认证失败，username({}) 格式不正确]", authReqDTO.getUsername()); |
| 453 | return false; | 506 | return false; |
| @@ -461,7 +514,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -461,7 +514,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 461 | } | 514 | } |
| 462 | 515 | ||
| 463 | // 2. 校验密码 | 516 | // 2. 校验密码 |
| 464 | - IotDeviceAuthUtils.AuthInfo authInfo = IotDeviceAuthUtils.getAuthInfo(productKey, deviceName, device.getDeviceSecret()); | 517 | + IotDeviceAuthReqDTO authInfo = IotDeviceAuthUtils.getAuthInfo(productKey, deviceName, device.getDeviceSecret()); |
| 465 | if (ObjUtil.notEqual(authInfo.getPassword(), authReqDTO.getPassword())) { | 518 | if (ObjUtil.notEqual(authInfo.getPassword(), authReqDTO.getPassword())) { |
| 466 | log.error("[authDevice][设备({}/{}) 密码不正确]", productKey, deviceName); | 519 | log.error("[authDevice][设备({}/{}) 密码不正确]", productKey, deviceName); |
| 467 | return false; | 520 | return false; |
| @@ -490,17 +543,388 @@ public class IotDeviceServiceImpl implements IotDeviceService { | @@ -490,17 +543,388 @@ public class IotDeviceServiceImpl implements IotDeviceService { | ||
| 490 | public void updateDeviceFirmware(Long deviceId, Long firmwareId) { | 543 | public void updateDeviceFirmware(Long deviceId, Long firmwareId) { |
| 491 | // 1. 校验设备是否存在 | 544 | // 1. 校验设备是否存在 |
| 492 | IotDeviceDO device = validateDeviceExists(deviceId); | 545 | IotDeviceDO device = validateDeviceExists(deviceId); |
| 493 | - | 546 | + |
| 494 | // 2. 更新设备固件版本 | 547 | // 2. 更新设备固件版本 |
| 495 | IotDeviceDO updateObj = new IotDeviceDO().setId(deviceId).setFirmwareId(firmwareId); | 548 | IotDeviceDO updateObj = new IotDeviceDO().setId(deviceId).setFirmwareId(firmwareId); |
| 496 | deviceMapper.updateById(updateObj); | 549 | deviceMapper.updateById(updateObj); |
| 497 | - | 550 | + |
| 498 | // 3. 清空对应缓存 | 551 | // 3. 清空对应缓存 |
| 499 | deleteDeviceCache(device); | 552 | deleteDeviceCache(device); |
| 500 | } | 553 | } |
| 501 | 554 | ||
| 502 | - private IotDeviceServiceImpl getSelf() { | ||
| 503 | - return SpringUtil.getBean(getClass()); | 555 | + @Override |
| 556 | + public void updateDeviceLocation(IotDeviceDO device, BigDecimal longitude, BigDecimal latitude) { | ||
| 557 | + // 1. 更新定位信息 | ||
| 558 | + deviceMapper.updateById(new IotDeviceDO().setId(device.getId()) | ||
| 559 | + .setLongitude(longitude).setLatitude(latitude)); | ||
| 560 | + | ||
| 561 | + // 2. 清空对应缓存 | ||
| 562 | + deleteDeviceCache(device); | ||
| 563 | + } | ||
| 564 | + | ||
| 565 | + @Override | ||
| 566 | + public List<IotDeviceDO> getDeviceListByHasLocation() { | ||
| 567 | + return deviceMapper.selectListByHasLocation(); | ||
| 568 | + } | ||
| 569 | + | ||
| 570 | + // ========== 网关-拓扑管理（后台操作） ========== | ||
| 571 | + | ||
| 572 | + @Override | ||
| 573 | + @Transactional(rollbackFor = Exception.class) | ||
| 574 | + public void bindDeviceGateway(Collection<Long> subIds, Long gatewayId) { | ||
| 575 | + if (CollUtil.isEmpty(subIds)) { | ||
| 576 | + return; | ||
| 577 | + } | ||
| 578 | + // 1.1 校验网关设备存在且类型正确 | ||
| 579 | + validateGatewayDeviceExists(gatewayId); | ||
| 580 | + // 1.2 校验每个设备是否可绑定 | ||
| 581 | + List<IotDeviceDO> devices = deviceMapper.selectByIds(subIds); | ||
| 582 | + for (IotDeviceDO device : devices) { | ||
| 583 | + checkSubDeviceCanBind(device, gatewayId); | ||
| 584 | + } | ||
| 585 | + | ||
| 586 | + // 2. 批量更新数据库 | ||
| 587 | + List<IotDeviceDO> updateList = convertList(devices, device -> | ||
| 588 | + new IotDeviceDO().setId(device.getId()).setGatewayId(gatewayId)); | ||
| 589 | + deviceMapper.updateBatch(updateList); | ||
| 590 | + | ||
| 591 | + // 3. 清空对应缓存 | ||
| 592 | + deleteDeviceCache(devices); | ||
| 593 | + | ||
| 594 | + // 4. 下发网关设备拓扑变更通知（增加） | ||
| 595 | + sendTopoChangeNotify(gatewayId, IotDeviceTopoChangeReqDTO.STATUS_CREATE, devices); | ||
| 596 | + } | ||
| 597 | + | ||
| 598 | + private void checkSubDeviceCanBind(IotDeviceDO device, Long gatewayId) { | ||
| 599 | + if (!IotProductDeviceTypeEnum.isGatewaySub(device.getDeviceType())) { | ||
| 600 | + throw exception(DEVICE_NOT_GATEWAY_SUB, device.getProductKey(), device.getDeviceName()); | ||
| 601 | + } | ||
| 602 | + // 已绑定到其他网关，拒绝绑定（需先解绑） | ||
| 603 | + if (device.getGatewayId() != null && ObjUtil.notEqual(device.getGatewayId(), gatewayId)) { | ||
| 604 | + throw exception(DEVICE_GATEWAY_BINDTO_EXISTS, device.getProductKey(), device.getDeviceName()); | ||
| 605 | + } | ||
| 606 | + } | ||
| 607 | + | ||
| 608 | + @Override | ||
| 609 | + @Transactional(rollbackFor = Exception.class) | ||
| 610 | + public void unbindDeviceGateway(Collection<Long> subIds, Long gatewayId) { | ||
| 611 | + // 1. 校验设备存在 | ||
| 612 | + if (CollUtil.isEmpty(subIds)) { | ||
| 613 | + return; | ||
| 614 | + } | ||
| 615 | + List<IotDeviceDO> devices = deviceMapper.selectByIds(subIds); | ||
| 616 | + devices.removeIf(device -> ObjUtil.notEqual(device.getGatewayId(), gatewayId)); | ||
| 617 | + if (CollUtil.isEmpty(devices)) { | ||
| 618 | + return; | ||
| 619 | + } | ||
| 620 | + | ||
| 621 | + // 2. 批量更新数据库（将 gatewayId 设置为 null） | ||
| 622 | + deviceMapper.updateGatewayIdBatch(convertList(devices, IotDeviceDO::getId), null); | ||
| 623 | + | ||
| 624 | + // 3. 清空对应缓存 | ||
| 625 | + deleteDeviceCache(devices); | ||
| 626 | + | ||
| 627 | + // 4. 下发网关设备拓扑变更通知（删除） | ||
| 628 | + sendTopoChangeNotify(gatewayId, IotDeviceTopoChangeReqDTO.STATUS_DELETE, devices); | ||
| 629 | + } | ||
| 630 | + | ||
| 631 | + @Override | ||
| 632 | + public PageResult<IotDeviceDO> getUnboundSubDevicePage(IotDevicePageReqVO pageReqVO) { | ||
| 633 | + return deviceMapper.selectUnboundSubDevicePage(pageReqVO); | ||
| 634 | + } | ||
| 635 | + | ||
| 636 | + @Override | ||
| 637 | + public List<IotDeviceDO> getDeviceListByGatewayId(Long gatewayId) { | ||
| 638 | + return deviceMapper.selectListByGatewayId(gatewayId); | ||
| 639 | + } | ||
| 640 | + | ||
| 641 | + // ========== 网关-拓扑管理（设备上报） ========== | ||
| 642 | + | ||
| 643 | + @Override | ||
| 644 | + public List<IotDeviceIdentity> handleTopoAddMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice) { | ||
| 645 | + // 1.1 校验网关设备类型 | ||
| 646 | + if (!IotProductDeviceTypeEnum.isGateway(gatewayDevice.getDeviceType())) { | ||
| 647 | + throw exception(DEVICE_NOT_GATEWAY); | ||
| 648 | + } | ||
| 649 | + // 1.2 解析参数 | ||
| 650 | + IotDeviceTopoAddReqDTO params = JsonUtils.convertObject(message.getParams(), IotDeviceTopoAddReqDTO.class); | ||
| 651 | + if (params == null || CollUtil.isEmpty(params.getSubDevices())) { | ||
| 652 | + throw exception(DEVICE_TOPO_PARAMS_INVALID); | ||
| 653 | + } | ||
| 654 | + | ||
| 655 | + // 2. 遍历处理每个子设备 | ||
| 656 | + List<IotDeviceIdentity> addedSubDevices = new ArrayList<>(); | ||
| 657 | + for (IotDeviceAuthReqDTO subDeviceAuth : params.getSubDevices()) { | ||
| 658 | + try { | ||
| 659 | + IotDeviceDO subDevice = addDeviceTopo(gatewayDevice, subDeviceAuth); | ||
| 660 | + addedSubDevices.add(new IotDeviceIdentity(subDevice.getProductKey(), subDevice.getDeviceName())); | ||
| 661 | + } catch (Exception ex) { | ||
| 662 | + log.warn("[handleTopoAddMessage][网关({}/{}) 添加子设备失败，message={}]", | ||
| 663 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), message, ex); | ||
| 664 | + } | ||
| 665 | + } | ||
| 666 | + | ||
| 667 | + // 3. 返回响应数据（包含成功添加的子设备列表） | ||
| 668 | + return addedSubDevices; | ||
| 669 | + } | ||
| 670 | + | ||
| 671 | + private IotDeviceDO addDeviceTopo(IotDeviceDO gatewayDevice, IotDeviceAuthReqDTO subDeviceAuth) { | ||
| 672 | + // 1.1 解析子设备信息 | ||
| 673 | + IotDeviceIdentity subDeviceInfo = IotDeviceAuthUtils.parseUsername(subDeviceAuth.getUsername()); | ||
| 674 | + if (subDeviceInfo == null) { | ||
| 675 | + throw exception(DEVICE_TOPO_SUB_DEVICE_USERNAME_INVALID); | ||
| 676 | + } | ||
| 677 | + // 1.2 校验子设备认证信息 | ||
| 678 | + if (!authDevice(subDeviceAuth)) { | ||
| 679 | + throw exception(DEVICE_TOPO_SUB_DEVICE_AUTH_FAILED); | ||
| 680 | + } | ||
| 681 | + // 1.3 获取子设备 | ||
| 682 | + IotDeviceDO subDevice = getSelf().getDeviceFromCache(subDeviceInfo.getProductKey(), subDeviceInfo.getDeviceName()); | ||
| 683 | + if (subDevice == null) { | ||
| 684 | + throw exception(DEVICE_NOT_EXISTS); | ||
| 685 | + } | ||
| 686 | + // 1.4 校验子设备类型 | ||
| 687 | + checkSubDeviceCanBind(subDevice, gatewayDevice.getId()); | ||
| 688 | + | ||
| 689 | + // 2. 更新数据库 | ||
| 690 | + deviceMapper.updateById(new IotDeviceDO().setId(subDevice.getId()).setGatewayId(gatewayDevice.getId())); | ||
| 691 | + log.info("[addDeviceTopo][网关({}/{}) 绑定子设备({}/{})]", | ||
| 692 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 693 | + subDevice.getProductKey(), subDevice.getDeviceName()); | ||
| 694 | + | ||
| 695 | + // 3. 清空对应缓存 | ||
| 696 | + deleteDeviceCache(subDevice); | ||
| 697 | + return subDevice; | ||
| 698 | + } | ||
| 699 | + | ||
| 700 | + @Override | ||
| 701 | + public List<IotDeviceIdentity> handleTopoDeleteMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice) { | ||
| 702 | + // 1.1 校验网关设备类型 | ||
| 703 | + if (!IotProductDeviceTypeEnum.isGateway(gatewayDevice.getDeviceType())) { | ||
| 704 | + throw exception(DEVICE_NOT_GATEWAY); | ||
| 705 | + } | ||
| 706 | + // 1.2 解析参数 | ||
| 707 | + IotDeviceTopoDeleteReqDTO params = JsonUtils.convertObject(message.getParams(), IotDeviceTopoDeleteReqDTO.class); | ||
| 708 | + if (params == null || CollUtil.isEmpty(params.getSubDevices())) { | ||
| 709 | + throw exception(DEVICE_TOPO_PARAMS_INVALID); | ||
| 710 | + } | ||
| 711 | + | ||
| 712 | + // 2. 遍历处理每个子设备 | ||
| 713 | + List<IotDeviceIdentity> deletedSubDevices = new ArrayList<>(); | ||
| 714 | + for (IotDeviceIdentity subDeviceIdentity : params.getSubDevices()) { | ||
| 715 | + try { | ||
| 716 | + deleteDeviceTopo(gatewayDevice, subDeviceIdentity); | ||
| 717 | + deletedSubDevices.add(subDeviceIdentity); | ||
| 718 | + } catch (Exception ex) { | ||
| 719 | + log.warn("[handleTopoDeleteMessage][网关({}/{}) 删除子设备失败，productKey={}, deviceName={}]", | ||
| 720 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 721 | + subDeviceIdentity.getProductKey(), subDeviceIdentity.getDeviceName(), ex); | ||
| 722 | + } | ||
| 723 | + } | ||
| 724 | + | ||
| 725 | + // 3. 返回响应数据（包含成功删除的子设备列表） | ||
| 726 | + return deletedSubDevices; | ||
| 727 | + } | ||
| 728 | + | ||
| 729 | + private void deleteDeviceTopo(IotDeviceDO gatewayDevice, IotDeviceIdentity subDeviceIdentity) { | ||
| 730 | + // 1.1 获取子设备 | ||
| 731 | + IotDeviceDO subDevice = getSelf().getDeviceFromCache(subDeviceIdentity.getProductKey(), subDeviceIdentity.getDeviceName()); | ||
| 732 | + if (subDevice == null) { | ||
| 733 | + throw exception(DEVICE_NOT_EXISTS); | ||
| 734 | + } | ||
| 735 | + // 1.2 校验子设备是否绑定到该网关 | ||
| 736 | + if (ObjUtil.notEqual(subDevice.getGatewayId(), gatewayDevice.getId())) { | ||
| 737 | + throw exception(DEVICE_TOPO_SUB_NOT_BINDTO_GATEWAY, | ||
| 738 | + subDeviceIdentity.getProductKey(), subDeviceIdentity.getDeviceName()); | ||
| 739 | + } | ||
| 740 | + | ||
| 741 | + // 2. 更新数据库（将 gatewayId 设置为 null） | ||
| 742 | + deviceMapper.updateGatewayIdBatch(singletonList(subDevice.getId()), null); | ||
| 743 | + log.info("[deleteDeviceTopo][网关({}/{}) 解绑子设备({}/{})]", | ||
| 744 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 745 | + subDevice.getProductKey(), subDevice.getDeviceName()); | ||
| 746 | + | ||
| 747 | + // 3. 清空对应缓存 | ||
| 748 | + deleteDeviceCache(subDevice); | ||
| 749 | + | ||
| 750 | + // 4. 子设备下线 | ||
| 751 | + if (Objects.equals(subDevice.getState(), IotDeviceStateEnum.ONLINE.getState())) { | ||
| 752 | + updateDeviceState(subDevice, IotDeviceStateEnum.OFFLINE.getState()); | ||
| 753 | + } | ||
| 754 | + } | ||
| 755 | + | ||
| 756 | + @Override | ||
| 757 | + public IotDeviceTopoGetRespDTO handleTopoGetMessage(IotDeviceDO gatewayDevice) { | ||
| 758 | + // 1. 校验网关设备类型 | ||
| 759 | + if (!IotProductDeviceTypeEnum.isGateway(gatewayDevice.getDeviceType())) { | ||
| 760 | + throw exception(DEVICE_NOT_GATEWAY); | ||
| 761 | + } | ||
| 762 | + | ||
| 763 | + // 2. 获取子设备列表并转换 | ||
| 764 | + List<IotDeviceDO> subDevices = deviceMapper.selectListByGatewayId(gatewayDevice.getId()); | ||
| 765 | + List<IotDeviceIdentity> subDeviceIdentities = convertList(subDevices, subDevice -> | ||
| 766 | + new IotDeviceIdentity(subDevice.getProductKey(), subDevice.getDeviceName())); | ||
| 767 | + return new IotDeviceTopoGetRespDTO().setSubDevices(subDeviceIdentities); | ||
| 768 | + } | ||
| 769 | + | ||
| 770 | + /** | ||
| 771 | + * 发送拓扑变更通知给网关设备 | ||
| 772 | + * | ||
| 773 | + * @param gatewayId 网关设备编号 | ||
| 774 | + * @param status 变更状态（0-创建, 1-删除） | ||
| 775 | + * @param subDevices 子设备列表 | ||
| 776 | + * @see <a href="https://help.aliyun.com/zh/marketplace/notify-gateway-topology-changes">阿里云 - 通知网关拓扑关系变化</a> | ||
| 777 | + */ | ||
| 778 | + private void sendTopoChangeNotify(Long gatewayId, Integer status, List<IotDeviceDO> subDevices) { | ||
| 779 | + if (CollUtil.isEmpty(subDevices)) { | ||
| 780 | + return; | ||
| 781 | + } | ||
| 782 | + // 1. 获取网关设备 | ||
| 783 | + IotDeviceDO gatewayDevice = deviceMapper.selectById(gatewayId); | ||
| 784 | + if (gatewayDevice == null) { | ||
| 785 | + log.warn("[sendTopoChangeNotify][网关设备({}) 不存在，无法发送拓扑变更通知]", gatewayId); | ||
| 786 | + return; | ||
| 787 | + } | ||
| 788 | + | ||
| 789 | + try { | ||
| 790 | + // 2.1 构建拓扑变更通知消息 | ||
| 791 | + List<IotDeviceIdentity> subList = convertList(subDevices, subDevice -> | ||
| 792 | + new IotDeviceIdentity(subDevice.getProductKey(), subDevice.getDeviceName())); | ||
| 793 | + IotDeviceTopoChangeReqDTO params = new IotDeviceTopoChangeReqDTO(status, subList); | ||
| 794 | + IotDeviceMessage notifyMessage = IotDeviceMessage.requestOf( | ||
| 795 | + IotDeviceMessageMethodEnum.TOPO_CHANGE.getMethod(), params); | ||
| 796 | + | ||
| 797 | + // 2.2 发送消息 | ||
| 798 | + deviceMessageService.sendDeviceMessage(notifyMessage, gatewayDevice); | ||
| 799 | + log.info("[sendTopoChangeNotify][网关({}/{}) 发送拓扑变更通知成功，status={}, subDevices={}]", | ||
| 800 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 801 | + status, subList); | ||
| 802 | + } catch (Exception ex) { | ||
| 803 | + log.error("[sendTopoChangeNotify][网关({}/{}) 发送拓扑变更通知失败，status={}]", | ||
| 804 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), status, ex); | ||
| 805 | + } | ||
| 806 | + } | ||
| 807 | + | ||
| 808 | + // ========== 设备动态注册 ========== | ||
| 809 | + | ||
| 810 | + @Override | ||
| 811 | + public IotDeviceRegisterRespDTO registerDevice(IotDeviceRegisterReqDTO reqDTO) { | ||
| 812 | + // 1.1 校验产品 | ||
| 813 | + IotProductDO product = TenantUtils.executeIgnore(() -> | ||
| 814 | + productService.getProductByProductKey(reqDTO.getProductKey())); | ||
| 815 | + if (product == null) { | ||
| 816 | + throw exception(PRODUCT_NOT_EXISTS); | ||
| 817 | + } | ||
| 818 | + // 1.2 校验产品是否开启动态注册 | ||
| 819 | + if (BooleanUtil.isFalse(product.getRegisterEnabled())) { | ||
| 820 | + throw exception(DEVICE_REGISTER_DISABLED); | ||
| 821 | + } | ||
| 822 | + // 1.3 验证 productSecret | ||
| 823 | + if (ObjUtil.notEqual(product.getProductSecret(), reqDTO.getProductSecret())) { | ||
| 824 | + throw exception(DEVICE_REGISTER_SECRET_INVALID); | ||
| 825 | + } | ||
| 826 | + return TenantUtils.execute(product.getTenantId(), () -> { | ||
| 827 | + // 1.4 校验设备是否已存在（已存在则不允许重复注册） | ||
| 828 | + IotDeviceDO device = getSelf().getDeviceFromCache(reqDTO.getProductKey(), reqDTO.getDeviceName()); | ||
| 829 | + if (device != null) { | ||
| 830 | + throw exception(DEVICE_REGISTER_ALREADY_EXISTS); | ||
| 831 | + } | ||
| 832 | + | ||
| 833 | + // 2.1 自动创建设备 | ||
| 834 | + IotDeviceSaveReqVO createReqVO = new IotDeviceSaveReqVO() | ||
| 835 | + .setDeviceName(reqDTO.getDeviceName()) | ||
| 836 | + .setProductId(product.getId()); | ||
| 837 | + device = createDevice0(createReqVO); | ||
| 838 | + log.info("[registerDevice][产品({}) 自动创建设备({})]", | ||
| 839 | + reqDTO.getProductKey(), reqDTO.getDeviceName()); | ||
| 840 | + // 2.2 返回设备密钥 | ||
| 841 | + return new IotDeviceRegisterRespDTO(device.getProductKey(), device.getDeviceName(), device.getDeviceSecret()); | ||
| 842 | + }); | ||
| 843 | + } | ||
| 844 | + | ||
| 845 | + @Override | ||
| 846 | + public List<IotSubDeviceRegisterRespDTO> registerSubDevices(IotSubDeviceRegisterFullReqDTO reqDTO) { | ||
| 847 | + // 1. 校验网关设备 | ||
| 848 | + IotDeviceDO gatewayDevice = getSelf().getDeviceFromCache(reqDTO.getGatewayProductKey(), reqDTO.getGatewayDeviceName()); | ||
| 849 | + | ||
| 850 | + // 2. 遍历注册每个子设备 | ||
| 851 | + return TenantUtils.execute(gatewayDevice.getTenantId(), () -> | ||
| 852 | + registerSubDevices0(gatewayDevice, reqDTO.getSubDevices())); | ||
| 853 | + } | ||
| 854 | + | ||
| 855 | + @Override | ||
| 856 | + public List<IotSubDeviceRegisterRespDTO> handleSubDeviceRegisterMessage(IotDeviceMessage message, IotDeviceDO gatewayDevice) { | ||
| 857 | + // 1. 解析参数 | ||
| 858 | + if (!(message.getParams() instanceof List)) { | ||
| 859 | + throw exception(DEVICE_SUB_REGISTER_PARAMS_INVALID); | ||
| 860 | + } | ||
| 861 | + List<IotSubDeviceRegisterReqDTO> subDevices = JsonUtils.convertList(message.getParams(), IotSubDeviceRegisterReqDTO.class); | ||
| 862 | + | ||
| 863 | + // 2. 遍历注册每个子设备 | ||
| 864 | + return registerSubDevices0(gatewayDevice, subDevices); | ||
| 865 | + } | ||
| 866 | + | ||
| 867 | + private List<IotSubDeviceRegisterRespDTO> registerSubDevices0(IotDeviceDO gatewayDevice, | ||
| 868 | + List<IotSubDeviceRegisterReqDTO> subDevices) { | ||
| 869 | + // 1.1 校验网关设备 | ||
| 870 | + if (gatewayDevice == null) { | ||
| 871 | + throw exception(DEVICE_NOT_EXISTS); | ||
| 872 | + } | ||
| 873 | + if (!IotProductDeviceTypeEnum.isGateway(gatewayDevice.getDeviceType())) { | ||
| 874 | + throw exception(DEVICE_NOT_GATEWAY); | ||
| 875 | + } | ||
| 876 | + // 1.2 注册设备不能为空 | ||
| 877 | + if (CollUtil.isEmpty(subDevices)) { | ||
| 878 | + throw exception(DEVICE_SUB_REGISTER_PARAMS_INVALID); | ||
| 879 | + } | ||
| 880 | + | ||
| 881 | + // 2. 遍历注册每个子设备 | ||
| 882 | + List<IotSubDeviceRegisterRespDTO> results = new ArrayList<>(subDevices.size()); | ||
| 883 | + for (IotSubDeviceRegisterReqDTO subDevice : subDevices) { | ||
| 884 | + try { | ||
| 885 | + IotDeviceDO device = registerSubDevice0(gatewayDevice, subDevice); | ||
| 886 | + results.add(new IotSubDeviceRegisterRespDTO( | ||
| 887 | + subDevice.getProductKey(), subDevice.getDeviceName(), device.getDeviceSecret())); | ||
| 888 | + } catch (Exception ex) { | ||
| 889 | + log.error("[registerSubDevices0][子设备({}/{}) 注册失败]", | ||
| 890 | + subDevice.getProductKey(), subDevice.getDeviceName(), ex); | ||
| 891 | + } | ||
| 892 | + } | ||
| 893 | + return results; | ||
| 894 | + } | ||
| 895 | + | ||
| 896 | + private IotDeviceDO registerSubDevice0(IotDeviceDO gatewayDevice, IotSubDeviceRegisterReqDTO params) { | ||
| 897 | + // 1.1 校验产品 | ||
| 898 | + IotProductDO product = productService.getProductByProductKey(params.getProductKey()); | ||
| 899 | + if (product == null) { | ||
| 900 | + throw exception(PRODUCT_NOT_EXISTS); | ||
| 901 | + } | ||
| 902 | + // 1.2 校验产品是否为网关子设备类型 | ||
| 903 | + if (!IotProductDeviceTypeEnum.isGatewaySub(product.getDeviceType())) { | ||
| 904 | + throw exception(DEVICE_SUB_REGISTER_PRODUCT_NOT_GATEWAY_SUB, params.getProductKey()); | ||
| 905 | + } | ||
| 906 | + // 1.3 校验设备是否已存在（子设备动态注册：设备必须已预注册） | ||
| 907 | + IotDeviceDO existDevice = getSelf().getDeviceFromCache(params.getProductKey(), params.getDeviceName()); | ||
| 908 | + if (existDevice == null) { | ||
| 909 | + throw exception(DEVICE_NOT_EXISTS); | ||
| 910 | + } | ||
| 911 | + // 1.4 校验是否绑定到其他网关 | ||
| 912 | + if (existDevice.getGatewayId() != null && ObjUtil.notEqual(existDevice.getGatewayId(), gatewayDevice.getId())) { | ||
| 913 | + throw exception(DEVICE_GATEWAY_BINDTO_EXISTS, | ||
| 914 | + existDevice.getProductKey(), existDevice.getDeviceName()); | ||
| 915 | + } | ||
| 916 | + | ||
| 917 | + // 2. 绑定到网关（如果尚未绑定） | ||
| 918 | + if (existDevice.getGatewayId() == null) { | ||
| 919 | + // 2.1 更新数据库 | ||
| 920 | + deviceMapper.updateById(new IotDeviceDO().setId(existDevice.getId()).setGatewayId(gatewayDevice.getId())); | ||
| 921 | + // 2.2 清空对应缓存 | ||
| 922 | + deleteDeviceCache(existDevice); | ||
| 923 | + log.info("[registerSubDevice][网关({}/{}) 绑定子设备({}/{})]", | ||
| 924 | + gatewayDevice.getProductKey(), gatewayDevice.getDeviceName(), | ||
| 925 | + existDevice.getProductKey(), existDevice.getDeviceName()); | ||
| 926 | + } | ||
| 927 | + return existDevice; | ||
| 504 | } | 928 | } |
| 505 | 929 | ||
| 506 | } | 930 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
| @@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.iot.controller.admin.statistics.vo.IotStatisticsD | @@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.iot.controller.admin.statistics.vo.IotStatisticsD | ||
| 7 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 7 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 8 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 8 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 9 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceMessageDO; | 9 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceMessageDO; |
| 10 | -import jakarta.validation.constraints.NotEmpty; | ||
| 11 | import jakarta.validation.constraints.NotNull; | 10 | import jakarta.validation.constraints.NotNull; |
| 12 | 11 | ||
| 13 | import javax.annotation.Nullable; | 12 | import javax.annotation.Nullable; |
| @@ -75,7 +74,7 @@ public interface IotDeviceMessageService { | @@ -75,7 +74,7 @@ public interface IotDeviceMessageService { | ||
| 75 | */ | 74 | */ |
| 76 | List<IotDeviceMessageDO> getDeviceMessageListByRequestIdsAndReply( | 75 | List<IotDeviceMessageDO> getDeviceMessageListByRequestIdsAndReply( |
| 77 | @NotNull(message = "设备编号不能为空") Long deviceId, | 76 | @NotNull(message = "设备编号不能为空") Long deviceId, |
| 78 | - @NotEmpty(message = "请求编号不能为空") List<String> requestIds, | 77 | + List<String> requestIds, |
| 79 | Boolean reply); | 78 | Boolean reply); |
| 80 | 79 | ||
| 81 | /** | 80 | /** |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
| 1 | package cn.iocoder.yudao.module.iot.service.device.message; | 1 | package cn.iocoder.yudao.module.iot.service.device.message; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.collection.CollUtil; | ||
| 4 | +import cn.hutool.core.collection.ListUtil; | ||
| 3 | import cn.hutool.core.date.LocalDateTimeUtil; | 5 | import cn.hutool.core.date.LocalDateTimeUtil; |
| 4 | import cn.hutool.core.lang.Assert; | 6 | import cn.hutool.core.lang.Assert; |
| 5 | import cn.hutool.core.map.MapUtil; | 7 | import cn.hutool.core.map.MapUtil; |
| @@ -16,6 +18,10 @@ import cn.iocoder.yudao.module.iot.controller.admin.statistics.vo.IotStatisticsD | @@ -16,6 +18,10 @@ import cn.iocoder.yudao.module.iot.controller.admin.statistics.vo.IotStatisticsD | ||
| 16 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; | 18 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; |
| 17 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 19 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 18 | import cn.iocoder.yudao.module.iot.core.mq.producer.IotDeviceMessageProducer; | 20 | import cn.iocoder.yudao.module.iot.core.mq.producer.IotDeviceMessageProducer; |
| 21 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 22 | +import cn.iocoder.yudao.module.iot.core.topic.event.IotDeviceEventPostReqDTO; | ||
| 23 | +import cn.iocoder.yudao.module.iot.core.topic.property.IotDevicePropertyPackPostReqDTO; | ||
| 24 | +import cn.iocoder.yudao.module.iot.core.topic.property.IotDevicePropertyPostReqDTO; | ||
| 19 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; | 25 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; |
| 20 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | 26 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; |
| 21 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceMessageDO; | 27 | import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceMessageDO; |
| @@ -98,7 +104,6 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -98,7 +104,6 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 98 | return sendDeviceMessage(message, device); | 104 | return sendDeviceMessage(message, device); |
| 99 | } | 105 | } |
| 100 | 106 | ||
| 101 | - // TODO @芋艿：针对连接网关的设备，是不是 productKey、deviceName 需要调整下； | ||
| 102 | @Override | 107 | @Override |
| 103 | public IotDeviceMessage sendDeviceMessage(IotDeviceMessage message, IotDeviceDO device) { | 108 | public IotDeviceMessage sendDeviceMessage(IotDeviceMessage message, IotDeviceDO device) { |
| 104 | return sendDeviceMessage(message, device, null); | 109 | return sendDeviceMessage(message, device, null); |
| @@ -168,7 +173,7 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -168,7 +173,7 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 168 | // 2. 记录消息 | 173 | // 2. 记录消息 |
| 169 | getSelf().createDeviceLogAsync(message); | 174 | getSelf().createDeviceLogAsync(message); |
| 170 | 175 | ||
| 171 | - // 3. 回复消息。前提：非 _reply 消息，并且非禁用回复的消息 | 176 | + // 3. 回复消息。前提：非 _reply 消息、非禁用回复的消息 |
| 172 | if (IotDeviceMessageUtils.isReplyMessage(message) | 177 | if (IotDeviceMessageUtils.isReplyMessage(message) |
| 173 | || IotDeviceMessageMethodEnum.isReplyDisabled(message.getMethod()) | 178 | || IotDeviceMessageMethodEnum.isReplyDisabled(message.getMethod()) |
| 174 | || StrUtil.isEmpty(message.getServerId())) { | 179 | || StrUtil.isEmpty(message.getServerId())) { |
| @@ -185,15 +190,14 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -185,15 +190,14 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 185 | } | 190 | } |
| 186 | 191 | ||
| 187 | // TODO @芋艿：可优化：未来逻辑复杂后，可以独立拆除 Processor 处理器 | 192 | // TODO @芋艿：可优化：未来逻辑复杂后，可以独立拆除 Processor 处理器 |
| 188 | - @SuppressWarnings("SameReturnValue") | ||
| 189 | private Object handleUpstreamDeviceMessage0(IotDeviceMessage message, IotDeviceDO device) { | 193 | private Object handleUpstreamDeviceMessage0(IotDeviceMessage message, IotDeviceDO device) { |
| 190 | // 设备上下线 | 194 | // 设备上下线 |
| 191 | if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.STATE_UPDATE.getMethod())) { | 195 | if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.STATE_UPDATE.getMethod())) { |
| 192 | String stateStr = IotDeviceMessageUtils.getIdentifier(message); | 196 | String stateStr = IotDeviceMessageUtils.getIdentifier(message); |
| 193 | assert stateStr != null; | 197 | assert stateStr != null; |
| 194 | Assert.notEmpty(stateStr, "设备状态不能为空"); | 198 | Assert.notEmpty(stateStr, "设备状态不能为空"); |
| 195 | - deviceService.updateDeviceState(device, Integer.valueOf(stateStr)); | ||
| 196 | - // TODO 芋艿：子设备的关联 | 199 | + Integer state = Integer.valueOf(stateStr); |
| 200 | + deviceService.updateDeviceState(device, state); | ||
| 197 | return null; | 201 | return null; |
| 198 | } | 202 | } |
| 199 | 203 | ||
| @@ -202,6 +206,11 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -202,6 +206,11 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 202 | devicePropertyService.saveDeviceProperty(device, message); | 206 | devicePropertyService.saveDeviceProperty(device, message); |
| 203 | return null; | 207 | return null; |
| 204 | } | 208 | } |
| 209 | + // 批量上报（属性+事件+子设备） | ||
| 210 | + if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod())) { | ||
| 211 | + handlePackMessage(message, device); | ||
| 212 | + return null; | ||
| 213 | + } | ||
| 205 | 214 | ||
| 206 | // OTA 上报升级进度 | 215 | // OTA 上报升级进度 |
| 207 | if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.OTA_PROGRESS.getMethod())) { | 216 | if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.OTA_PROGRESS.getMethod())) { |
| @@ -209,10 +218,109 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -209,10 +218,109 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 209 | return null; | 218 | return null; |
| 210 | } | 219 | } |
| 211 | 220 | ||
| 212 | - // TODO @芋艿：这里可以按需，添加别的逻辑； | 221 | + // 添加拓扑关系 |
| 222 | + if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.TOPO_ADD.getMethod())) { | ||
| 223 | + return deviceService.handleTopoAddMessage(message, device); | ||
| 224 | + } | ||
| 225 | + // 删除拓扑关系 | ||
| 226 | + if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.TOPO_DELETE.getMethod())) { | ||
| 227 | + return deviceService.handleTopoDeleteMessage(message, device); | ||
| 228 | + } | ||
| 229 | + // 获取拓扑关系 | ||
| 230 | + if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.TOPO_GET.getMethod())) { | ||
| 231 | + return deviceService.handleTopoGetMessage(device); | ||
| 232 | + } | ||
| 233 | + | ||
| 234 | + // 子设备动态注册 | ||
| 235 | + if (Objects.equal(message.getMethod(), IotDeviceMessageMethodEnum.SUB_DEVICE_REGISTER.getMethod())) { | ||
| 236 | + return deviceService.handleSubDeviceRegisterMessage(message, device); | ||
| 237 | + } | ||
| 238 | + | ||
| 213 | return null; | 239 | return null; |
| 214 | } | 240 | } |
| 215 | 241 | ||
| 242 | + // ========== 批量上报处理方法 ========== | ||
| 243 | + | ||
| 244 | + /** | ||
| 245 | + * 处理批量上报消息 | ||
| 246 | + * <p> | ||
| 247 | + * 将 pack 消息拆分成多条标准消息，发送到 MQ 让规则引擎处理 | ||
| 248 | + * | ||
| 249 | + * @param packMessage 批量消息 | ||
| 250 | + * @param gatewayDevice 网关设备 | ||
| 251 | + */ | ||
| 252 | + private void handlePackMessage(IotDeviceMessage packMessage, IotDeviceDO gatewayDevice) { | ||
| 253 | + // 1. 解析参数 | ||
| 254 | + IotDevicePropertyPackPostReqDTO params = JsonUtils.convertObject( | ||
| 255 | + packMessage.getParams(), IotDevicePropertyPackPostReqDTO.class); | ||
| 256 | + if (params == null) { | ||
| 257 | + log.warn("[handlePackMessage][消息({}) 参数解析失败]", packMessage); | ||
| 258 | + return; | ||
| 259 | + } | ||
| 260 | + | ||
| 261 | + // 2. 处理网关设备（自身）的数据 | ||
| 262 | + sendDevicePackData(gatewayDevice, packMessage.getServerId(), params.getProperties(), params.getEvents()); | ||
| 263 | + | ||
| 264 | + // 3. 处理子设备的数据 | ||
| 265 | + if (CollUtil.isEmpty(params.getSubDevices())) { | ||
| 266 | + return; | ||
| 267 | + } | ||
| 268 | + for (IotDevicePropertyPackPostReqDTO.SubDeviceData subDeviceData : params.getSubDevices()) { | ||
| 269 | + try { | ||
| 270 | + IotDeviceIdentity identity = subDeviceData.getIdentity(); | ||
| 271 | + IotDeviceDO subDevice = deviceService.getDeviceFromCache(identity.getProductKey(), identity.getDeviceName()); | ||
| 272 | + if (subDevice == null) { | ||
| 273 | + log.warn("[handlePackMessage][子设备({}/{}) 不存在]", identity.getProductKey(), identity.getDeviceName()); | ||
| 274 | + continue; | ||
| 275 | + } | ||
| 276 | + // 特殊：子设备不需要指定 serverId，因为子设备实际可能连接在不同的 gateway-server 上，导致 serverId 不同 | ||
| 277 | + sendDevicePackData(subDevice, null, subDeviceData.getProperties(), subDeviceData.getEvents()); | ||
| 278 | + } catch (Exception ex) { | ||
| 279 | + log.error("[handlePackMessage][子设备({}/{}) 数据处理失败]", subDeviceData.getIdentity().getProductKey(), | ||
| 280 | + subDeviceData.getIdentity().getDeviceName(), ex); | ||
| 281 | + } | ||
| 282 | + } | ||
| 283 | + } | ||
| 284 | + | ||
| 285 | + /** | ||
| 286 | + * 发送设备 pack 数据到 MQ（属性 + 事件） | ||
| 287 | + * | ||
| 288 | + * @param device 设备 | ||
| 289 | + * @param serverId 服务标识 | ||
| 290 | + * @param properties 属性数据 | ||
| 291 | + * @param events 事件数据 | ||
| 292 | + */ | ||
| 293 | + private void sendDevicePackData(IotDeviceDO device, String serverId, | ||
| 294 | + Map<String, Object> properties, | ||
| 295 | + Map<String, IotDevicePropertyPackPostReqDTO.EventValue> events) { | ||
| 296 | + // 1. 发送属性消息 | ||
| 297 | + if (MapUtil.isNotEmpty(properties)) { | ||
| 298 | + IotDeviceMessage propertyMsg = IotDeviceMessage.requestOf( | ||
| 299 | + device.getId(), device.getTenantId(), serverId, | ||
| 300 | + IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod(), | ||
| 301 | + IotDevicePropertyPostReqDTO.of(properties)); | ||
| 302 | + deviceMessageProducer.sendDeviceMessage(propertyMsg); | ||
| 303 | + } | ||
| 304 | + | ||
| 305 | + // 2. 发送事件消息 | ||
| 306 | + if (MapUtil.isNotEmpty(events)) { | ||
| 307 | + for (Map.Entry<String, IotDevicePropertyPackPostReqDTO.EventValue> eventEntry : events.entrySet()) { | ||
| 308 | + String eventId = eventEntry.getKey(); | ||
| 309 | + IotDevicePropertyPackPostReqDTO.EventValue eventValue = eventEntry.getValue(); | ||
| 310 | + if (eventValue == null) { | ||
| 311 | + continue; | ||
| 312 | + } | ||
| 313 | + IotDeviceMessage eventMsg = IotDeviceMessage.requestOf( | ||
| 314 | + device.getId(), device.getTenantId(), serverId, | ||
| 315 | + IotDeviceMessageMethodEnum.EVENT_POST.getMethod(), | ||
| 316 | + IotDeviceEventPostReqDTO.of(eventId, eventValue.getValue(), eventValue.getTime())); | ||
| 317 | + deviceMessageProducer.sendDeviceMessage(eventMsg); | ||
| 318 | + } | ||
| 319 | + } | ||
| 320 | + } | ||
| 321 | + | ||
| 322 | + // ========= 设备消息查询 ========== | ||
| 323 | + | ||
| 216 | @Override | 324 | @Override |
| 217 | public PageResult<IotDeviceMessageDO> getDeviceMessagePage(IotDeviceMessagePageReqVO pageReqVO) { | 325 | public PageResult<IotDeviceMessageDO> getDeviceMessagePage(IotDeviceMessagePageReqVO pageReqVO) { |
| 218 | try { | 326 | try { |
| @@ -228,9 +336,10 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | @@ -228,9 +336,10 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService { | ||
| 228 | } | 336 | } |
| 229 | 337 | ||
| 230 | @Override | 338 | @Override |
| 231 | - public List<IotDeviceMessageDO> getDeviceMessageListByRequestIdsAndReply(Long deviceId, | ||
| 232 | - List<String> requestIds, | ||
| 233 | - Boolean reply) { | 339 | + public List<IotDeviceMessageDO> getDeviceMessageListByRequestIdsAndReply(Long deviceId, List<String> requestIds, Boolean reply) { |
| 340 | + if (CollUtil.isEmpty(requestIds)) { | ||
| 341 | + return ListUtil.of(); | ||
| 342 | + } | ||
| 234 | return deviceMessageMapper.selectListByRequestIdsAndReply(deviceId, requestIds, reply); | 343 | return deviceMessageMapper.selectListByRequestIdsAndReply(deviceId, requestIds, reply); |
| 235 | } | 344 | } |
| 236 | 345 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
| @@ -22,6 +22,7 @@ import cn.iocoder.yudao.module.iot.dal.tdengine.IotDevicePropertyMapper; | @@ -22,6 +22,7 @@ import cn.iocoder.yudao.module.iot.dal.tdengine.IotDevicePropertyMapper; | ||
| 22 | import cn.iocoder.yudao.module.iot.enums.thingmodel.IotDataSpecsDataTypeEnum; | 22 | import cn.iocoder.yudao.module.iot.enums.thingmodel.IotDataSpecsDataTypeEnum; |
| 23 | import cn.iocoder.yudao.module.iot.enums.thingmodel.IotThingModelTypeEnum; | 23 | import cn.iocoder.yudao.module.iot.enums.thingmodel.IotThingModelTypeEnum; |
| 24 | import cn.iocoder.yudao.module.iot.framework.tdengine.core.TDengineTableField; | 24 | import cn.iocoder.yudao.module.iot.framework.tdengine.core.TDengineTableField; |
| 25 | +import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; | ||
| 25 | import cn.iocoder.yudao.module.iot.service.product.IotProductService; | 26 | import cn.iocoder.yudao.module.iot.service.product.IotProductService; |
| 26 | import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService; | 27 | import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService; |
| 27 | import jakarta.annotation.Resource; | 28 | import jakarta.annotation.Resource; |
| @@ -30,10 +31,12 @@ import org.springframework.context.annotation.Lazy; | @@ -30,10 +31,12 @@ import org.springframework.context.annotation.Lazy; | ||
| 30 | import org.springframework.scheduling.annotation.Async; | 31 | import org.springframework.scheduling.annotation.Async; |
| 31 | import org.springframework.stereotype.Service; | 32 | import org.springframework.stereotype.Service; |
| 32 | 33 | ||
| 34 | +import java.math.BigDecimal; | ||
| 33 | import java.time.LocalDateTime; | 35 | import java.time.LocalDateTime; |
| 34 | import java.util.*; | 36 | import java.util.*; |
| 35 | 37 | ||
| 36 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; | 38 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; |
| 39 | +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.getBigDecimal; | ||
| 37 | 40 | ||
| 38 | /** | 41 | /** |
| 39 | * IoT 设备【属性】数据 Service 实现类 | 42 | * IoT 设备【属性】数据 Service 实现类 |
| @@ -66,6 +69,9 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | @@ -66,6 +69,9 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | ||
| 66 | @Resource | 69 | @Resource |
| 67 | @Lazy // 延迟加载，解决循环依赖 | 70 | @Lazy // 延迟加载，解决循环依赖 |
| 68 | private IotProductService productService; | 71 | private IotProductService productService; |
| 72 | + @Resource | ||
| 73 | + @Lazy // 延迟加载，解决循环依赖 | ||
| 74 | + private IotDeviceService deviceService; | ||
| 69 | 75 | ||
| 70 | @Resource | 76 | @Resource |
| 71 | private DevicePropertyRedisDAO deviceDataRedisDAO; | 77 | private DevicePropertyRedisDAO deviceDataRedisDAO; |
| @@ -126,48 +132,60 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | @@ -126,48 +132,60 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | ||
| 126 | } | 132 | } |
| 127 | 133 | ||
| 128 | @Override | 134 | @Override |
| 135 | + @SuppressWarnings("PatternVariableCanBeUsed") | ||
| 129 | public void saveDeviceProperty(IotDeviceDO device, IotDeviceMessage message) { | 136 | public void saveDeviceProperty(IotDeviceDO device, IotDeviceMessage message) { |
| 130 | if (!(message.getParams() instanceof Map)) { | 137 | if (!(message.getParams() instanceof Map)) { |
| 131 | log.error("[saveDeviceProperty][消息内容({}) 的 data 类型不正确]", message); | 138 | log.error("[saveDeviceProperty][消息内容({}) 的 data 类型不正确]", message); |
| 132 | return; | 139 | return; |
| 133 | } | 140 | } |
| 141 | + Map<?, ?> params = (Map<?, ?>) message.getParams(); | ||
| 142 | + if (CollUtil.isEmpty(params)) { | ||
| 143 | + log.error("[saveDeviceProperty][消息内容({}) 的 data 为空]", message); | ||
| 144 | + return; | ||
| 145 | + } | ||
| 134 | 146 | ||
| 135 | // 1. 根据物模型，拼接合法的属性 | 147 | // 1. 根据物模型，拼接合法的属性 |
| 136 | // TODO @芋艿：【待定 004】赋能后，属性到底以 thingModel 为准（ik），还是 db 的表结构为准（tl）？ | 148 | // TODO @芋艿：【待定 004】赋能后，属性到底以 thingModel 为准（ik），还是 db 的表结构为准（tl）？ |
| 137 | List<IotThingModelDO> thingModels = thingModelService.getThingModelListByProductIdFromCache(device.getProductId()); | 149 | List<IotThingModelDO> thingModels = thingModelService.getThingModelListByProductIdFromCache(device.getProductId()); |
| 138 | Map<String, Object> properties = new HashMap<>(); | 150 | Map<String, Object> properties = new HashMap<>(); |
| 139 | - ((Map<?, ?>) message.getParams()).forEach((key, value) -> { | 151 | + params.forEach((key, value) -> { |
| 140 | IotThingModelDO thingModel = CollUtil.findOne(thingModels, o -> o.getIdentifier().equals(key)); | 152 | IotThingModelDO thingModel = CollUtil.findOne(thingModels, o -> o.getIdentifier().equals(key)); |
| 141 | if (thingModel == null || thingModel.getProperty() == null) { | 153 | if (thingModel == null || thingModel.getProperty() == null) { |
| 142 | log.error("[saveDeviceProperty][消息({}) 的属性({}) 不存在]", message, key); | 154 | log.error("[saveDeviceProperty][消息({}) 的属性({}) 不存在]", message, key); |
| 143 | return; | 155 | return; |
| 144 | } | 156 | } |
| 145 | - if (ObjectUtils.equalsAny(thingModel.getProperty().getDataType(), | 157 | + String dataType = thingModel.getProperty().getDataType(); |
| 158 | + if (ObjectUtils.equalsAny(dataType, | ||
| 146 | IotDataSpecsDataTypeEnum.STRUCT.getDataType(), IotDataSpecsDataTypeEnum.ARRAY.getDataType())) { | 159 | IotDataSpecsDataTypeEnum.STRUCT.getDataType(), IotDataSpecsDataTypeEnum.ARRAY.getDataType())) { |
| 147 | // 特殊：STRUCT 和 ARRAY 类型，在 TDengine 里，有没对应数据类型，只能通过 JSON 来存储 | 160 | // 特殊：STRUCT 和 ARRAY 类型，在 TDengine 里，有没对应数据类型，只能通过 JSON 来存储 |
| 148 | properties.put((String) key, JsonUtils.toJsonString(value)); | 161 | properties.put((String) key, JsonUtils.toJsonString(value)); |
| 149 | - } else if (IotDataSpecsDataTypeEnum.DOUBLE.getDataType().equals(thingModel.getProperty().getDataType())) { | ||
| 150 | - properties.put((String) key, Convert.toDouble(value)); | ||
| 151 | - } else if (IotDataSpecsDataTypeEnum.FLOAT.getDataType().equals(thingModel.getProperty().getDataType())) { | 162 | + } else if (IotDataSpecsDataTypeEnum.INT.getDataType().equals(dataType)) { |
| 163 | + properties.put((String) key, Convert.toInt(value)); | ||
| 164 | + } else if (IotDataSpecsDataTypeEnum.FLOAT.getDataType().equals(dataType)) { | ||
| 152 | properties.put((String) key, Convert.toFloat(value)); | 165 | properties.put((String) key, Convert.toFloat(value)); |
| 153 | - } else if (IotDataSpecsDataTypeEnum.BOOL.getDataType().equals(thingModel.getProperty().getDataType())) { | 166 | + } else if (IotDataSpecsDataTypeEnum.DOUBLE.getDataType().equals(dataType)) { |
| 167 | + properties.put((String) key, Convert.toDouble(value)); | ||
| 168 | + } else if (IotDataSpecsDataTypeEnum.BOOL.getDataType().equals(dataType)) { | ||
| 154 | properties.put((String) key, Convert.toByte(value)); | 169 | properties.put((String) key, Convert.toByte(value)); |
| 155 | - } else { | 170 | + } else { |
| 156 | properties.put((String) key, value); | 171 | properties.put((String) key, value); |
| 157 | } | 172 | } |
| 158 | }); | 173 | }); |
| 159 | if (CollUtil.isEmpty(properties)) { | 174 | if (CollUtil.isEmpty(properties)) { |
| 160 | log.error("[saveDeviceProperty][消息({}) 没有合法的属性]", message); | 175 | log.error("[saveDeviceProperty][消息({}) 没有合法的属性]", message); |
| 161 | - return; | ||
| 162 | - } | 176 | + } else { |
| 177 | + // 2.1 保存设备属性【数据】 | ||
| 178 | + devicePropertyMapper.insert(device, properties, LocalDateTimeUtil.toEpochMilli(message.getReportTime())); | ||
| 163 | 179 | ||
| 164 | - // 2.1 保存设备属性【数据】 | ||
| 165 | - devicePropertyMapper.insert(device, properties, LocalDateTimeUtil.toEpochMilli(message.getReportTime())); | 180 | + // 2.2 保存设备属性【日志】 |
| 181 | + Map<String, IotDevicePropertyDO> properties2 = convertMap(properties.entrySet(), Map.Entry::getKey, entry -> | ||
| 182 | + IotDevicePropertyDO.builder().value(entry.getValue()).updateTime(message.getReportTime()).build()); | ||
| 183 | + deviceDataRedisDAO.putAll(device.getId(), properties2); | ||
| 184 | + } | ||
| 166 | 185 | ||
| 167 | - // 2.2 保存设备属性【日志】 | ||
| 168 | - Map<String, IotDevicePropertyDO> properties2 = convertMap(properties.entrySet(), Map.Entry::getKey, entry -> | ||
| 169 | - IotDevicePropertyDO.builder().value(entry.getValue()).updateTime(message.getReportTime()).build()); | ||
| 170 | - deviceDataRedisDAO.putAll(device.getId(), properties2); | 186 | + // 2.3 提取 GeoLocation 并更新设备定位 |
| 187 | + // 为什么 properties 为空，也要执行定位更新？因为可能上报的属性里，没有合法属性，但是包含 GeoLocation 定位属性 | ||
| 188 | + extractAndUpdateDeviceLocation(device, (Map<?, ?>) message.getParams()); | ||
| 171 | } | 189 | } |
| 172 | 190 | ||
| 173 | @Override | 191 | @Override |
| @@ -213,4 +231,77 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | @@ -213,4 +231,77 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { | ||
| 213 | return deviceServerIdRedisDAO.get(id); | 231 | return deviceServerIdRedisDAO.get(id); |
| 214 | } | 232 | } |
| 215 | 233 | ||
| 234 | + // ========== 设备定位相关操作 ========== | ||
| 235 | + | ||
| 236 | + /** | ||
| 237 | + * 从属性中提取 GeoLocation 并更新设备定位 | ||
| 238 | + * | ||
| 239 | + * @see <a href="https://help.aliyun.com/zh/iot/user-guide/device-geolocation">阿里云规范</a> | ||
| 240 | + * GeoLocation 结构体包含：Longitude, Latitude, Altitude, CoordinateSystem | ||
| 241 | + */ | ||
| 242 | + private void extractAndUpdateDeviceLocation(IotDeviceDO device, Map<?, ?> params) { | ||
| 243 | + // 1. 解析 GeoLocation 经纬度坐标 | ||
| 244 | + BigDecimal[] location = parseGeoLocation(params); | ||
| 245 | + if (location == null) { | ||
| 246 | + return; | ||
| 247 | + } | ||
| 248 | + | ||
| 249 | + // 2. 更新设备定位 | ||
| 250 | + deviceService.updateDeviceLocation(device, location[0], location[1]); | ||
| 251 | + log.info("[extractAndUpdateGeoLocation][设备({}) 定位更新: lng={}, lat={}]", | ||
| 252 | + device.getId(), location[0], location[1]); | ||
| 253 | + } | ||
| 254 | + | ||
| 255 | + /** | ||
| 256 | + * 从属性参数中解析 GeoLocation，返回经纬度坐标数组 [longitude, latitude] | ||
| 257 | + * | ||
| 258 | + * @param params 属性参数 | ||
| 259 | + * @return [经度, 纬度]，解析失败返回 null | ||
| 260 | + */ | ||
| 261 | + @SuppressWarnings("unchecked") | ||
| 262 | + private BigDecimal[] parseGeoLocation(Map<?, ?> params) { | ||
| 263 | + if (params == null) { | ||
| 264 | + return null; | ||
| 265 | + } | ||
| 266 | + // 1. 查找 GeoLocation 属性（标识符为 GeoLocation 或 geoLocation） | ||
| 267 | + Object geoValue = params.get("GeoLocation"); | ||
| 268 | + if (geoValue == null) { | ||
| 269 | + geoValue = params.get("geoLocation"); | ||
| 270 | + } | ||
| 271 | + if (geoValue == null) { | ||
| 272 | + return null; | ||
| 273 | + } | ||
| 274 | + | ||
| 275 | + // 2. 转换为 Map | ||
| 276 | + Map<String, Object> geoLocation = null; | ||
| 277 | + if (geoValue instanceof Map) { | ||
| 278 | + geoLocation = (Map<String, Object>) geoValue; | ||
| 279 | + } else if (geoValue instanceof String) { | ||
| 280 | + geoLocation = JsonUtils.parseObject((String) geoValue, Map.class); | ||
| 281 | + } | ||
| 282 | + if (geoLocation == null) { | ||
| 283 | + return null; | ||
| 284 | + } | ||
| 285 | + | ||
| 286 | + // 3. 提取经纬度（支持阿里云命名规范：首字母大写） | ||
| 287 | + BigDecimal longitude = getBigDecimal(geoLocation, "Longitude"); | ||
| 288 | + if (longitude == null) { | ||
| 289 | + longitude = getBigDecimal(geoLocation, "longitude"); | ||
| 290 | + } | ||
| 291 | + BigDecimal latitude = getBigDecimal(geoLocation, "Latitude"); | ||
| 292 | + if (latitude == null) { | ||
| 293 | + latitude = getBigDecimal(geoLocation, "latitude"); | ||
| 294 | + } | ||
| 295 | + if (longitude == null || latitude == null) { | ||
| 296 | + return null; | ||
| 297 | + } | ||
| 298 | + // 校验经纬度范围：经度 -180 到 180，纬度 -90 到 90 | ||
| 299 | + if (longitude.compareTo(BigDecimal.valueOf(-180)) < 0 || longitude.compareTo(BigDecimal.valueOf(180)) > 0 | ||
| 300 | + || latitude.compareTo(BigDecimal.valueOf(-90)) < 0 || latitude.compareTo(BigDecimal.valueOf(90)) > 0) { | ||
| 301 | + log.warn("[parseGeoLocation][经纬度超出有效范围: lng={}, lat={}]", longitude, latitude); | ||
| 302 | + return null; | ||
| 303 | + } | ||
| 304 | + return new BigDecimal[]{longitude, latitude}; | ||
| 305 | + } | ||
| 306 | + | ||
| 216 | } | 307 | } |
| 217 | \ No newline at end of file | 308 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
| @@ -106,6 +106,14 @@ public interface IotProductService { | @@ -106,6 +106,14 @@ public interface IotProductService { | ||
| 106 | List<IotProductDO> getProductList(); | 106 | List<IotProductDO> getProductList(); |
| 107 | 107 | ||
| 108 | /** | 108 | /** |
| 109 | + * 根据设备类型获得产品列表 | ||
| 110 | + * | ||
| 111 | + * @param deviceType 设备类型（可选） | ||
| 112 | + * @return 产品列表 | ||
| 113 | + */ | ||
| 114 | + List<IotProductDO> getProductList(@Nullable Integer deviceType); | ||
| 115 | + | ||
| 116 | + /** | ||
| 109 | * 获得产品数量 | 117 | * 获得产品数量 |
| 110 | * | 118 | * |
| 111 | * @param createTime 创建时间，如果为空，则统计所有产品数量 | 119 | * @param createTime 创建时间，如果为空，则统计所有产品数量 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
| @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iot.service.product; | @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iot.service.product; | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 5 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 6 | +import cn.hutool.core.util.IdUtil; | ||
| 6 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; | 7 | import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; |
| 7 | import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO; | 8 | import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO; |
| 8 | import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductSaveReqVO; | 9 | import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductSaveReqVO; |
| @@ -53,19 +54,22 @@ public class IotProductServiceImpl implements IotProductService { | @@ -53,19 +54,22 @@ public class IotProductServiceImpl implements IotProductService { | ||
| 53 | 54 | ||
| 54 | // 2. 插入 | 55 | // 2. 插入 |
| 55 | IotProductDO product = BeanUtils.toBean(createReqVO, IotProductDO.class) | 56 | IotProductDO product = BeanUtils.toBean(createReqVO, IotProductDO.class) |
| 56 | - .setStatus(IotProductStatusEnum.UNPUBLISHED.getStatus()); | 57 | + .setStatus(IotProductStatusEnum.UNPUBLISHED.getStatus()) |
| 58 | + .setProductSecret(generateProductSecret()); | ||
| 57 | productMapper.insert(product); | 59 | productMapper.insert(product); |
| 58 | return product.getId(); | 60 | return product.getId(); |
| 59 | } | 61 | } |
| 60 | 62 | ||
| 63 | + private String generateProductSecret() { | ||
| 64 | + return IdUtil.fastSimpleUUID(); | ||
| 65 | + } | ||
| 66 | + | ||
| 61 | @Override | 67 | @Override |
| 62 | @CacheEvict(value = RedisKeyConstants.PRODUCT, key = "#updateReqVO.id") | 68 | @CacheEvict(value = RedisKeyConstants.PRODUCT, key = "#updateReqVO.id") |
| 63 | public void updateProduct(IotProductSaveReqVO updateReqVO) { | 69 | public void updateProduct(IotProductSaveReqVO updateReqVO) { |
| 64 | updateReqVO.setProductKey(null); // 不更新产品标识 | 70 | updateReqVO.setProductKey(null); // 不更新产品标识 |
| 65 | - // 1.1 校验存在 | ||
| 66 | - IotProductDO iotProductDO = validateProductExists(updateReqVO.getId()); | ||
| 67 | - // 1.2 发布状态不可更新 | ||
| 68 | - validateProductStatus(iotProductDO); | 71 | + // 1. 校验存在 |
| 72 | + validateProductExists(updateReqVO.getId()); | ||
| 69 | 73 | ||
| 70 | // 2. 更新 | 74 | // 2. 更新 |
| 71 | IotProductDO updateObj = BeanUtils.toBean(updateReqVO, IotProductDO.class); | 75 | IotProductDO updateObj = BeanUtils.toBean(updateReqVO, IotProductDO.class); |
| @@ -158,6 +162,11 @@ public class IotProductServiceImpl implements IotProductService { | @@ -158,6 +162,11 @@ public class IotProductServiceImpl implements IotProductService { | ||
| 158 | } | 162 | } |
| 159 | 163 | ||
| 160 | @Override | 164 | @Override |
| 165 | + public List<IotProductDO> getProductList(Integer deviceType) { | ||
| 166 | + return productMapper.selectList(deviceType); | ||
| 167 | + } | ||
| 168 | + | ||
| 169 | + @Override | ||
| 161 | public Long getProductCount(LocalDateTime createTime) { | 170 | public Long getProductCount(LocalDateTime createTime) { |
| 162 | return productMapper.selectCountByCreateTime(createTime); | 171 | return productMapper.selectCountByCreateTime(createTime); |
| 163 | } | 172 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/IotDataRuleServiceImpl.java
| @@ -32,6 +32,7 @@ import java.util.*; | @@ -32,6 +32,7 @@ import java.util.*; | ||
| 32 | 32 | ||
| 33 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 33 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 34 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | 34 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; |
| 35 | +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_RULE_NAME_EXISTS; | ||
| 35 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_RULE_NOT_EXISTS; | 36 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_RULE_NOT_EXISTS; |
| 36 | 37 | ||
| 37 | /** | 38 | /** |
| @@ -62,6 +63,8 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | @@ -62,6 +63,8 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | ||
| 62 | @Override | 63 | @Override |
| 63 | @CacheEvict(value = RedisKeyConstants.DATA_RULE_LIST, allEntries = true) | 64 | @CacheEvict(value = RedisKeyConstants.DATA_RULE_LIST, allEntries = true) |
| 64 | public Long createDataRule(IotDataRuleSaveReqVO createReqVO) { | 65 | public Long createDataRule(IotDataRuleSaveReqVO createReqVO) { |
| 66 | + // 校验名称唯一 | ||
| 67 | + validateDataRuleNameUnique(null, createReqVO.getName()); | ||
| 65 | // 校验数据源配置和数据目的 | 68 | // 校验数据源配置和数据目的 |
| 66 | validateDataRuleConfig(createReqVO); | 69 | validateDataRuleConfig(createReqVO); |
| 67 | // 新增 | 70 | // 新增 |
| @@ -75,6 +78,8 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | @@ -75,6 +78,8 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | ||
| 75 | public void updateDataRule(IotDataRuleSaveReqVO updateReqVO) { | 78 | public void updateDataRule(IotDataRuleSaveReqVO updateReqVO) { |
| 76 | // 校验存在 | 79 | // 校验存在 |
| 77 | validateDataRuleExists(updateReqVO.getId()); | 80 | validateDataRuleExists(updateReqVO.getId()); |
| 81 | + // 校验名称唯一 | ||
| 82 | + validateDataRuleNameUnique(updateReqVO.getId(), updateReqVO.getName()); | ||
| 78 | // 校验数据源配置和数据目的 | 83 | // 校验数据源配置和数据目的 |
| 79 | validateDataRuleConfig(updateReqVO); | 84 | validateDataRuleConfig(updateReqVO); |
| 80 | 85 | ||
| @@ -99,6 +104,29 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | @@ -99,6 +104,29 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | ||
| 99 | } | 104 | } |
| 100 | 105 | ||
| 101 | /** | 106 | /** |
| 107 | + * 校验数据流转规则名称唯一性 | ||
| 108 | + * | ||
| 109 | + * @param id 数据流转规则编号（用于更新时排除自身） | ||
| 110 | + * @param name 数据流转规则名称 | ||
| 111 | + */ | ||
| 112 | + private void validateDataRuleNameUnique(Long id, String name) { | ||
| 113 | + if (StrUtil.isBlank(name)) { | ||
| 114 | + return; | ||
| 115 | + } | ||
| 116 | + IotDataRuleDO dataRule = dataRuleMapper.selectByName(name); | ||
| 117 | + if (dataRule == null) { | ||
| 118 | + return; | ||
| 119 | + } | ||
| 120 | + // 如果 id 为空，说明不用比较是否为相同 id 的规则 | ||
| 121 | + if (id == null) { | ||
| 122 | + throw exception(DATA_RULE_NAME_EXISTS); | ||
| 123 | + } | ||
| 124 | + if (!dataRule.getId().equals(id)) { | ||
| 125 | + throw exception(DATA_RULE_NAME_EXISTS); | ||
| 126 | + } | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + /** | ||
| 102 | * 校验数据流转规则配置 | 130 | * 校验数据流转规则配置 |
| 103 | * | 131 | * |
| 104 | * @param reqVO 数据流转规则保存请求VO | 132 | * @param reqVO 数据流转规则保存请求VO |
| @@ -243,6 +271,10 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | @@ -243,6 +271,10 @@ public class IotDataRuleServiceImpl implements IotDataRuleService { | ||
| 243 | if (ObjUtil.notEqual(action.getType(), dataSink.getType())) { | 271 | if (ObjUtil.notEqual(action.getType(), dataSink.getType())) { |
| 244 | return; | 272 | return; |
| 245 | } | 273 | } |
| 274 | + if (CommonStatusEnum.isDisable(dataSink.getStatus())) { | ||
| 275 | + log.warn("[executeDataRuleAction][消息({}) 数据目的({}) 状态为禁用]", message.getId(), dataSink.getId()); | ||
| 276 | + return; | ||
| 277 | + } | ||
| 246 | try { | 278 | try { |
| 247 | action.execute(message, dataSink); | 279 | action.execute(message, dataSink); |
| 248 | log.info("[executeDataRuleAction][消息({}) 数据目的({}) 执行成功]", message.getId(), dataSink.getId()); | 280 | log.info("[executeDataRuleAction][消息({}) 数据目的({}) 执行成功]", message.getId(), dataSink.getId()); |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/IotDataSinkServiceImpl.java
| 1 | package cn.iocoder.yudao.module.iot.service.rule.data; | 1 | package cn.iocoder.yudao.module.iot.service.rule.data; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | +import cn.hutool.core.util.StrUtil; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 6 | import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.data.sink.IotDataSinkPageReqVO; | 7 | import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.data.sink.IotDataSinkPageReqVO; |
| @@ -19,6 +20,7 @@ import java.util.List; | @@ -19,6 +20,7 @@ import java.util.List; | ||
| 19 | 20 | ||
| 20 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 21 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 21 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_SINK_DELETE_FAIL_USED_BY_RULE; | 22 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_SINK_DELETE_FAIL_USED_BY_RULE; |
| 23 | +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_SINK_NAME_EXISTS; | ||
| 22 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_SINK_NOT_EXISTS; | 24 | import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_SINK_NOT_EXISTS; |
| 23 | 25 | ||
| 24 | /** | 26 | /** |
| @@ -39,6 +41,9 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | @@ -39,6 +41,9 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | ||
| 39 | 41 | ||
| 40 | @Override | 42 | @Override |
| 41 | public Long createDataSink(IotDataSinkSaveReqVO createReqVO) { | 43 | public Long createDataSink(IotDataSinkSaveReqVO createReqVO) { |
| 44 | + // 校验名称唯一 | ||
| 45 | + validateDataSinkNameUnique(null, createReqVO.getName()); | ||
| 46 | + // 新增 | ||
| 42 | IotDataSinkDO dataBridge = BeanUtils.toBean(createReqVO, IotDataSinkDO.class); | 47 | IotDataSinkDO dataBridge = BeanUtils.toBean(createReqVO, IotDataSinkDO.class); |
| 43 | dataSinkMapper.insert(dataBridge); | 48 | dataSinkMapper.insert(dataBridge); |
| 44 | return dataBridge.getId(); | 49 | return dataBridge.getId(); |
| @@ -48,6 +53,8 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | @@ -48,6 +53,8 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | ||
| 48 | public void updateDataSink(IotDataSinkSaveReqVO updateReqVO) { | 53 | public void updateDataSink(IotDataSinkSaveReqVO updateReqVO) { |
| 49 | // 校验存在 | 54 | // 校验存在 |
| 50 | validateDataBridgeExists(updateReqVO.getId()); | 55 | validateDataBridgeExists(updateReqVO.getId()); |
| 56 | + // 校验名称唯一 | ||
| 57 | + validateDataSinkNameUnique(updateReqVO.getId(), updateReqVO.getName()); | ||
| 51 | // 更新 | 58 | // 更新 |
| 52 | IotDataSinkDO updateObj = BeanUtils.toBean(updateReqVO, IotDataSinkDO.class); | 59 | IotDataSinkDO updateObj = BeanUtils.toBean(updateReqVO, IotDataSinkDO.class); |
| 53 | dataSinkMapper.updateById(updateObj); | 60 | dataSinkMapper.updateById(updateObj); |
| @@ -71,6 +78,29 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | @@ -71,6 +78,29 @@ public class IotDataSinkServiceImpl implements IotDataSinkService { | ||
| 71 | } | 78 | } |
| 72 | } | 79 | } |
| 73 | 80 | ||
| 81 | + /** | ||
| 82 | + * 校验数据流转目的名称唯一性 | ||
| 83 | + * | ||
| 84 | + * @param id 数据流转目的编号（用于更新时排除自身） | ||
| 85 | + * @param name 数据流转目的名称 | ||
| 86 | + */ | ||
| 87 | + private void validateDataSinkNameUnique(Long id, String name) { | ||
| 88 | + if (StrUtil.isBlank(name)) { | ||
| 89 | + return; | ||
| 90 | + } | ||
| 91 | + IotDataSinkDO dataSink = dataSinkMapper.selectByName(name); | ||
| 92 | + if (dataSink == null) { | ||
| 93 | + return; | ||
| 94 | + } | ||
| 95 | + // 如果 id 为空，说明不用比较是否为相同 id 的目的 | ||
| 96 | + if (id == null) { | ||
| 97 | + throw exception(DATA_SINK_NAME_EXISTS); | ||
| 98 | + } | ||
| 99 | + if (!dataSink.getId().equals(id)) { | ||
| 100 | + throw exception(DATA_SINK_NAME_EXISTS); | ||
| 101 | + } | ||
| 102 | + } | ||
| 103 | + | ||
| 74 | @Override | 104 | @Override |
| 75 | public IotDataSinkDO getDataSink(Long id) { | 105 | public IotDataSinkDO getDataSink(Long id) { |
| 76 | return dataSinkMapper.selectById(id); | 106 | return dataSinkMapper.selectById(id); |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotTcpDataRuleAction.java
| @@ -43,7 +43,6 @@ public class IotTcpDataRuleAction extends | @@ -43,7 +43,6 @@ public class IotTcpDataRuleAction extends | ||
| 43 | config.getConnectTimeoutMs(), | 43 | config.getConnectTimeoutMs(), |
| 44 | config.getReadTimeoutMs(), | 44 | config.getReadTimeoutMs(), |
| 45 | config.getSsl(), | 45 | config.getSsl(), |
| 46 | - config.getSslCertPath(), | ||
| 47 | config.getDataFormat() | 46 | config.getDataFormat() |
| 48 | ); | 47 | ); |
| 49 | // 2.2 连接服务器 | 48 | // 2.2 连接服务器 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
| @@ -8,6 +8,10 @@ import cn.iocoder.yudao.module.iot.service.rule.data.action.websocket.IotWebSock | @@ -8,6 +8,10 @@ import cn.iocoder.yudao.module.iot.service.rule.data.action.websocket.IotWebSock | ||
| 8 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
| 9 | import org.springframework.stereotype.Component; | 9 | import org.springframework.stereotype.Component; |
| 10 | 10 | ||
| 11 | +import java.util.concurrent.ConcurrentHashMap; | ||
| 12 | +import java.util.concurrent.TimeUnit; | ||
| 13 | +import java.util.concurrent.locks.ReentrantLock; | ||
| 14 | + | ||
| 11 | /** | 15 | /** |
| 12 | * WebSocket 的 {@link IotDataRuleAction} 实现类 | 16 | * WebSocket 的 {@link IotDataRuleAction} 实现类 |
| 13 | * <p> | 17 | * <p> |
| @@ -22,6 +26,18 @@ import org.springframework.stereotype.Component; | @@ -22,6 +26,18 @@ import org.springframework.stereotype.Component; | ||
| 22 | public class IotWebSocketDataRuleAction extends | 26 | public class IotWebSocketDataRuleAction extends |
| 23 | IotDataRuleCacheableAction<IotDataSinkWebSocketConfig, IotWebSocketClient> { | 27 | IotDataRuleCacheableAction<IotDataSinkWebSocketConfig, IotWebSocketClient> { |
| 24 | 28 | ||
| 29 | + /** | ||
| 30 | + * 锁等待超时时间（毫秒） | ||
| 31 | + */ | ||
| 32 | + private static final long LOCK_WAIT_TIME_MS = 5000; | ||
| 33 | + | ||
| 34 | + /** | ||
| 35 | + * 重连锁，key 为 WebSocket 服务器地址 | ||
| 36 | + * <p> | ||
| 37 | + * WebSocket 连接是与特定服务器实例绑定的，使用单机锁即可保证重连的线程安全 | ||
| 38 | + */ | ||
| 39 | + private final ConcurrentHashMap<String, ReentrantLock> reconnectLocks = new ConcurrentHashMap<>(); | ||
| 40 | + | ||
| 25 | @Override | 41 | @Override |
| 26 | public Integer getType() { | 42 | public Integer getType() { |
| 27 | return IotDataSinkTypeEnum.WEBSOCKET.getType(); | 43 | return IotDataSinkTypeEnum.WEBSOCKET.getType(); |
| @@ -62,12 +78,11 @@ public class IotWebSocketDataRuleAction extends | @@ -62,12 +78,11 @@ public class IotWebSocketDataRuleAction extends | ||
| 62 | protected void execute(IotDeviceMessage message, IotDataSinkWebSocketConfig config) throws Exception { | 78 | protected void execute(IotDeviceMessage message, IotDataSinkWebSocketConfig config) throws Exception { |
| 63 | try { | 79 | try { |
| 64 | // 1.1 获取或创建 WebSocket 客户端 | 80 | // 1.1 获取或创建 WebSocket 客户端 |
| 65 | - // TODO @puhui999：需要加锁，保证必须连接上； | ||
| 66 | IotWebSocketClient webSocketClient = getProducer(config); | 81 | IotWebSocketClient webSocketClient = getProducer(config); |
| 67 | - // 1.2 检查连接状态，如果断开则重新连接 | 82 | + |
| 83 | + // 1.2 检查连接状态，如果断开则使用分布式锁保证重连的线程安全 | ||
| 68 | if (!webSocketClient.isConnected()) { | 84 | if (!webSocketClient.isConnected()) { |
| 69 | - log.warn("[execute][WebSocket 连接已断开，尝试重新连接，服务器: {}]", config.getServerUrl()); | ||
| 70 | - webSocketClient.connect(); | 85 | + reconnectWithLock(webSocketClient, config); |
| 71 | } | 86 | } |
| 72 | 87 | ||
| 73 | // 2.1 发送消息 | 88 | // 2.1 发送消息 |
| @@ -82,4 +97,34 @@ public class IotWebSocketDataRuleAction extends | @@ -82,4 +97,34 @@ public class IotWebSocketDataRuleAction extends | ||
| 82 | } | 97 | } |
| 83 | } | 98 | } |
| 84 | 99 | ||
| 100 | + // TODO @puhui999：为什么这里要加锁呀？ | ||
| 101 | + /** | ||
| 102 | + * 使用锁进行重连，保证同一服务器地址的重连操作线程安全 | ||
| 103 | + * | ||
| 104 | + * @param webSocketClient WebSocket 客户端 | ||
| 105 | + * @param config 配置信息 | ||
| 106 | + */ | ||
| 107 | + private void reconnectWithLock(IotWebSocketClient webSocketClient, IotDataSinkWebSocketConfig config) throws Exception { | ||
| 108 | + ReentrantLock lock = reconnectLocks.computeIfAbsent(config.getServerUrl(), k -> new ReentrantLock()); | ||
| 109 | + boolean acquired = false; | ||
| 110 | + try { | ||
| 111 | + acquired = lock.tryLock(LOCK_WAIT_TIME_MS, TimeUnit.MILLISECONDS); | ||
| 112 | + if (!acquired) { | ||
| 113 | + throw new RuntimeException("获取 WebSocket 重连锁超时，服务器: " + config.getServerUrl()); | ||
| 114 | + } | ||
| 115 | + // 双重检查：获取锁后再次检查连接状态，避免重复连接 | ||
| 116 | + if (!webSocketClient.isConnected()) { | ||
| 117 | + log.warn("[reconnectWithLock][WebSocket 连接已断开，尝试重新连接，服务器: {}]", config.getServerUrl()); | ||
| 118 | + webSocketClient.connect(); | ||
| 119 | + } | ||
| 120 | + } catch (InterruptedException e) { | ||
| 121 | + Thread.currentThread().interrupt(); | ||
| 122 | + throw new RuntimeException("获取 WebSocket 重连锁被中断，服务器: " + config.getServerUrl(), e); | ||
| 123 | + } finally { | ||
| 124 | + if (acquired && lock.isHeldByCurrentThread()) { | ||
| 125 | + lock.unlock(); | ||
| 126 | + } | ||
| 127 | + } | ||
| 128 | + } | ||
| 129 | + | ||
| 85 | } | 130 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/tcp/IotTcpClient.java
| 1 | package cn.iocoder.yudao.module.iot.service.rule.data.action.tcp; | 1 | package cn.iocoder.yudao.module.iot.service.rule.data.action.tcp; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.util.ObjUtil; | ||
| 3 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | 4 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 4 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 5 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 5 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.IotDataSinkTcpConfig; | 6 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.IotDataSinkTcpConfig; |
| @@ -31,8 +32,6 @@ public class IotTcpClient { | @@ -31,8 +32,6 @@ public class IotTcpClient { | ||
| 31 | private final Integer connectTimeoutMs; | 32 | private final Integer connectTimeoutMs; |
| 32 | private final Integer readTimeoutMs; | 33 | private final Integer readTimeoutMs; |
| 33 | private final Boolean ssl; | 34 | private final Boolean ssl; |
| 34 | - // TODO @puhui999：sslCertPath 是不是没在用？ | ||
| 35 | - private final String sslCertPath; | ||
| 36 | private final String dataFormat; | 35 | private final String dataFormat; |
| 37 | 36 | ||
| 38 | private Socket socket; | 37 | private Socket socket; |
| @@ -41,15 +40,13 @@ public class IotTcpClient { | @@ -41,15 +40,13 @@ public class IotTcpClient { | ||
| 41 | private final AtomicBoolean connected = new AtomicBoolean(false); | 40 | private final AtomicBoolean connected = new AtomicBoolean(false); |
| 42 | 41 | ||
| 43 | public IotTcpClient(String host, Integer port, Integer connectTimeoutMs, Integer readTimeoutMs, | 42 | public IotTcpClient(String host, Integer port, Integer connectTimeoutMs, Integer readTimeoutMs, |
| 44 | - Boolean ssl, String sslCertPath, String dataFormat) { | 43 | + Boolean ssl, String dataFormat) { |
| 45 | this.host = host; | 44 | this.host = host; |
| 46 | this.port = port; | 45 | this.port = port; |
| 47 | this.connectTimeoutMs = connectTimeoutMs != null ? connectTimeoutMs : IotDataSinkTcpConfig.DEFAULT_CONNECT_TIMEOUT_MS; | 46 | this.connectTimeoutMs = connectTimeoutMs != null ? connectTimeoutMs : IotDataSinkTcpConfig.DEFAULT_CONNECT_TIMEOUT_MS; |
| 48 | this.readTimeoutMs = readTimeoutMs != null ? readTimeoutMs : IotDataSinkTcpConfig.DEFAULT_READ_TIMEOUT_MS; | 47 | this.readTimeoutMs = readTimeoutMs != null ? readTimeoutMs : IotDataSinkTcpConfig.DEFAULT_READ_TIMEOUT_MS; |
| 49 | this.ssl = ssl != null ? ssl : IotDataSinkTcpConfig.DEFAULT_SSL; | 48 | this.ssl = ssl != null ? ssl : IotDataSinkTcpConfig.DEFAULT_SSL; |
| 50 | - this.sslCertPath = sslCertPath; | ||
| 51 | - // TODO @puhui999：可以使用 StrUtil.defaultIfBlank 方法简化 | ||
| 52 | - this.dataFormat = dataFormat != null ? dataFormat : IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT; | 49 | + this.dataFormat = ObjUtil.defaultIfBlank(dataFormat, IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT); |
| 53 | } | 50 | } |
| 54 | 51 | ||
| 55 | /** | 52 | /** |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
| @@ -4,13 +4,9 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | @@ -4,13 +4,9 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | ||
| 4 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 4 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 5 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.IotDataSinkWebSocketConfig; | 5 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.IotDataSinkWebSocketConfig; |
| 6 | import lombok.extern.slf4j.Slf4j; | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | +import okhttp3.*; | ||
| 7 | 8 | ||
| 8 | -import java.net.URI; | ||
| 9 | -import java.net.http.HttpClient; | ||
| 10 | -import java.net.http.WebSocket; | ||
| 11 | -import java.time.Duration; | ||
| 12 | -import java.util.concurrent.CompletableFuture; | ||
| 13 | -import java.util.concurrent.CompletionStage; | 9 | +import java.util.concurrent.CountDownLatch; |
| 14 | import java.util.concurrent.TimeUnit; | 10 | import java.util.concurrent.TimeUnit; |
| 15 | import java.util.concurrent.atomic.AtomicBoolean; | 11 | import java.util.concurrent.atomic.AtomicBoolean; |
| 16 | 12 | ||
| @@ -19,21 +15,23 @@ import java.util.concurrent.atomic.AtomicBoolean; | @@ -19,21 +15,23 @@ import java.util.concurrent.atomic.AtomicBoolean; | ||
| 19 | * <p> | 15 | * <p> |
| 20 | * 负责与外部 WebSocket 服务器建立连接并发送设备消息 | 16 | * 负责与外部 WebSocket 服务器建立连接并发送设备消息 |
| 21 | * 支持 ws:// 和 wss:// 协议，支持 JSON 和 TEXT 数据格式 | 17 | * 支持 ws:// 和 wss:// 协议，支持 JSON 和 TEXT 数据格式 |
| 22 | - * 基于 Java 11+ 内置的 java.net.http.WebSocket 实现 | 18 | + * 基于 OkHttp WebSocket 实现，兼容 JDK 8+ |
| 19 | + * <p> | ||
| 20 | + * 注意：该类的线程安全由调用方（IotWebSocketDataRuleAction）通过分布式锁保证 | ||
| 23 | * | 21 | * |
| 24 | * @author HUIHUI | 22 | * @author HUIHUI |
| 25 | */ | 23 | */ |
| 26 | @Slf4j | 24 | @Slf4j |
| 27 | -public class IotWebSocketClient implements WebSocket.Listener { | 25 | +public class IotWebSocketClient { |
| 28 | 26 | ||
| 29 | private final String serverUrl; | 27 | private final String serverUrl; |
| 30 | private final Integer connectTimeoutMs; | 28 | private final Integer connectTimeoutMs; |
| 31 | private final Integer sendTimeoutMs; | 29 | private final Integer sendTimeoutMs; |
| 32 | private final String dataFormat; | 30 | private final String dataFormat; |
| 33 | 31 | ||
| 34 | - private WebSocket webSocket; | 32 | + private OkHttpClient okHttpClient; |
| 33 | + private volatile WebSocket webSocket; | ||
| 35 | private final AtomicBoolean connected = new AtomicBoolean(false); | 34 | private final AtomicBoolean connected = new AtomicBoolean(false); |
| 36 | - private final StringBuilder messageBuffer = new StringBuilder(); | ||
| 37 | 35 | ||
| 38 | public IotWebSocketClient(String serverUrl, Integer connectTimeoutMs, Integer sendTimeoutMs, String dataFormat) { | 36 | public IotWebSocketClient(String serverUrl, Integer connectTimeoutMs, Integer sendTimeoutMs, String dataFormat) { |
| 39 | this.serverUrl = serverUrl; | 37 | this.serverUrl = serverUrl; |
| @@ -44,8 +42,9 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -44,8 +42,9 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 44 | 42 | ||
| 45 | /** | 43 | /** |
| 46 | * 连接到 WebSocket 服务器 | 44 | * 连接到 WebSocket 服务器 |
| 45 | + * <p> | ||
| 46 | + * 注意：调用方需要通过分布式锁保证并发安全 | ||
| 47 | */ | 47 | */ |
| 48 | - @SuppressWarnings("resource") | ||
| 49 | public void connect() throws Exception { | 48 | public void connect() throws Exception { |
| 50 | if (connected.get()) { | 49 | if (connected.get()) { |
| 51 | log.warn("[connect][WebSocket 客户端已经连接，无需重复连接]"); | 50 | log.warn("[connect][WebSocket 客户端已经连接，无需重复连接]"); |
| @@ -53,17 +52,30 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -53,17 +52,30 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 53 | } | 52 | } |
| 54 | 53 | ||
| 55 | try { | 54 | try { |
| 56 | - HttpClient httpClient = HttpClient.newBuilder() | ||
| 57 | - .connectTimeout(Duration.ofMillis(connectTimeoutMs)) | 55 | + // 创建 OkHttpClient |
| 56 | + okHttpClient = new OkHttpClient.Builder() | ||
| 57 | + .connectTimeout(connectTimeoutMs, TimeUnit.MILLISECONDS) | ||
| 58 | + .readTimeout(sendTimeoutMs, TimeUnit.MILLISECONDS) | ||
| 59 | + .writeTimeout(sendTimeoutMs, TimeUnit.MILLISECONDS) | ||
| 60 | + .build(); | ||
| 61 | + | ||
| 62 | + // 创建 WebSocket 请求 | ||
| 63 | + Request request = new Request.Builder() | ||
| 64 | + .url(serverUrl) | ||
| 58 | .build(); | 65 | .build(); |
| 59 | 66 | ||
| 60 | - CompletableFuture<WebSocket> future = httpClient.newWebSocketBuilder() | ||
| 61 | - .connectTimeout(Duration.ofMillis(connectTimeoutMs)) | ||
| 62 | - .buildAsync(URI.create(serverUrl), this); | 67 | + // 使用 CountDownLatch 等待连接完成 |
| 68 | + CountDownLatch connectLatch = new CountDownLatch(1); | ||
| 69 | + AtomicBoolean connectSuccess = new AtomicBoolean(false); | ||
| 70 | + // 创建 WebSocket 连接 | ||
| 71 | + webSocket = okHttpClient.newWebSocket(request, new IotWebSocketListener(connectLatch, connectSuccess)); | ||
| 63 | 72 | ||
| 64 | // 等待连接完成 | 73 | // 等待连接完成 |
| 65 | - webSocket = future.get(connectTimeoutMs, TimeUnit.MILLISECONDS); | ||
| 66 | - connected.set(true); | 74 | + boolean await = connectLatch.await(connectTimeoutMs, TimeUnit.MILLISECONDS); |
| 75 | + if (!await || !connectSuccess.get()) { | ||
| 76 | + close(); | ||
| 77 | + throw new Exception("WebSocket 连接超时或失败，服务器地址: " + serverUrl); | ||
| 78 | + } | ||
| 67 | log.info("[connect][WebSocket 客户端连接成功，服务器地址: {}]", serverUrl); | 79 | log.info("[connect][WebSocket 客户端连接成功，服务器地址: {}]", serverUrl); |
| 68 | } catch (Exception e) { | 80 | } catch (Exception e) { |
| 69 | close(); | 81 | close(); |
| @@ -72,36 +84,6 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -72,36 +84,6 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 72 | } | 84 | } |
| 73 | } | 85 | } |
| 74 | 86 | ||
| 75 | - @Override | ||
| 76 | - public void onOpen(WebSocket webSocket) { | ||
| 77 | - log.debug("[onOpen][WebSocket 连接已打开]"); | ||
| 78 | - webSocket.request(1); | ||
| 79 | - } | ||
| 80 | - | ||
| 81 | - @Override | ||
| 82 | - public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) { | ||
| 83 | - messageBuffer.append(data); | ||
| 84 | - if (last) { | ||
| 85 | - log.debug("[onText][收到 WebSocket 消息: {}]", messageBuffer); | ||
| 86 | - messageBuffer.setLength(0); | ||
| 87 | - } | ||
| 88 | - webSocket.request(1); | ||
| 89 | - return null; | ||
| 90 | - } | ||
| 91 | - | ||
| 92 | - @Override | ||
| 93 | - public CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String reason) { | ||
| 94 | - connected.set(false); | ||
| 95 | - log.info("[onClose][WebSocket 连接已关闭，状态码: {}，原因: {}]", statusCode, reason); | ||
| 96 | - return null; | ||
| 97 | - } | ||
| 98 | - | ||
| 99 | - @Override | ||
| 100 | - public void onError(WebSocket webSocket, Throwable error) { | ||
| 101 | - connected.set(false); | ||
| 102 | - log.error("[onError][WebSocket 发生错误]", error); | ||
| 103 | - } | ||
| 104 | - | ||
| 105 | /** | 87 | /** |
| 106 | * 发送设备消息 | 88 | * 发送设备消息 |
| 107 | * | 89 | * |
| @@ -109,7 +91,8 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -109,7 +91,8 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 109 | * @throws Exception 发送异常 | 91 | * @throws Exception 发送异常 |
| 110 | */ | 92 | */ |
| 111 | public void sendMessage(IotDeviceMessage message) throws Exception { | 93 | public void sendMessage(IotDeviceMessage message) throws Exception { |
| 112 | - if (!connected.get() || webSocket == null) { | 94 | + WebSocket ws = this.webSocket; |
| 95 | + if (!connected.get() || ws == null) { | ||
| 113 | throw new IllegalStateException("WebSocket 客户端未连接"); | 96 | throw new IllegalStateException("WebSocket 客户端未连接"); |
| 114 | } | 97 | } |
| 115 | 98 | ||
| @@ -121,9 +104,11 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -121,9 +104,11 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 121 | messageData = message.toString(); | 104 | messageData = message.toString(); |
| 122 | } | 105 | } |
| 123 | 106 | ||
| 124 | - // 发送消息并等待完成 | ||
| 125 | - CompletableFuture<WebSocket> future = webSocket.sendText(messageData, true); | ||
| 126 | - future.get(sendTimeoutMs, TimeUnit.MILLISECONDS); | 107 | + // 发送消息 |
| 108 | + boolean success = ws.send(messageData); | ||
| 109 | + if (!success) { | ||
| 110 | + throw new Exception("WebSocket 发送消息失败，消息队列已满或连接已关闭"); | ||
| 111 | + } | ||
| 127 | log.debug("[sendMessage][发送消息成功，设备 ID: {}，消息长度: {}]", | 112 | log.debug("[sendMessage][发送消息成功，设备 ID: {}，消息长度: {}]", |
| 128 | message.getDeviceId(), messageData.length()); | 113 | message.getDeviceId(), messageData.length()); |
| 129 | } catch (Exception e) { | 114 | } catch (Exception e) { |
| @@ -136,18 +121,18 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -136,18 +121,18 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 136 | * 关闭连接 | 121 | * 关闭连接 |
| 137 | */ | 122 | */ |
| 138 | public void close() { | 123 | public void close() { |
| 139 | - if (!connected.get() && webSocket == null) { | ||
| 140 | - return; | ||
| 141 | - } | ||
| 142 | - | ||
| 143 | try { | 124 | try { |
| 144 | if (webSocket != null) { | 125 | if (webSocket != null) { |
| 145 | - webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "客户端主动关闭") | ||
| 146 | - .orTimeout(5, TimeUnit.SECONDS) | ||
| 147 | - .exceptionally(e -> { | ||
| 148 | - log.warn("[close][发送关闭帧失败]", e); | ||
| 149 | - return null; | ||
| 150 | - }); | 126 | + // 发送正常关闭帧，状态码 1000 表示正常关闭 |
| 127 | + // TODO @puhui999：有没 1000 的枚举哈？在 okhttp 里 | ||
| 128 | + webSocket.close(1000, "客户端主动关闭"); | ||
| 129 | + webSocket = null; | ||
| 130 | + } | ||
| 131 | + if (okHttpClient != null) { | ||
| 132 | + // 关闭连接池和调度器 | ||
| 133 | + okHttpClient.dispatcher().executorService().shutdown(); | ||
| 134 | + okHttpClient.connectionPool().evictAll(); | ||
| 135 | + okHttpClient = null; | ||
| 151 | } | 136 | } |
| 152 | connected.set(false); | 137 | connected.set(false); |
| 153 | log.info("[close][WebSocket 客户端连接已关闭，服务器地址: {}]", serverUrl); | 138 | log.info("[close][WebSocket 客户端连接已关闭，服务器地址: {}]", serverUrl); |
| @@ -174,4 +159,51 @@ public class IotWebSocketClient implements WebSocket.Listener { | @@ -174,4 +159,51 @@ public class IotWebSocketClient implements WebSocket.Listener { | ||
| 174 | '}'; | 159 | '}'; |
| 175 | } | 160 | } |
| 176 | 161 | ||
| 162 | + /** | ||
| 163 | + * OkHttp WebSocket 监听器 | ||
| 164 | + */ | ||
| 165 | + @SuppressWarnings("NullableProblems") | ||
| 166 | + private class IotWebSocketListener extends WebSocketListener { | ||
| 167 | + | ||
| 168 | + private final CountDownLatch connectLatch; | ||
| 169 | + private final AtomicBoolean connectSuccess; | ||
| 170 | + | ||
| 171 | + public IotWebSocketListener(CountDownLatch connectLatch, AtomicBoolean connectSuccess) { | ||
| 172 | + this.connectLatch = connectLatch; | ||
| 173 | + this.connectSuccess = connectSuccess; | ||
| 174 | + } | ||
| 175 | + | ||
| 176 | + @Override | ||
| 177 | + public void onOpen(WebSocket webSocket, Response response) { | ||
| 178 | + connected.set(true); | ||
| 179 | + connectSuccess.set(true); | ||
| 180 | + connectLatch.countDown(); | ||
| 181 | + log.info("[onOpen][WebSocket 连接已打开，服务器: {}]", serverUrl); | ||
| 182 | + } | ||
| 183 | + | ||
| 184 | + @Override | ||
| 185 | + public void onMessage(WebSocket webSocket, String text) { | ||
| 186 | + log.debug("[onMessage][收到消息: {}]", text); | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + @Override | ||
| 190 | + public void onClosing(WebSocket webSocket, int code, String reason) { | ||
| 191 | + connected.set(false); | ||
| 192 | + log.info("[onClosing][WebSocket 正在关闭，code: {}, reason: {}]", code, reason); | ||
| 193 | + } | ||
| 194 | + | ||
| 195 | + @Override | ||
| 196 | + public void onClosed(WebSocket webSocket, int code, String reason) { | ||
| 197 | + connected.set(false); | ||
| 198 | + log.info("[onClosed][WebSocket 已关闭，code: {}, reason: {}]", code, reason); | ||
| 199 | + } | ||
| 200 | + | ||
| 201 | + @Override | ||
| 202 | + public void onFailure(WebSocket webSocket, Throwable t, Response response) { | ||
| 203 | + connected.set(false); | ||
| 204 | + connectLatch.countDown(); // 确保连接失败时也释放等待 | ||
| 205 | + log.error("[onFailure][WebSocket 连接失败]", t); | ||
| 206 | + } | ||
| 207 | + } | ||
| 208 | + | ||
| 177 | } | 209 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
| @@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.iot.service.product.IotProductService; | @@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.iot.service.product.IotProductService; | ||
| 23 | import cn.iocoder.yudao.module.iot.service.rule.scene.action.IotSceneRuleAction; | 23 | import cn.iocoder.yudao.module.iot.service.rule.scene.action.IotSceneRuleAction; |
| 24 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherManager; | 24 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherManager; |
| 25 | import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotSceneRuleTimerHandler; | 25 | import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotSceneRuleTimerHandler; |
| 26 | +import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotTimerConditionEvaluator; | ||
| 26 | import jakarta.annotation.Resource; | 27 | import jakarta.annotation.Resource; |
| 27 | import lombok.extern.slf4j.Slf4j; | 28 | import lombok.extern.slf4j.Slf4j; |
| 28 | import org.springframework.cache.annotation.CacheEvict; | 29 | import org.springframework.cache.annotation.CacheEvict; |
| @@ -62,6 +63,8 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { | @@ -62,6 +63,8 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { | ||
| 62 | private List<IotSceneRuleAction> sceneRuleActions; | 63 | private List<IotSceneRuleAction> sceneRuleActions; |
| 63 | @Resource | 64 | @Resource |
| 64 | private IotSceneRuleTimerHandler timerHandler; | 65 | private IotSceneRuleTimerHandler timerHandler; |
| 66 | + @Resource | ||
| 67 | + private IotTimerConditionEvaluator timerConditionEvaluator; | ||
| 65 | 68 | ||
| 66 | @Override | 69 | @Override |
| 67 | @CacheEvict(value = RedisKeyConstants.SCENE_RULE_LIST, allEntries = true) | 70 | @CacheEvict(value = RedisKeyConstants.SCENE_RULE_LIST, allEntries = true) |
| @@ -222,19 +225,99 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { | @@ -222,19 +225,99 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { | ||
| 222 | return; | 225 | return; |
| 223 | } | 226 | } |
| 224 | // 1.2 判断是否有定时触发器，避免脏数据 | 227 | // 1.2 判断是否有定时触发器，避免脏数据 |
| 225 | - IotSceneRuleDO.Trigger config = CollUtil.findOne(scene.getTriggers(), | 228 | + IotSceneRuleDO.Trigger timerTrigger = CollUtil.findOne(scene.getTriggers(), |
| 226 | trigger -> ObjUtil.equals(trigger.getType(), IotSceneRuleTriggerTypeEnum.TIMER.getType())); | 229 | trigger -> ObjUtil.equals(trigger.getType(), IotSceneRuleTriggerTypeEnum.TIMER.getType())); |
| 227 | - if (config == null) { | 230 | + if (timerTrigger == null) { |
| 228 | log.error("[executeSceneRuleByTimer][规则场景({}) 不存在定时触发器]", scene); | 231 | log.error("[executeSceneRuleByTimer][规则场景({}) 不存在定时触发器]", scene); |
| 229 | return; | 232 | return; |
| 230 | } | 233 | } |
| 231 | 234 | ||
| 232 | - // 2. 执行规则场景 | 235 | + // 2. 评估条件组（新增逻辑） |
| 236 | + log.info("[executeSceneRuleByTimer][规则场景({}) 开始评估条件组]", id); | ||
| 237 | + if (!evaluateTimerConditionGroups(scene, timerTrigger)) { | ||
| 238 | + log.info("[executeSceneRuleByTimer][规则场景({}) 条件组不满足，跳过执行]", id); | ||
| 239 | + return; | ||
| 240 | + } | ||
| 241 | + log.info("[executeSceneRuleByTimer][规则场景({}) 条件组评估通过，准备执行动作]", id); | ||
| 242 | + | ||
| 243 | + // 3. 执行规则场景 | ||
| 233 | TenantUtils.execute(scene.getTenantId(), | 244 | TenantUtils.execute(scene.getTenantId(), |
| 234 | () -> executeSceneRuleAction(null, ListUtil.toList(scene))); | 245 | () -> executeSceneRuleAction(null, ListUtil.toList(scene))); |
| 235 | } | 246 | } |
| 236 | 247 | ||
| 237 | /** | 248 | /** |
| 249 | + * 评估定时触发器的条件组 | ||
| 250 | + * | ||
| 251 | + * @param scene 场景规则 | ||
| 252 | + * @param trigger 定时触发器 | ||
| 253 | + * @return 是否满足条件 | ||
| 254 | + */ | ||
| 255 | + private boolean evaluateTimerConditionGroups(IotSceneRuleDO scene, IotSceneRuleDO.Trigger trigger) { | ||
| 256 | + // 1. 如果没有条件组，直接返回 true（直接执行动作） | ||
| 257 | + if (CollUtil.isEmpty(trigger.getConditionGroups())) { | ||
| 258 | + log.debug("[evaluateTimerConditionGroups][规则场景({}) 无条件组配置，直接执行]", scene.getId()); | ||
| 259 | + return true; | ||
| 260 | + } | ||
| 261 | + | ||
| 262 | + // 2. 条件组之间是 OR 关系，任一条件组满足即可 | ||
| 263 | + for (List<IotSceneRuleDO.TriggerCondition> conditionGroup : trigger.getConditionGroups()) { | ||
| 264 | + if (evaluateSingleConditionGroup(scene, conditionGroup)) { | ||
| 265 | + log.debug("[evaluateTimerConditionGroups][规则场景({}) 条件组匹配成功]", scene.getId()); | ||
| 266 | + return true; | ||
| 267 | + } | ||
| 268 | + } | ||
| 269 | + | ||
| 270 | + // 3. 所有条件组都不满足 | ||
| 271 | + log.debug("[evaluateTimerConditionGroups][规则场景({}) 所有条件组都不满足]", scene.getId()); | ||
| 272 | + return false; | ||
| 273 | + } | ||
| 274 | + | ||
| 275 | + /** | ||
| 276 | + * 评估单个条件组 | ||
| 277 | + * | ||
| 278 | + * @param scene 场景规则 | ||
| 279 | + * @param conditionGroup 条件组 | ||
| 280 | + * @return 是否满足条件 | ||
| 281 | + */ | ||
| 282 | + private boolean evaluateSingleConditionGroup(IotSceneRuleDO scene, | ||
| 283 | + List<IotSceneRuleDO.TriggerCondition> conditionGroup) { | ||
| 284 | + // 1. 空条件组视为满足 | ||
| 285 | + if (CollUtil.isEmpty(conditionGroup)) { | ||
| 286 | + return true; | ||
| 287 | + } | ||
| 288 | + | ||
| 289 | + // 2. 条件之间是 AND 关系，所有条件都必须满足 | ||
| 290 | + for (IotSceneRuleDO.TriggerCondition condition : conditionGroup) { | ||
| 291 | + if (!evaluateTimerCondition(scene, condition)) { | ||
| 292 | + log.debug("[evaluateSingleConditionGroup][规则场景({}) 条件({}) 不满足]", | ||
| 293 | + scene.getId(), condition); | ||
| 294 | + return false; | ||
| 295 | + } | ||
| 296 | + } | ||
| 297 | + | ||
| 298 | + return true; | ||
| 299 | + } | ||
| 300 | + | ||
| 301 | + /** | ||
| 302 | + * 评估单个条件（定时触发器专用） | ||
| 303 | + * | ||
| 304 | + * @param scene 场景规则 | ||
| 305 | + * @param condition 条件 | ||
| 306 | + * @return 是否满足条件 | ||
| 307 | + */ | ||
| 308 | + private boolean evaluateTimerCondition(IotSceneRuleDO scene, IotSceneRuleDO.TriggerCondition condition) { | ||
| 309 | + try { | ||
| 310 | + boolean result = timerConditionEvaluator.evaluate(condition); | ||
| 311 | + log.debug("[evaluateTimerCondition][规则场景({}) 条件类型({}) 评估结果: {}]", | ||
| 312 | + scene.getId(), condition.getType(), result); | ||
| 313 | + return result; | ||
| 314 | + } catch (Exception e) { | ||
| 315 | + log.error("[evaluateTimerCondition][规则场景({}) 条件评估异常]", scene.getId(), e); | ||
| 316 | + return false; | ||
| 317 | + } | ||
| 318 | + } | ||
| 319 | + | ||
| 320 | + /** | ||
| 238 | * 基于消息，获得匹配的规则场景列表 | 321 | * 基于消息，获得匹配的规则场景列表 |
| 239 | * | 322 | * |
| 240 | * @param message 设备消息 | 323 | * @param message 设备消息 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleTimeHelper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.service.rule.scene; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.lang.Assert; | ||
| 4 | +import cn.hutool.core.text.CharPool; | ||
| 5 | +import cn.hutool.core.util.StrUtil; | ||
| 6 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; | ||
| 7 | +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition.IotCurrentTimeConditionMatcher; | ||
| 8 | +import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotTimerConditionEvaluator; | ||
| 9 | +import lombok.extern.slf4j.Slf4j; | ||
| 10 | + | ||
| 11 | +import java.time.LocalDateTime; | ||
| 12 | +import java.time.LocalTime; | ||
| 13 | +import java.time.ZoneId; | ||
| 14 | +import java.time.format.DateTimeFormatter; | ||
| 15 | +import java.util.List; | ||
| 16 | + | ||
| 17 | +/** | ||
| 18 | + * IoT 场景规则时间匹配工具类 | ||
| 19 | + * <p> | ||
| 20 | + * 提供时间条件匹配的通用方法，供 {@link IotCurrentTimeConditionMatcher} 和 {@link IotTimerConditionEvaluator} 共同使用。 | ||
| 21 | + * | ||
| 22 | + * @author HUIHUI | ||
| 23 | + */ | ||
| 24 | +@Slf4j | ||
| 25 | +public class IotSceneRuleTimeHelper { | ||
| 26 | + | ||
| 27 | + /** | ||
| 28 | + * 时间格式化器 - HH:mm:ss | ||
| 29 | + */ | ||
| 30 | + private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss"); | ||
| 31 | + | ||
| 32 | + /** | ||
| 33 | + * 时间格式化器 - HH:mm | ||
| 34 | + */ | ||
| 35 | + private static final DateTimeFormatter TIME_FORMATTER_SHORT = DateTimeFormatter.ofPattern("HH:mm"); | ||
| 36 | + | ||
| 37 | + // TODO @puhui999：可以使用 lombok 简化 | ||
| 38 | + private IotSceneRuleTimeHelper() { | ||
| 39 | + // 工具类，禁止实例化 | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + /** | ||
| 43 | + * 判断是否为日期时间操作符 | ||
| 44 | + * | ||
| 45 | + * @param operatorEnum 操作符枚举 | ||
| 46 | + * @return 是否为日期时间操作符 | ||
| 47 | + */ | ||
| 48 | + public static boolean isDateTimeOperator(IotSceneRuleConditionOperatorEnum operatorEnum) { | ||
| 49 | + return operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_GREATER_THAN | ||
| 50 | + || operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_LESS_THAN | ||
| 51 | + || operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_BETWEEN; | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + /** | ||
| 55 | + * 判断是否为时间操作符（包括日期时间操作符和当日时间操作符） | ||
| 56 | + * | ||
| 57 | + * @param operatorEnum 操作符枚举 | ||
| 58 | + * @return 是否为时间操作符 | ||
| 59 | + */ | ||
| 60 | + public static boolean isTimeOperator(IotSceneRuleConditionOperatorEnum operatorEnum) { | ||
| 61 | + return operatorEnum != IotSceneRuleConditionOperatorEnum.TIME_GREATER_THAN | ||
| 62 | + && operatorEnum != IotSceneRuleConditionOperatorEnum.TIME_LESS_THAN | ||
| 63 | + && operatorEnum != IotSceneRuleConditionOperatorEnum.TIME_BETWEEN | ||
| 64 | + && !isDateTimeOperator(operatorEnum); | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + /** | ||
| 68 | + * 执行时间匹配逻辑 | ||
| 69 | + * | ||
| 70 | + * @param operatorEnum 操作符枚举 | ||
| 71 | + * @param param 参数值 | ||
| 72 | + * @return 是否匹配 | ||
| 73 | + */ | ||
| 74 | + public static boolean executeTimeMatching(IotSceneRuleConditionOperatorEnum operatorEnum, String param) { | ||
| 75 | + try { | ||
| 76 | + LocalDateTime now = LocalDateTime.now(); | ||
| 77 | + if (isDateTimeOperator(operatorEnum)) { | ||
| 78 | + // 日期时间匹配（时间戳，秒级） | ||
| 79 | + long currentTimestamp = now.atZone(ZoneId.systemDefault()).toEpochSecond(); | ||
| 80 | + return matchDateTime(currentTimestamp, operatorEnum, param); | ||
| 81 | + } else { | ||
| 82 | + // 当日时间匹配（HH:mm:ss） | ||
| 83 | + return matchTime(now.toLocalTime(), operatorEnum, param); | ||
| 84 | + } | ||
| 85 | + } catch (Exception e) { | ||
| 86 | + log.error("[executeTimeMatching][operatorEnum({}) param({}) 时间匹配异常]", operatorEnum, param, e); | ||
| 87 | + return false; | ||
| 88 | + } | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + /** | ||
| 92 | + * 匹配日期时间（时间戳，秒级） | ||
| 93 | + * | ||
| 94 | + * @param currentTimestamp 当前时间戳 | ||
| 95 | + * @param operatorEnum 操作符枚举 | ||
| 96 | + * @param param 参数值 | ||
| 97 | + * @return 是否匹配 | ||
| 98 | + */ | ||
| 99 | + @SuppressWarnings("EnhancedSwitchMigration") | ||
| 100 | + public static boolean matchDateTime(long currentTimestamp, IotSceneRuleConditionOperatorEnum operatorEnum, | ||
| 101 | + String param) { | ||
| 102 | + try { | ||
| 103 | + // DATE_TIME_BETWEEN 需要解析两个时间戳，单独处理 | ||
| 104 | + if (operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_BETWEEN) { | ||
| 105 | + return matchDateTimeBetween(currentTimestamp, param); | ||
| 106 | + } | ||
| 107 | + // 其他操作符只需要解析一个时间戳 | ||
| 108 | + long targetTimestamp = Long.parseLong(param); | ||
| 109 | + switch (operatorEnum) { | ||
| 110 | + case DATE_TIME_GREATER_THAN: | ||
| 111 | + return currentTimestamp > targetTimestamp; | ||
| 112 | + case DATE_TIME_LESS_THAN: | ||
| 113 | + return currentTimestamp < targetTimestamp; | ||
| 114 | + default: | ||
| 115 | + log.warn("[matchDateTime][operatorEnum({}) 不支持的日期时间操作符]", operatorEnum); | ||
| 116 | + return false; | ||
| 117 | + } | ||
| 118 | + } catch (Exception e) { | ||
| 119 | + log.error("[matchDateTime][operatorEnum({}) param({}) 日期时间匹配异常]", operatorEnum, param, e); | ||
| 120 | + return false; | ||
| 121 | + } | ||
| 122 | + } | ||
| 123 | + | ||
| 124 | + /** | ||
| 125 | + * 匹配日期时间区间 | ||
| 126 | + * | ||
| 127 | + * @param currentTimestamp 当前时间戳 | ||
| 128 | + * @param param 参数值（格式：startTimestamp,endTimestamp） | ||
| 129 | + * @return 是否匹配 | ||
| 130 | + */ | ||
| 131 | + public static boolean matchDateTimeBetween(long currentTimestamp, String param) { | ||
| 132 | + List<String> timestampRange = StrUtil.splitTrim(param, CharPool.COMMA); | ||
| 133 | + if (timestampRange.size() != 2) { | ||
| 134 | + log.warn("[matchDateTimeBetween][param({}) 时间戳区间参数格式错误]", param); | ||
| 135 | + return false; | ||
| 136 | + } | ||
| 137 | + long startTimestamp = Long.parseLong(timestampRange.get(0).trim()); | ||
| 138 | + long endTimestamp = Long.parseLong(timestampRange.get(1).trim()); | ||
| 139 | + // TODO @puhui999：hutool 里，看看有没 between 方法 | ||
| 140 | + return currentTimestamp >= startTimestamp && currentTimestamp <= endTimestamp; | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + /** | ||
| 144 | + * 匹配当日时间（HH:mm:ss 或 HH:mm） | ||
| 145 | + * | ||
| 146 | + * @param currentTime 当前时间 | ||
| 147 | + * @param operatorEnum 操作符枚举 | ||
| 148 | + * @param param 参数值 | ||
| 149 | + * @return 是否匹配 | ||
| 150 | + */ | ||
| 151 | + @SuppressWarnings("EnhancedSwitchMigration") | ||
| 152 | + public static boolean matchTime(LocalTime currentTime, IotSceneRuleConditionOperatorEnum operatorEnum, | ||
| 153 | + String param) { | ||
| 154 | + try { | ||
| 155 | + // TIME_BETWEEN 需要解析两个时间，单独处理 | ||
| 156 | + if (operatorEnum == IotSceneRuleConditionOperatorEnum.TIME_BETWEEN) { | ||
| 157 | + return matchTimeBetween(currentTime, param); | ||
| 158 | + } | ||
| 159 | + // 其他操作符只需要解析一个时间 | ||
| 160 | + LocalTime targetTime = parseTime(param); | ||
| 161 | + switch (operatorEnum) { | ||
| 162 | + case TIME_GREATER_THAN: | ||
| 163 | + return currentTime.isAfter(targetTime); | ||
| 164 | + case TIME_LESS_THAN: | ||
| 165 | + return currentTime.isBefore(targetTime); | ||
| 166 | + default: | ||
| 167 | + log.warn("[matchTime][operatorEnum({}) 不支持的时间操作符]", operatorEnum); | ||
| 168 | + return false; | ||
| 169 | + } | ||
| 170 | + } catch (Exception e) { | ||
| 171 | + log.error("[matchTime][operatorEnum({}) param({}) 时间解析异常]", operatorEnum, param, e); | ||
| 172 | + return false; | ||
| 173 | + } | ||
| 174 | + } | ||
| 175 | + | ||
| 176 | + /** | ||
| 177 | + * 匹配时间区间 | ||
| 178 | + * | ||
| 179 | + * @param currentTime 当前时间 | ||
| 180 | + * @param param 参数值（格式：startTime,endTime） | ||
| 181 | + * @return 是否匹配 | ||
| 182 | + */ | ||
| 183 | + public static boolean matchTimeBetween(LocalTime currentTime, String param) { | ||
| 184 | + List<String> timeRange = StrUtil.splitTrim(param, CharPool.COMMA); | ||
| 185 | + if (timeRange.size() != 2) { | ||
| 186 | + log.warn("[matchTimeBetween][param({}) 时间区间参数格式错误]", param); | ||
| 187 | + return false; | ||
| 188 | + } | ||
| 189 | + LocalTime startTime = parseTime(timeRange.get(0).trim()); | ||
| 190 | + LocalTime endTime = parseTime(timeRange.get(1).trim()); | ||
| 191 | + // TODO @puhui999：hutool 里，看看有没 between 方法 | ||
| 192 | + return !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime); | ||
| 193 | + } | ||
| 194 | + | ||
| 195 | + /** | ||
| 196 | + * 解析时间字符串 | ||
| 197 | + * 支持 HH:mm 和 HH:mm:ss 两种格式 | ||
| 198 | + * | ||
| 199 | + * @param timeStr 时间字符串 | ||
| 200 | + * @return 解析后的 LocalTime | ||
| 201 | + */ | ||
| 202 | + public static LocalTime parseTime(String timeStr) { | ||
| 203 | + Assert.isFalse(StrUtil.isBlank(timeStr), "时间字符串不能为空"); | ||
| 204 | + try { | ||
| 205 | + // 尝试不同的时间格式 | ||
| 206 | + if (timeStr.length() == 5) { // HH:mm | ||
| 207 | + return LocalTime.parse(timeStr, TIME_FORMATTER_SHORT); | ||
| 208 | + } else if (timeStr.length() == 8) { // HH:mm:ss | ||
| 209 | + return LocalTime.parse(timeStr, TIME_FORMATTER); | ||
| 210 | + } else { | ||
| 211 | + throw new IllegalArgumentException("时间格式长度不正确，期望 HH:mm 或 HH:mm:ss 格式"); | ||
| 212 | + } | ||
| 213 | + } catch (Exception e) { | ||
| 214 | + log.error("[parseTime][timeStr({}) 时间格式解析失败]", timeStr, e); | ||
| 215 | + throw new IllegalArgumentException("时间格式无效: " + timeStr, e); | ||
| 216 | + } | ||
| 217 | + } | ||
| 218 | + | ||
| 219 | +} |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcher.java
| 1 | package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; | 1 | package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; |
| 2 | 2 | ||
| 3 | -import cn.hutool.core.lang.Assert; | ||
| 4 | -import cn.hutool.core.text.CharPool; | ||
| 5 | -import cn.hutool.core.util.StrUtil; | ||
| 6 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 3 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 7 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; | 4 | import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; |
| 8 | import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; | 5 | import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; |
| 9 | import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; | 6 | import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; |
| 7 | +import cn.iocoder.yudao.module.iot.service.rule.scene.IotSceneRuleTimeHelper; | ||
| 10 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; | 8 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; |
| 11 | import lombok.extern.slf4j.Slf4j; | 9 | import lombok.extern.slf4j.Slf4j; |
| 12 | import org.springframework.stereotype.Component; | 10 | import org.springframework.stereotype.Component; |
| 13 | 11 | ||
| 14 | -import java.time.LocalDateTime; | ||
| 15 | -import java.time.LocalTime; | ||
| 16 | -import java.time.format.DateTimeFormatter; | ||
| 17 | -import java.util.List; | ||
| 18 | - | ||
| 19 | /** | 12 | /** |
| 20 | * 当前时间条件匹配器：处理时间相关的子条件匹配逻辑 | 13 | * 当前时间条件匹配器：处理时间相关的子条件匹配逻辑 |
| 21 | * | 14 | * |
| @@ -25,16 +18,6 @@ import java.util.List; | @@ -25,16 +18,6 @@ import java.util.List; | ||
| 25 | @Slf4j | 18 | @Slf4j |
| 26 | public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatcher { | 19 | public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatcher { |
| 27 | 20 | ||
| 28 | - /** | ||
| 29 | - * 时间格式化器 - HH:mm:ss | ||
| 30 | - */ | ||
| 31 | - private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss"); | ||
| 32 | - | ||
| 33 | - /** | ||
| 34 | - * 时间格式化器 - HH:mm | ||
| 35 | - */ | ||
| 36 | - private static final DateTimeFormatter TIME_FORMATTER_SHORT = DateTimeFormatter.ofPattern("HH:mm"); | ||
| 37 | - | ||
| 38 | @Override | 21 | @Override |
| 39 | public IotSceneRuleConditionTypeEnum getSupportedConditionType() { | 22 | public IotSceneRuleConditionTypeEnum getSupportedConditionType() { |
| 40 | return IotSceneRuleConditionTypeEnum.CURRENT_TIME; | 23 | return IotSceneRuleConditionTypeEnum.CURRENT_TIME; |
| @@ -62,13 +45,13 @@ public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatc | @@ -62,13 +45,13 @@ public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatc | ||
| 62 | return false; | 45 | return false; |
| 63 | } | 46 | } |
| 64 | 47 | ||
| 65 | - if (!isTimeOperator(operatorEnum)) { | 48 | + if (IotSceneRuleTimeHelper.isTimeOperator(operatorEnum)) { |
| 66 | IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "不支持的时间操作符: " + operator); | 49 | IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "不支持的时间操作符: " + operator); |
| 67 | return false; | 50 | return false; |
| 68 | } | 51 | } |
| 69 | 52 | ||
| 70 | // 2.1 执行时间匹配 | 53 | // 2.1 执行时间匹配 |
| 71 | - boolean matched = executeTimeMatching(operatorEnum, condition.getParam()); | 54 | + boolean matched = IotSceneRuleTimeHelper.executeTimeMatching(operatorEnum, condition.getParam()); |
| 72 | 55 | ||
| 73 | // 2.2 记录匹配结果 | 56 | // 2.2 记录匹配结果 |
| 74 | if (matched) { | 57 | if (matched) { |
| @@ -80,145 +63,6 @@ public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatc | @@ -80,145 +63,6 @@ public class IotCurrentTimeConditionMatcher implements IotSceneRuleConditionMatc | ||
| 80 | return matched; | 63 | return matched; |
| 81 | } | 64 | } |
| 82 | 65 | ||
| 83 | - /** | ||
| 84 | - * 执行时间匹配逻辑 | ||
| 85 | - * 直接实现时间条件匹配，不使用 Spring EL 表达式 | ||
| 86 | - */ | ||
| 87 | - private boolean executeTimeMatching(IotSceneRuleConditionOperatorEnum operatorEnum, String param) { | ||
| 88 | - try { | ||
| 89 | - LocalDateTime now = LocalDateTime.now(); | ||
| 90 | - | ||
| 91 | - if (isDateTimeOperator(operatorEnum)) { | ||
| 92 | - // 日期时间匹配（时间戳） | ||
| 93 | - long currentTimestamp = now.toEpochSecond(java.time.ZoneOffset.of("+8")); | ||
| 94 | - return matchDateTime(currentTimestamp, operatorEnum, param); | ||
| 95 | - } else { | ||
| 96 | - // 当日时间匹配（HH:mm:ss） | ||
| 97 | - return matchTime(now.toLocalTime(), operatorEnum, param); | ||
| 98 | - } | ||
| 99 | - } catch (Exception e) { | ||
| 100 | - log.error("[executeTimeMatching][operatorEnum({}) param({}) 时间匹配异常]", operatorEnum, param, e); | ||
| 101 | - return false; | ||
| 102 | - } | ||
| 103 | - } | ||
| 104 | - | ||
| 105 | - /** | ||
| 106 | - * 判断是否为日期时间操作符 | ||
| 107 | - */ | ||
| 108 | - private boolean isDateTimeOperator(IotSceneRuleConditionOperatorEnum operatorEnum) { | ||
| 109 | - return operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_GREATER_THAN || | ||
| 110 | - operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_LESS_THAN || | ||
| 111 | - operatorEnum == IotSceneRuleConditionOperatorEnum.DATE_TIME_BETWEEN; | ||
| 112 | - } | ||
| 113 | - | ||
| 114 | - /** | ||
| 115 | - * 判断是否为时间操作符 | ||
| 116 | - */ | ||
| 117 | - private boolean isTimeOperator(IotSceneRuleConditionOperatorEnum operatorEnum) { | ||
| 118 | - return operatorEnum == IotSceneRuleConditionOperatorEnum.TIME_GREATER_THAN || | ||
| 119 | - operatorEnum == IotSceneRuleConditionOperatorEnum.TIME_LESS_THAN || | ||
| 120 | - operatorEnum == IotSceneRuleConditionOperatorEnum.TIME_BETWEEN || | ||
| 121 | - isDateTimeOperator(operatorEnum); | ||
| 122 | - } | ||
| 123 | - | ||
| 124 | - /** | ||
| 125 | - * 匹配日期时间（时间戳） | ||
| 126 | - * 直接实现时间戳比较逻辑 | ||
| 127 | - */ | ||
| 128 | - private boolean matchDateTime(long currentTimestamp, IotSceneRuleConditionOperatorEnum operatorEnum, String param) { | ||
| 129 | - try { | ||
| 130 | - long targetTimestamp = Long.parseLong(param); | ||
| 131 | - switch (operatorEnum) { | ||
| 132 | - case DATE_TIME_GREATER_THAN: | ||
| 133 | - return currentTimestamp > targetTimestamp; | ||
| 134 | - case DATE_TIME_LESS_THAN: | ||
| 135 | - return currentTimestamp < targetTimestamp; | ||
| 136 | - case DATE_TIME_BETWEEN: | ||
| 137 | - return matchDateTimeBetween(currentTimestamp, param); | ||
| 138 | - default: | ||
| 139 | - log.warn("[matchDateTime][operatorEnum({}) 不支持的日期时间操作符]", operatorEnum); | ||
| 140 | - return false; | ||
| 141 | - } | ||
| 142 | - } catch (Exception e) { | ||
| 143 | - log.error("[matchDateTime][operatorEnum({}) param({}) 日期时间匹配异常]", operatorEnum, param, e); | ||
| 144 | - return false; | ||
| 145 | - } | ||
| 146 | - } | ||
| 147 | - | ||
| 148 | - /** | ||
| 149 | - * 匹配日期时间区间 | ||
| 150 | - */ | ||
| 151 | - private boolean matchDateTimeBetween(long currentTimestamp, String param) { | ||
| 152 | - List<String> timestampRange = StrUtil.splitTrim(param, CharPool.COMMA); | ||
| 153 | - if (timestampRange.size() != 2) { | ||
| 154 | - log.warn("[matchDateTimeBetween][param({}) 时间戳区间参数格式错误]", param); | ||
| 155 | - return false; | ||
| 156 | - } | ||
| 157 | - long startTimestamp = Long.parseLong(timestampRange.get(0).trim()); | ||
| 158 | - long endTimestamp = Long.parseLong(timestampRange.get(1).trim()); | ||
| 159 | - return currentTimestamp >= startTimestamp && currentTimestamp <= endTimestamp; | ||
| 160 | - } | ||
| 161 | - | ||
| 162 | - /** | ||
| 163 | - * 匹配当日时间（HH:mm:ss） | ||
| 164 | - * 直接实现时间比较逻辑 | ||
| 165 | - */ | ||
| 166 | - private boolean matchTime(LocalTime currentTime, IotSceneRuleConditionOperatorEnum operatorEnum, String param) { | ||
| 167 | - try { | ||
| 168 | - LocalTime targetTime = parseTime(param); | ||
| 169 | - switch (operatorEnum) { | ||
| 170 | - case TIME_GREATER_THAN: | ||
| 171 | - return currentTime.isAfter(targetTime); | ||
| 172 | - case TIME_LESS_THAN: | ||
| 173 | - return currentTime.isBefore(targetTime); | ||
| 174 | - case TIME_BETWEEN: | ||
| 175 | - return matchTimeBetween(currentTime, param); | ||
| 176 | - default: | ||
| 177 | - log.warn("[matchTime][operatorEnum({}) 不支持的时间操作符]", operatorEnum); | ||
| 178 | - return false; | ||
| 179 | - } | ||
| 180 | - } catch (Exception e) { | ||
| 181 | - log.error("[matchTime][][operatorEnum({}) param({}) 时间解析异常]", operatorEnum, param, e); | ||
| 182 | - return false; | ||
| 183 | - } | ||
| 184 | - } | ||
| 185 | - | ||
| 186 | - /** | ||
| 187 | - * 匹配时间区间 | ||
| 188 | - */ | ||
| 189 | - private boolean matchTimeBetween(LocalTime currentTime, String param) { | ||
| 190 | - List<String> timeRange = StrUtil.splitTrim(param, CharPool.COMMA); | ||
| 191 | - if (timeRange.size() != 2) { | ||
| 192 | - log.warn("[matchTimeBetween][param({}) 时间区间参数格式错误]", param); | ||
| 193 | - return false; | ||
| 194 | - } | ||
| 195 | - LocalTime startTime = parseTime(timeRange.get(0).trim()); | ||
| 196 | - LocalTime endTime = parseTime(timeRange.get(1).trim()); | ||
| 197 | - return !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime); | ||
| 198 | - } | ||
| 199 | - | ||
| 200 | - /** | ||
| 201 | - * 解析时间字符串 | ||
| 202 | - * 支持 HH:mm 和 HH:mm:ss 两种格式 | ||
| 203 | - */ | ||
| 204 | - private LocalTime parseTime(String timeStr) { | ||
| 205 | - Assert.isFalse(StrUtil.isBlank(timeStr), "时间字符串不能为空"); | ||
| 206 | - | ||
| 207 | - try { | ||
| 208 | - // 尝试不同的时间格式 | ||
| 209 | - if (timeStr.length() == 5) { // HH:mm | ||
| 210 | - return LocalTime.parse(timeStr, TIME_FORMATTER_SHORT); | ||
| 211 | - } else if (timeStr.length() == 8) { // HH:mm:ss | ||
| 212 | - return LocalTime.parse(timeStr, TIME_FORMATTER); | ||
| 213 | - } else { | ||
| 214 | - throw new IllegalArgumentException("时间格式长度不正确，期望 HH:mm 或 HH:mm:ss 格式"); | ||
| 215 | - } | ||
| 216 | - } catch (Exception e) { | ||
| 217 | - log.error("[parseTime][timeStr({}) 时间格式解析失败]", timeStr, e); | ||
| 218 | - throw new IllegalArgumentException("时间格式无效: " + timeStr, e); | ||
| 219 | - } | ||
| 220 | - } | ||
| 221 | - | ||
| 222 | @Override | 66 | @Override |
| 223 | public int getPriority() { | 67 | public int getPriority() { |
| 224 | return 40; // 较低优先级 | 68 | return 40; // 较低优先级 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcher.java
| @@ -38,8 +38,7 @@ public class IotDevicePropertyPostTriggerMatcher implements IotSceneRuleTriggerM | @@ -38,8 +38,7 @@ public class IotDevicePropertyPostTriggerMatcher implements IotSceneRuleTriggerM | ||
| 38 | 38 | ||
| 39 | // 1.3 检查消息中是否包含触发器指定的属性标识符 | 39 | // 1.3 检查消息中是否包含触发器指定的属性标识符 |
| 40 | // 注意：属性上报可能同时上报多个属性，所以需要判断 trigger.getIdentifier() 是否在 message 的 params 中 | 40 | // 注意：属性上报可能同时上报多个属性，所以需要判断 trigger.getIdentifier() 是否在 message 的 params 中 |
| 41 | - // TODO @puhui999：可以考虑 notXXX 方法，简化代码（尽量取反） | ||
| 42 | - if (!IotDeviceMessageUtils.containsIdentifier(message, trigger.getIdentifier())) { | 41 | + if (IotDeviceMessageUtils.notContainsIdentifier(message, trigger.getIdentifier())) { |
| 43 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中不包含属性: " + | 42 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中不包含属性: " + |
| 44 | trigger.getIdentifier()); | 43 | trigger.getIdentifier()); |
| 45 | return false; | 44 | return false; |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java
| 1 | package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; | 1 | package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.util.StrUtil; | ||
| 3 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; | 4 | import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; |
| 4 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 5 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 5 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; | 6 | import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; |
| @@ -8,6 +9,8 @@ import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; | @@ -8,6 +9,8 @@ import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; | ||
| 8 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; | 9 | import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; |
| 9 | import org.springframework.stereotype.Component; | 10 | import org.springframework.stereotype.Component; |
| 10 | 11 | ||
| 12 | +import java.util.Map; | ||
| 13 | + | ||
| 11 | /** | 14 | /** |
| 12 | * 设备服务调用触发器匹配器：处理设备服务调用的触发器匹配逻辑 | 15 | * 设备服务调用触发器匹配器：处理设备服务调用的触发器匹配逻辑 |
| 13 | * | 16 | * |
| @@ -28,13 +31,11 @@ public class IotDeviceServiceInvokeTriggerMatcher implements IotSceneRuleTrigger | @@ -28,13 +31,11 @@ public class IotDeviceServiceInvokeTriggerMatcher implements IotSceneRuleTrigger | ||
| 28 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "触发器基础参数无效"); | 31 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "触发器基础参数无效"); |
| 29 | return false; | 32 | return false; |
| 30 | } | 33 | } |
| 31 | - | ||
| 32 | // 1.2 检查消息方法是否匹配 | 34 | // 1.2 检查消息方法是否匹配 |
| 33 | if (!IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod().equals(message.getMethod())) { | 35 | if (!IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod().equals(message.getMethod())) { |
| 34 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息方法不匹配，期望: " + IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod() + ", 实际: " + message.getMethod()); | 36 | IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息方法不匹配，期望: " + IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod() + ", 实际: " + message.getMethod()); |
| 35 | return false; | 37 | return false; |
| 36 | } | 38 | } |
| 37 | - | ||
| 38 | // 1.3 检查标识符是否匹配 | 39 | // 1.3 检查标识符是否匹配 |
| 39 | String messageIdentifier = IotDeviceMessageUtils.getIdentifier(message); | 40 | String messageIdentifier = IotDeviceMessageUtils.getIdentifier(message); |
| 40 | if (!IotSceneRuleMatcherHelper.isIdentifierMatched(trigger.getIdentifier(), messageIdentifier)) { | 41 | if (!IotSceneRuleMatcherHelper.isIdentifierMatched(trigger.getIdentifier(), messageIdentifier)) { |
| @@ -42,13 +43,58 @@ public class IotDeviceServiceInvokeTriggerMatcher implements IotSceneRuleTrigger | @@ -42,13 +43,58 @@ public class IotDeviceServiceInvokeTriggerMatcher implements IotSceneRuleTrigger | ||
| 42 | return false; | 43 | return false; |
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | - // 2. 对于服务调用触发器，通常只需要匹配服务标识符即可 | ||
| 46 | - // 不需要检查操作符和值，因为服务调用本身就是触发条件 | ||
| 47 | - // TODO @puhui999: 服务调用时校验输入参数是否匹配条件？ | 46 | + // 2. 检查是否配置了参数条件 |
| 47 | + if (hasParameterCondition(trigger)) { | ||
| 48 | + return matchParameterCondition(message, trigger); | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | + // 3. 无参数条件时，标识符匹配即成功 | ||
| 48 | IotSceneRuleMatcherHelper.logTriggerMatchSuccess(message, trigger); | 52 | IotSceneRuleMatcherHelper.logTriggerMatchSuccess(message, trigger); |
| 49 | return true; | 53 | return true; |
| 50 | } | 54 | } |
| 51 | 55 | ||
| 56 | + /** | ||
| 57 | + * 判断触发器是否配置了参数条件 | ||
| 58 | + * | ||
| 59 | + * @param trigger 触发器配置 | ||
| 60 | + * @return 是否配置了参数条件 | ||
| 61 | + */ | ||
| 62 | + private boolean hasParameterCondition(IotSceneRuleDO.Trigger trigger) { | ||
| 63 | + return StrUtil.isNotBlank(trigger.getOperator()) && StrUtil.isNotBlank(trigger.getValue()); | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + /** | ||
| 67 | + * 匹配参数条件 | ||
| 68 | + * | ||
| 69 | + * @param message 设备消息 | ||
| 70 | + * @param trigger 触发器配置 | ||
| 71 | + * @return 是否匹配 | ||
| 72 | + */ | ||
| 73 | + private boolean matchParameterCondition(IotDeviceMessage message, IotSceneRuleDO.Trigger trigger) { | ||
| 74 | + // 1.1 从消息中提取服务调用的输入参数 | ||
| 75 | + Map<String, Object> inputParams = IotDeviceMessageUtils.extractServiceInputParams(message); | ||
| 76 | + // TODO @puhui999：要考虑 empty 的情况么？ | ||
| 77 | + if (inputParams == null) { | ||
| 78 | + IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中缺少服务输入参数"); | ||
| 79 | + return false; | ||
| 80 | + } | ||
| 81 | + // 1.2 获取要匹配的参数值（使用 identifier 作为参数名） | ||
| 82 | + Object paramValue = inputParams.get(trigger.getIdentifier()); | ||
| 83 | + if (paramValue == null) { | ||
| 84 | + IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "服务输入参数中缺少指定参数: " + trigger.getIdentifier()); | ||
| 85 | + return false; | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + // 2. 使用条件评估器进行匹配 | ||
| 89 | + boolean matched = IotSceneRuleMatcherHelper.evaluateCondition(paramValue, trigger.getOperator(), trigger.getValue()); | ||
| 90 | + if (matched) { | ||
| 91 | + IotSceneRuleMatcherHelper.logTriggerMatchSuccess(message, trigger); | ||
| 92 | + } else { | ||
| 93 | + IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "服务输入参数条件不匹配"); | ||
| 94 | + } | ||
| 95 | + return matched; | ||
| 96 | + } | ||
| 97 | + | ||
| 52 | @Override | 98 | @Override |
| 53 | public int getPriority() { | 99 | public int getPriority() { |
| 54 | return 40; // 较低优先级 | 100 | return 40; // 较低优先级 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotTimerConditionEvaluator.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.service.rule.scene.timer; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.collection.CollUtil; | ||
| 4 | +import cn.hutool.core.util.StrUtil; | ||
| 5 | +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | ||
| 6 | +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDevicePropertyDO; | ||
| 7 | +import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; | ||
| 8 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; | ||
| 9 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; | ||
| 10 | +import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; | ||
| 11 | +import cn.iocoder.yudao.module.iot.service.device.property.IotDevicePropertyService; | ||
| 12 | +import cn.iocoder.yudao.module.iot.service.rule.scene.IotSceneRuleTimeHelper; | ||
| 13 | +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; | ||
| 14 | +import jakarta.annotation.Resource; | ||
| 15 | +import lombok.extern.slf4j.Slf4j; | ||
| 16 | +import org.springframework.stereotype.Component; | ||
| 17 | + | ||
| 18 | +import java.util.Map; | ||
| 19 | + | ||
| 20 | +/** | ||
| 21 | + * IoT 定时触发器条件评估器 | ||
| 22 | + * <p> | ||
| 23 | + * 与设备触发器不同，定时触发器没有设备消息上下文， | ||
| 24 | + * 需要主动查询设备属性和状态来评估条件。 | ||
| 25 | + * | ||
| 26 | + * @author HUIHUI | ||
| 27 | + */ | ||
| 28 | +@Component | ||
| 29 | +@Slf4j | ||
| 30 | +public class IotTimerConditionEvaluator { | ||
| 31 | + | ||
| 32 | + @Resource | ||
| 33 | + private IotDevicePropertyService devicePropertyService; | ||
| 34 | + | ||
| 35 | + @Resource | ||
| 36 | + private IotDeviceService deviceService; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 评估条件 | ||
| 40 | + * | ||
| 41 | + * @param condition 条件配置 | ||
| 42 | + * @return 是否满足条件 | ||
| 43 | + */ | ||
| 44 | + @SuppressWarnings("EnhancedSwitchMigration") | ||
| 45 | + public boolean evaluate(IotSceneRuleDO.TriggerCondition condition) { | ||
| 46 | + // 1.1 基础参数校验 | ||
| 47 | + if (condition == null || condition.getType() == null) { | ||
| 48 | + log.warn("[evaluate][条件为空或类型为空]"); | ||
| 49 | + return false; | ||
| 50 | + } | ||
| 51 | + // 1.2 根据条件类型分发到具体的评估方法 | ||
| 52 | + IotSceneRuleConditionTypeEnum conditionType = | ||
| 53 | + IotSceneRuleConditionTypeEnum.typeOf(condition.getType()); | ||
| 54 | + if (conditionType == null) { | ||
| 55 | + log.warn("[evaluate][未知的条件类型: {}]", condition.getType()); | ||
| 56 | + return false; | ||
| 57 | + } | ||
| 58 | + | ||
| 59 | + // 2. 分发评估 | ||
| 60 | + switch (conditionType) { | ||
| 61 | + case DEVICE_PROPERTY: | ||
| 62 | + return evaluateDevicePropertyCondition(condition); | ||
| 63 | + case DEVICE_STATE: | ||
| 64 | + return evaluateDeviceStateCondition(condition); | ||
| 65 | + case CURRENT_TIME: | ||
| 66 | + return evaluateCurrentTimeCondition(condition); | ||
| 67 | + default: | ||
| 68 | + log.warn("[evaluate][未知的条件类型: {}]", conditionType); | ||
| 69 | + return false; | ||
| 70 | + } | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + /** | ||
| 74 | + * 评估设备属性条件 | ||
| 75 | + * | ||
| 76 | + * @param condition 条件配置 | ||
| 77 | + * @return 是否满足条件 | ||
| 78 | + */ | ||
| 79 | + private boolean evaluateDevicePropertyCondition(IotSceneRuleDO.TriggerCondition condition) { | ||
| 80 | + // 1. 校验必要参数 | ||
| 81 | + if (condition.getDeviceId() == null) { | ||
| 82 | + log.debug("[evaluateDevicePropertyCondition][设备ID为空]"); | ||
| 83 | + return false; | ||
| 84 | + } | ||
| 85 | + if (StrUtil.isBlank(condition.getIdentifier())) { | ||
| 86 | + log.debug("[evaluateDevicePropertyCondition][属性标识符为空]"); | ||
| 87 | + return false; | ||
| 88 | + } | ||
| 89 | + if (!IotSceneRuleMatcherHelper.isConditionOperatorAndParamValid(condition)) { | ||
| 90 | + log.debug("[evaluateDevicePropertyCondition][操作符或参数无效]"); | ||
| 91 | + return false; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + // 2.1 获取设备最新属性值 | ||
| 95 | + Map<String, IotDevicePropertyDO> properties = | ||
| 96 | + devicePropertyService.getLatestDeviceProperties(condition.getDeviceId()); | ||
| 97 | + if (CollUtil.isEmpty(properties)) { | ||
| 98 | + log.debug("[evaluateDevicePropertyCondition][设备({}) 无属性数据]", condition.getDeviceId()); | ||
| 99 | + return false; | ||
| 100 | + } | ||
| 101 | + // 2.2 获取指定属性 | ||
| 102 | + IotDevicePropertyDO property = properties.get(condition.getIdentifier()); | ||
| 103 | + if (property == null || property.getValue() == null) { | ||
| 104 | + log.debug("[evaluateDevicePropertyCondition][设备({}) 属性({}) 不存在或值为空]", | ||
| 105 | + condition.getDeviceId(), condition.getIdentifier()); | ||
| 106 | + return false; | ||
| 107 | + } | ||
| 108 | + | ||
| 109 | + // 3. 使用现有的条件评估逻辑进行比较 | ||
| 110 | + boolean matched = IotSceneRuleMatcherHelper.evaluateCondition( | ||
| 111 | + property.getValue(), condition.getOperator(), condition.getParam()); | ||
| 112 | + log.debug("[evaluateDevicePropertyCondition][设备({}) 属性({}) 值({}) 操作符({}) 参数({}) 匹配结果: {}]", | ||
| 113 | + condition.getDeviceId(), condition.getIdentifier(), property.getValue(), | ||
| 114 | + condition.getOperator(), condition.getParam(), matched); | ||
| 115 | + return matched; | ||
| 116 | + } | ||
| 117 | + | ||
| 118 | + /** | ||
| 119 | + * 评估设备状态条件 | ||
| 120 | + * | ||
| 121 | + * @param condition 条件配置 | ||
| 122 | + * @return 是否满足条件 | ||
| 123 | + */ | ||
| 124 | + private boolean evaluateDeviceStateCondition(IotSceneRuleDO.TriggerCondition condition) { | ||
| 125 | + // 1. 校验必要参数 | ||
| 126 | + if (condition.getDeviceId() == null) { | ||
| 127 | + log.debug("[evaluateDeviceStateCondition][设备ID为空]"); | ||
| 128 | + return false; | ||
| 129 | + } | ||
| 130 | + if (!IotSceneRuleMatcherHelper.isConditionOperatorAndParamValid(condition)) { | ||
| 131 | + log.debug("[evaluateDeviceStateCondition][操作符或参数无效]"); | ||
| 132 | + return false; | ||
| 133 | + } | ||
| 134 | + | ||
| 135 | + // 2.1 获取设备信息 | ||
| 136 | + IotDeviceDO device = deviceService.getDevice(condition.getDeviceId()); | ||
| 137 | + if (device == null) { | ||
| 138 | + log.debug("[evaluateDeviceStateCondition][设备({}) 不存在]", condition.getDeviceId()); | ||
| 139 | + return false; | ||
| 140 | + } | ||
| 141 | + // 2.2 获取设备状态 | ||
| 142 | + Integer state = device.getState(); | ||
| 143 | + if (state == null) { | ||
| 144 | + log.debug("[evaluateDeviceStateCondition][设备({}) 状态为空]", condition.getDeviceId()); | ||
| 145 | + return false; | ||
| 146 | + } | ||
| 147 | + | ||
| 148 | + // 3. 比较状态 | ||
| 149 | + boolean matched = IotSceneRuleMatcherHelper.evaluateCondition( | ||
| 150 | + state.toString(), condition.getOperator(), condition.getParam()); | ||
| 151 | + log.debug("[evaluateDeviceStateCondition][设备({}) 状态({}) 操作符({}) 参数({}) 匹配结果: {}]", | ||
| 152 | + condition.getDeviceId(), state, condition.getOperator(), condition.getParam(), matched); | ||
| 153 | + return matched; | ||
| 154 | + } | ||
| 155 | + | ||
| 156 | + /** | ||
| 157 | + * 评估当前时间条件 | ||
| 158 | + * | ||
| 159 | + * @param condition 条件配置 | ||
| 160 | + * @return 是否满足条件 | ||
| 161 | + */ | ||
| 162 | + private boolean evaluateCurrentTimeCondition(IotSceneRuleDO.TriggerCondition condition) { | ||
| 163 | + // 1.1 校验必要参数 | ||
| 164 | + if (!IotSceneRuleMatcherHelper.isConditionOperatorAndParamValid(condition)) { | ||
| 165 | + log.debug("[evaluateCurrentTimeCondition][操作符或参数无效]"); | ||
| 166 | + return false; | ||
| 167 | + } | ||
| 168 | + // 1.2 验证操作符是否为支持的时间操作符 | ||
| 169 | + IotSceneRuleConditionOperatorEnum operatorEnum = | ||
| 170 | + IotSceneRuleConditionOperatorEnum.operatorOf(condition.getOperator()); | ||
| 171 | + if (operatorEnum == null) { | ||
| 172 | + log.debug("[evaluateCurrentTimeCondition][无效的操作符: {}]", condition.getOperator()); | ||
| 173 | + return false; | ||
| 174 | + } | ||
| 175 | + if (IotSceneRuleTimeHelper.isTimeOperator(operatorEnum)) { | ||
| 176 | + log.debug("[evaluateCurrentTimeCondition][不支持的时间操作符: {}]", condition.getOperator()); | ||
| 177 | + return false; | ||
| 178 | + } | ||
| 179 | + | ||
| 180 | + // 2. 执行时间匹配 | ||
| 181 | + boolean matched = IotSceneRuleTimeHelper.executeTimeMatching(operatorEnum, condition.getParam()); | ||
| 182 | + log.debug("[evaluateCurrentTimeCondition][操作符({}) 参数({}) 匹配结果: {}]", | ||
| 183 | + condition.getOperator(), condition.getParam(), matched); | ||
| 184 | + return matched; | ||
| 185 | + } | ||
| 186 | + | ||
| 187 | +} |
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/data/action/tcp/IotTcpClientTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.service.rule.data.action.tcp; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.util.ReflectUtil; | ||
| 4 | +import cn.iocoder.yudao.module.iot.dal.dataobject.rule.config.IotDataSinkTcpConfig; | ||
| 5 | +import org.junit.jupiter.api.Test; | ||
| 6 | + | ||
| 7 | +import static org.junit.jupiter.api.Assertions.*; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * {@link IotTcpClient} 的单元测试 | ||
| 11 | + * <p> | ||
| 12 | + * 测试 dataFormat 默认值行为 | ||
| 13 | + * Property 1: TCP 客户端 dataFormat 默认值行为 | ||
| 14 | + * Validates: Requirements 1.1, 1.2 | ||
| 15 | + * | ||
| 16 | + * @author HUIHUI | ||
| 17 | + */ | ||
| 18 | +class IotTcpClientTest { | ||
| 19 | + | ||
| 20 | + @Test | ||
| 21 | + public void testConstructor_dataFormatNull() { | ||
| 22 | + // 准备参数 | ||
| 23 | + String host = "localhost"; | ||
| 24 | + Integer port = 8080; | ||
| 25 | + | ||
| 26 | + // 调用 | ||
| 27 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, null); | ||
| 28 | + | ||
| 29 | + // 断言：dataFormat 为 null 时应使用默认值 | ||
| 30 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT, | ||
| 31 | + ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + @Test | ||
| 35 | + public void testConstructor_dataFormatEmpty() { | ||
| 36 | + // 准备参数 | ||
| 37 | + String host = "localhost"; | ||
| 38 | + Integer port = 8080; | ||
| 39 | + | ||
| 40 | + // 调用 | ||
| 41 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, ""); | ||
| 42 | + | ||
| 43 | + // 断言：dataFormat 为空字符串时应使用默认值 | ||
| 44 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT, | ||
| 45 | + ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + @Test | ||
| 49 | + public void testConstructor_dataFormatBlank() { | ||
| 50 | + // 准备参数 | ||
| 51 | + String host = "localhost"; | ||
| 52 | + Integer port = 8080; | ||
| 53 | + | ||
| 54 | + // 调用 | ||
| 55 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, " "); | ||
| 56 | + | ||
| 57 | + // 断言：dataFormat 为纯空白字符串时应使用默认值 | ||
| 58 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT, | ||
| 59 | + ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 60 | + } | ||
| 61 | + | ||
| 62 | + @Test | ||
| 63 | + public void testConstructor_dataFormatValid() { | ||
| 64 | + // 准备参数 | ||
| 65 | + String host = "localhost"; | ||
| 66 | + Integer port = 8080; | ||
| 67 | + String dataFormat = "BINARY"; | ||
| 68 | + | ||
| 69 | + // 调用 | ||
| 70 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, dataFormat); | ||
| 71 | + | ||
| 72 | + // 断言：dataFormat 为有效值时应保持原值 | ||
| 73 | + assertEquals(dataFormat, ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + @Test | ||
| 77 | + public void testConstructor_defaultValues() { | ||
| 78 | + // 准备参数 | ||
| 79 | + String host = "localhost"; | ||
| 80 | + Integer port = 8080; | ||
| 81 | + | ||
| 82 | + // 调用 | ||
| 83 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, null); | ||
| 84 | + | ||
| 85 | + // 断言：验证所有默认值 | ||
| 86 | + assertEquals(host, ReflectUtil.getFieldValue(client, "host")); | ||
| 87 | + assertEquals(port, ReflectUtil.getFieldValue(client, "port")); | ||
| 88 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_CONNECT_TIMEOUT_MS, | ||
| 89 | + ReflectUtil.getFieldValue(client, "connectTimeoutMs")); | ||
| 90 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_READ_TIMEOUT_MS, | ||
| 91 | + ReflectUtil.getFieldValue(client, "readTimeoutMs")); | ||
| 92 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_SSL, | ||
| 93 | + ReflectUtil.getFieldValue(client, "ssl")); | ||
| 94 | + assertEquals(IotDataSinkTcpConfig.DEFAULT_DATA_FORMAT, | ||
| 95 | + ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + @Test | ||
| 99 | + public void testConstructor_customValues() { | ||
| 100 | + // 准备参数 | ||
| 101 | + String host = "192.168.1.100"; | ||
| 102 | + Integer port = 9090; | ||
| 103 | + Integer connectTimeoutMs = 3000; | ||
| 104 | + Integer readTimeoutMs = 8000; | ||
| 105 | + Boolean ssl = true; | ||
| 106 | + String dataFormat = "BINARY"; | ||
| 107 | + | ||
| 108 | + // 调用 | ||
| 109 | + IotTcpClient client = new IotTcpClient(host, port, connectTimeoutMs, readTimeoutMs, ssl, dataFormat); | ||
| 110 | + | ||
| 111 | + // 断言：验证自定义值 | ||
| 112 | + assertEquals(host, ReflectUtil.getFieldValue(client, "host")); | ||
| 113 | + assertEquals(port, ReflectUtil.getFieldValue(client, "port")); | ||
| 114 | + assertEquals(connectTimeoutMs, ReflectUtil.getFieldValue(client, "connectTimeoutMs")); | ||
| 115 | + assertEquals(readTimeoutMs, ReflectUtil.getFieldValue(client, "readTimeoutMs")); | ||
| 116 | + assertEquals(ssl, ReflectUtil.getFieldValue(client, "ssl")); | ||
| 117 | + assertEquals(dataFormat, ReflectUtil.getFieldValue(client, "dataFormat")); | ||
| 118 | + } | ||
| 119 | + | ||
| 120 | + @Test | ||
| 121 | + public void testIsConnected_initialState() { | ||
| 122 | + // 准备参数 | ||
| 123 | + String host = "localhost"; | ||
| 124 | + Integer port = 8080; | ||
| 125 | + | ||
| 126 | + // 调用 | ||
| 127 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, null); | ||
| 128 | + | ||
| 129 | + // 断言：初始状态应为未连接 | ||
| 130 | + assertFalse(client.isConnected()); | ||
| 131 | + } | ||
| 132 | + | ||
| 133 | + @Test | ||
| 134 | + public void testToString() { | ||
| 135 | + // 准备参数 | ||
| 136 | + String host = "localhost"; | ||
| 137 | + Integer port = 8080; | ||
| 138 | + | ||
| 139 | + // 调用 | ||
| 140 | + IotTcpClient client = new IotTcpClient(host, port, null, null, null, null); | ||
| 141 | + String result = client.toString(); | ||
| 142 | + | ||
| 143 | + // 断言 | ||
| 144 | + assertNotNull(result); | ||
| 145 | + assertTrue(result.contains("host='localhost'")); | ||
| 146 | + assertTrue(result.contains("port=8080")); | ||
| 147 | + assertTrue(result.contains("dataFormat='JSON'")); | ||
| 148 | + assertTrue(result.contains("connected=false")); | ||
| 149 | + } | ||
| 150 | + | ||
| 151 | +} |
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClientTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.service.rule.data.action.websocket; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | ||
| 4 | +import okhttp3.Response; | ||
| 5 | +import okhttp3.WebSocket; | ||
| 6 | +import okhttp3.WebSocketListener; | ||
| 7 | +import okhttp3.mockwebserver.MockResponse; | ||
| 8 | +import okhttp3.mockwebserver.MockWebServer; | ||
| 9 | +import org.jetbrains.annotations.NotNull; | ||
| 10 | +import org.jetbrains.annotations.Nullable; | ||
| 11 | +import org.junit.jupiter.api.AfterEach; | ||
| 12 | +import org.junit.jupiter.api.BeforeEach; | ||
| 13 | +import org.junit.jupiter.api.Test; | ||
| 14 | + | ||
| 15 | +import static org.junit.jupiter.api.Assertions.*; | ||
| 16 | + | ||
| 17 | +/** | ||
| 18 | + * {@link IotWebSocketClient} 的单元测试 | ||
| 19 | + * | ||
| 20 | + * @author HUIHUI | ||
| 21 | + */ | ||
| 22 | +class IotWebSocketClientTest { | ||
| 23 | + | ||
| 24 | + private MockWebServer mockWebServer; | ||
| 25 | + | ||
| 26 | + @BeforeEach | ||
| 27 | + public void setUp() throws Exception { | ||
| 28 | + mockWebServer = new MockWebServer(); | ||
| 29 | + mockWebServer.start(); | ||
| 30 | + } | ||
| 31 | + | ||
| 32 | + @AfterEach | ||
| 33 | + public void tearDown() throws Exception { | ||
| 34 | + if (mockWebServer != null) { | ||
| 35 | + mockWebServer.shutdown(); | ||
| 36 | + } | ||
| 37 | + } | ||
| 38 | + | ||
| 39 | + /** | ||
| 40 | + * 简单的 WebSocket 监听器，用于测试 | ||
| 41 | + */ | ||
| 42 | + private static class TestWebSocketListener extends WebSocketListener { | ||
| 43 | + @Override | ||
| 44 | + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { | ||
| 45 | + // 连接打开 | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + @Override | ||
| 49 | + public void onMessage(@NotNull WebSocket webSocket, @NotNull String text) { | ||
| 50 | + // 收到消息 | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + @Override | ||
| 54 | + public void onClosing(@NotNull WebSocket webSocket, int code, @NotNull String reason) { | ||
| 55 | + webSocket.close(code, reason); | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + @Override | ||
| 59 | + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, @Nullable Response response) { | ||
| 60 | + // 连接失败 | ||
| 61 | + } | ||
| 62 | + } | ||
| 63 | + | ||
| 64 | + @Test | ||
| 65 | + public void testConstructor_defaultValues() { | ||
| 66 | + // 准备参数 | ||
| 67 | + String serverUrl = "ws://localhost:8080"; | ||
| 68 | + | ||
| 69 | + // 调用 | ||
| 70 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, null, null, null); | ||
| 71 | + | ||
| 72 | + // 断言：验证默认值被正确设置 | ||
| 73 | + assertNotNull(client); | ||
| 74 | + assertFalse(client.isConnected()); | ||
| 75 | + } | ||
| 76 | + | ||
| 77 | + @Test | ||
| 78 | + public void testConstructor_customValues() { | ||
| 79 | + // 准备参数 | ||
| 80 | + String serverUrl = "ws://localhost:8080"; | ||
| 81 | + Integer connectTimeoutMs = 3000; | ||
| 82 | + Integer sendTimeoutMs = 5000; | ||
| 83 | + String dataFormat = "TEXT"; | ||
| 84 | + | ||
| 85 | + // 调用 | ||
| 86 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, connectTimeoutMs, sendTimeoutMs, dataFormat); | ||
| 87 | + | ||
| 88 | + // 断言 | ||
| 89 | + assertNotNull(client); | ||
| 90 | + assertFalse(client.isConnected()); | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + @Test | ||
| 94 | + public void testConnect_success() throws Exception { | ||
| 95 | + // 准备参数：使用 MockWebServer 的 WebSocket 端点 | ||
| 96 | + String serverUrl = "ws://" + mockWebServer.getHostName() + ":" + mockWebServer.getPort(); | ||
| 97 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 98 | + | ||
| 99 | + // mock：设置 MockWebServer 响应 WebSocket 升级请求 | ||
| 100 | + mockWebServer.enqueue(new MockResponse().withWebSocketUpgrade(new TestWebSocketListener())); | ||
| 101 | + | ||
| 102 | + // 调用 | ||
| 103 | + client.connect(); | ||
| 104 | + | ||
| 105 | + // 断言 | ||
| 106 | + assertTrue(client.isConnected()); | ||
| 107 | + | ||
| 108 | + // 清理 | ||
| 109 | + client.close(); | ||
| 110 | + } | ||
| 111 | + | ||
| 112 | + @Test | ||
| 113 | + public void testConnect_alreadyConnected() throws Exception { | ||
| 114 | + // 准备参数 | ||
| 115 | + String serverUrl = "ws://" + mockWebServer.getHostName() + ":" + mockWebServer.getPort(); | ||
| 116 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 117 | + | ||
| 118 | + // mock | ||
| 119 | + mockWebServer.enqueue(new MockResponse().withWebSocketUpgrade(new TestWebSocketListener())); | ||
| 120 | + | ||
| 121 | + // 调用：第一次连接 | ||
| 122 | + client.connect(); | ||
| 123 | + assertTrue(client.isConnected()); | ||
| 124 | + | ||
| 125 | + // 调用：第二次连接（应该不会重复连接） | ||
| 126 | + client.connect(); | ||
| 127 | + assertTrue(client.isConnected()); | ||
| 128 | + | ||
| 129 | + // 清理 | ||
| 130 | + client.close(); | ||
| 131 | + } | ||
| 132 | + | ||
| 133 | + @Test | ||
| 134 | + public void testSendMessage_success() throws Exception { | ||
| 135 | + // 准备参数 | ||
| 136 | + String serverUrl = "ws://" + mockWebServer.getHostName() + ":" + mockWebServer.getPort(); | ||
| 137 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 138 | + | ||
| 139 | + IotDeviceMessage message = IotDeviceMessage.builder() | ||
| 140 | + .deviceId(123L) | ||
| 141 | + .method("thing.property.report") | ||
| 142 | + .params("{\"temperature\": 25.5}") | ||
| 143 | + .build(); | ||
| 144 | + | ||
| 145 | + // mock | ||
| 146 | + mockWebServer.enqueue(new MockResponse().withWebSocketUpgrade(new TestWebSocketListener())); | ||
| 147 | + | ||
| 148 | + // 调用 | ||
| 149 | + client.connect(); | ||
| 150 | + client.sendMessage(message); | ||
| 151 | + | ||
| 152 | + // 断言：消息发送成功不抛异常 | ||
| 153 | + assertTrue(client.isConnected()); | ||
| 154 | + | ||
| 155 | + // 清理 | ||
| 156 | + client.close(); | ||
| 157 | + } | ||
| 158 | + | ||
| 159 | + @Test | ||
| 160 | + public void testSendMessage_notConnected() { | ||
| 161 | + // 准备参数 | ||
| 162 | + String serverUrl = "ws://localhost:8080"; | ||
| 163 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 164 | + | ||
| 165 | + IotDeviceMessage message = IotDeviceMessage.builder() | ||
| 166 | + .deviceId(123L) | ||
| 167 | + .method("thing.property.report") | ||
| 168 | + .params("{\"temperature\": 25.5}") | ||
| 169 | + .build(); | ||
| 170 | + | ||
| 171 | + // 调用 & 断言：未连接时发送消息应抛出异常 | ||
| 172 | + assertThrows(IllegalStateException.class, () -> client.sendMessage(message)); | ||
| 173 | + } | ||
| 174 | + | ||
| 175 | + @Test | ||
| 176 | + public void testClose_success() throws Exception { | ||
| 177 | + // 准备参数 | ||
| 178 | + String serverUrl = "ws://" + mockWebServer.getHostName() + ":" + mockWebServer.getPort(); | ||
| 179 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 180 | + | ||
| 181 | + // mock | ||
| 182 | + mockWebServer.enqueue(new MockResponse().withWebSocketUpgrade(new TestWebSocketListener())); | ||
| 183 | + | ||
| 184 | + // 调用 | ||
| 185 | + client.connect(); | ||
| 186 | + assertTrue(client.isConnected()); | ||
| 187 | + | ||
| 188 | + client.close(); | ||
| 189 | + | ||
| 190 | + // 断言 | ||
| 191 | + assertFalse(client.isConnected()); | ||
| 192 | + } | ||
| 193 | + | ||
| 194 | + @Test | ||
| 195 | + public void testClose_notConnected() { | ||
| 196 | + // 准备参数 | ||
| 197 | + String serverUrl = "ws://localhost:8080"; | ||
| 198 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 199 | + | ||
| 200 | + // 调用：关闭未连接的客户端不应抛异常 | ||
| 201 | + assertDoesNotThrow(client::close); | ||
| 202 | + assertFalse(client.isConnected()); | ||
| 203 | + } | ||
| 204 | + | ||
| 205 | + @Test | ||
| 206 | + public void testIsConnected_initialState() { | ||
| 207 | + // 准备参数 | ||
| 208 | + String serverUrl = "ws://localhost:8080"; | ||
| 209 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 210 | + | ||
| 211 | + // 断言：初始状态应为未连接 | ||
| 212 | + assertFalse(client.isConnected()); | ||
| 213 | + } | ||
| 214 | + | ||
| 215 | + @Test | ||
| 216 | + public void testToString() { | ||
| 217 | + // 准备参数 | ||
| 218 | + String serverUrl = "ws://localhost:8080"; | ||
| 219 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "JSON"); | ||
| 220 | + | ||
| 221 | + // 调用 | ||
| 222 | + String result = client.toString(); | ||
| 223 | + | ||
| 224 | + // 断言 | ||
| 225 | + assertNotNull(result); | ||
| 226 | + assertTrue(result.contains("serverUrl='ws://localhost:8080'")); | ||
| 227 | + assertTrue(result.contains("dataFormat='JSON'")); | ||
| 228 | + assertTrue(result.contains("connected=false")); | ||
| 229 | + } | ||
| 230 | + | ||
| 231 | + @Test | ||
| 232 | + public void testSendMessage_textFormat() throws Exception { | ||
| 233 | + // 准备参数 | ||
| 234 | + String serverUrl = "ws://" + mockWebServer.getHostName() + ":" + mockWebServer.getPort(); | ||
| 235 | + IotWebSocketClient client = new IotWebSocketClient(serverUrl, 5000, 5000, "TEXT"); | ||
| 236 | + | ||
| 237 | + IotDeviceMessage message = IotDeviceMessage.builder() | ||
| 238 | + .deviceId(123L) | ||
| 239 | + .method("thing.property.report") | ||
| 240 | + .params("{\"temperature\": 25.5}") | ||
| 241 | + .build(); | ||
| 242 | + | ||
| 243 | + // mock | ||
| 244 | + mockWebServer.enqueue(new MockResponse().withWebSocketUpgrade(new TestWebSocketListener())); | ||
| 245 | + | ||
| 246 | + // 调用 | ||
| 247 | + client.connect(); | ||
| 248 | + client.sendMessage(message); | ||
| 249 | + | ||
| 250 | + // 断言：消息发送成功不抛异常 | ||
| 251 | + assertTrue(client.isConnected()); | ||
| 252 | + | ||
| 253 | + // 清理 | ||
| 254 | + client.close(); | ||
| 255 | + } | ||
| 256 | + | ||
| 257 | +} |
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleTimerConditionIntegrationTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.service.rule.scene; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.collection.ListUtil; | ||
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | ||
| 5 | +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; | ||
| 6 | +import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; | ||
| 7 | +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | ||
| 8 | +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDevicePropertyDO; | ||
| 9 | +import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; | ||
| 10 | +import cn.iocoder.yudao.module.iot.dal.mysql.rule.IotSceneRuleMapper; | ||
| 11 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; | ||
| 12 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; | ||
| 13 | +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; | ||
| 14 | +import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; | ||
| 15 | +import cn.iocoder.yudao.module.iot.service.device.property.IotDevicePropertyService; | ||
| 16 | +import cn.iocoder.yudao.module.iot.service.rule.scene.action.IotSceneRuleAction; | ||
| 17 | +import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotSceneRuleTimerHandler; | ||
| 18 | +import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotTimerConditionEvaluator; | ||
| 19 | +import org.junit.jupiter.api.*; | ||
| 20 | +import org.mockito.InjectMocks; | ||
| 21 | +import org.mockito.Mock; | ||
| 22 | + | ||
| 23 | +import java.lang.reflect.Field; | ||
| 24 | +import java.util.*; | ||
| 25 | + | ||
| 26 | +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; | ||
| 27 | +import static org.mockito.ArgumentMatchers.any; | ||
| 28 | +import static org.mockito.Mockito.*; | ||
| 29 | + | ||
| 30 | +/** | ||
| 31 | + * {@link IotSceneRuleServiceImpl} 定时触发器条件组集成测试 | ||
| 32 | + * <p> | ||
| 33 | + * 测试定时触发器的条件组评估功能： | ||
| 34 | + * - 空条件组直接执行动作 | ||
| 35 | + * - 条件组评估后决定是否执行动作 | ||
| 36 | + * - 条件组之间的 OR 逻辑 | ||
| 37 | + * - 条件组内的 AND 逻辑 | ||
| 38 | + * - 所有条件组不满足时跳过执行 | ||
| 39 | + * <p> | ||
| 40 | + * Validates: Requirements 2.1, 2.2, 2.3, 2.4, 2.5 | ||
| 41 | + * | ||
| 42 | + * @author HUIHUI | ||
| 43 | + */ | ||
| 44 | +@Disabled // TODO @puhui999：单测有报错，先屏蔽 | ||
| 45 | +public class IotSceneRuleTimerConditionIntegrationTest extends BaseMockitoUnitTest { | ||
| 46 | + | ||
| 47 | + @InjectMocks | ||
| 48 | + private IotSceneRuleServiceImpl sceneRuleService; | ||
| 49 | + | ||
| 50 | + @Mock | ||
| 51 | + private IotSceneRuleMapper sceneRuleMapper; | ||
| 52 | + | ||
| 53 | + @Mock | ||
| 54 | + private IotDeviceService deviceService; | ||
| 55 | + | ||
| 56 | + @Mock | ||
| 57 | + private IotDevicePropertyService devicePropertyService; | ||
| 58 | + | ||
| 59 | + @Mock | ||
| 60 | + private List<IotSceneRuleAction> sceneRuleActions; | ||
| 61 | + | ||
| 62 | + @Mock | ||
| 63 | + private IotSceneRuleTimerHandler timerHandler; | ||
| 64 | + | ||
| 65 | + private IotTimerConditionEvaluator timerConditionEvaluator; | ||
| 66 | + | ||
| 67 | + // 测试常量 | ||
| 68 | + private static final Long SCENE_RULE_ID = 1L; | ||
| 69 | + private static final Long TENANT_ID = 1L; | ||
| 70 | + private static final Long DEVICE_ID = 100L; | ||
| 71 | + private static final String PROPERTY_IDENTIFIER = "temperature"; | ||
| 72 | + | ||
| 73 | + @BeforeEach | ||
| 74 | + void setUp() { | ||
| 75 | + // 创建并注入 timerConditionEvaluator 的依赖 | ||
| 76 | + timerConditionEvaluator = new IotTimerConditionEvaluator(); | ||
| 77 | + try { | ||
| 78 | + Field devicePropertyServiceField = IotTimerConditionEvaluator.class.getDeclaredField("devicePropertyService"); | ||
| 79 | + devicePropertyServiceField.setAccessible(true); | ||
| 80 | + devicePropertyServiceField.set(timerConditionEvaluator, devicePropertyService); | ||
| 81 | + | ||
| 82 | + Field deviceServiceField = IotTimerConditionEvaluator.class.getDeclaredField("deviceService"); | ||
| 83 | + deviceServiceField.setAccessible(true); | ||
| 84 | + deviceServiceField.set(timerConditionEvaluator, deviceService); | ||
| 85 | + | ||
| 86 | + Field evaluatorField = IotSceneRuleServiceImpl.class.getDeclaredField("timerConditionEvaluator"); | ||
| 87 | + evaluatorField.setAccessible(true); | ||
| 88 | + evaluatorField.set(sceneRuleService, timerConditionEvaluator); | ||
| 89 | + } catch (Exception e) { | ||
| 90 | + throw new RuntimeException("Failed to inject dependencies", e); | ||
| 91 | + } | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + // ========== 辅助方法 ========== | ||
| 95 | + | ||
| 96 | + private IotSceneRuleDO createBaseSceneRule() { | ||
| 97 | + IotSceneRuleDO sceneRule = new IotSceneRuleDO(); | ||
| 98 | + sceneRule.setId(SCENE_RULE_ID); | ||
| 99 | + sceneRule.setTenantId(TENANT_ID); | ||
| 100 | + sceneRule.setName("测试定时触发器"); | ||
| 101 | + sceneRule.setStatus(CommonStatusEnum.ENABLE.getStatus()); | ||
| 102 | + sceneRule.setActions(Collections.emptyList()); | ||
| 103 | + return sceneRule; | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + private IotSceneRuleDO.Trigger createTimerTrigger(String cronExpression, | ||
| 107 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups) { | ||
| 108 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 109 | + trigger.setType(IotSceneRuleTriggerTypeEnum.TIMER.getType()); | ||
| 110 | + trigger.setCronExpression(cronExpression); | ||
| 111 | + trigger.setConditionGroups(conditionGroups); | ||
| 112 | + return trigger; | ||
| 113 | + } | ||
| 114 | + | ||
| 115 | + private IotSceneRuleDO.TriggerCondition createDevicePropertyCondition(Long deviceId, String identifier, | ||
| 116 | + String operator, String param) { | ||
| 117 | + IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); | ||
| 118 | + condition.setType(IotSceneRuleConditionTypeEnum.DEVICE_PROPERTY.getType()); | ||
| 119 | + condition.setDeviceId(deviceId); | ||
| 120 | + condition.setIdentifier(identifier); | ||
| 121 | + condition.setOperator(operator); | ||
| 122 | + condition.setParam(param); | ||
| 123 | + return condition; | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + private IotSceneRuleDO.TriggerCondition createDeviceStateCondition(Long deviceId, String operator, String param) { | ||
| 127 | + IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); | ||
| 128 | + condition.setType(IotSceneRuleConditionTypeEnum.DEVICE_STATE.getType()); | ||
| 129 | + condition.setDeviceId(deviceId); | ||
| 130 | + condition.setOperator(operator); | ||
| 131 | + condition.setParam(param); | ||
| 132 | + return condition; | ||
| 133 | + } | ||
| 134 | + | ||
| 135 | + private void mockDeviceProperty(Long deviceId, String identifier, Object value) { | ||
| 136 | + Map<String, IotDevicePropertyDO> properties = new HashMap<>(); | ||
| 137 | + IotDevicePropertyDO property = new IotDevicePropertyDO(); | ||
| 138 | + property.setValue(value); | ||
| 139 | + properties.put(identifier, property); | ||
| 140 | + when(devicePropertyService.getLatestDeviceProperties(deviceId)).thenReturn(properties); | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + private void mockDeviceState(Long deviceId, Integer state) { | ||
| 144 | + IotDeviceDO device = new IotDeviceDO(); | ||
| 145 | + device.setId(deviceId); | ||
| 146 | + device.setState(state); | ||
| 147 | + when(deviceService.getDevice(deviceId)).thenReturn(device); | ||
| 148 | + } | ||
| 149 | + | ||
| 150 | + /** | ||
| 151 | + * 创建单条件的条件组列表 | ||
| 152 | + */ | ||
| 153 | + private List<List<IotSceneRuleDO.TriggerCondition>> createSingleConditionGroups( | ||
| 154 | + IotSceneRuleDO.TriggerCondition condition) { | ||
| 155 | + List<IotSceneRuleDO.TriggerCondition> group = new ArrayList<>(); | ||
| 156 | + group.add(condition); | ||
| 157 | + List<List<IotSceneRuleDO.TriggerCondition>> groups = new ArrayList<>(); | ||
| 158 | + groups.add(group); | ||
| 159 | + return groups; | ||
| 160 | + } | ||
| 161 | + | ||
| 162 | + /** | ||
| 163 | + * 创建两个单条件组的条件组列表 | ||
| 164 | + */ | ||
| 165 | + private List<List<IotSceneRuleDO.TriggerCondition>> createTwoSingleConditionGroups( | ||
| 166 | + IotSceneRuleDO.TriggerCondition cond1, IotSceneRuleDO.TriggerCondition cond2) { | ||
| 167 | + List<IotSceneRuleDO.TriggerCondition> group1 = new ArrayList<>(); | ||
| 168 | + group1.add(cond1); | ||
| 169 | + List<IotSceneRuleDO.TriggerCondition> group2 = new ArrayList<>(); | ||
| 170 | + group2.add(cond2); | ||
| 171 | + List<List<IotSceneRuleDO.TriggerCondition>> groups = new ArrayList<>(); | ||
| 172 | + groups.add(group1); | ||
| 173 | + groups.add(group2); | ||
| 174 | + return groups; | ||
| 175 | + } | ||
| 176 | + | ||
| 177 | + /** | ||
| 178 | + * 创建单个多条件组的条件组列表 | ||
| 179 | + */ | ||
| 180 | + private List<List<IotSceneRuleDO.TriggerCondition>> createSingleGroupWithMultipleConditions( | ||
| 181 | + IotSceneRuleDO.TriggerCondition... conditions) { | ||
| 182 | + List<IotSceneRuleDO.TriggerCondition> group = new ArrayList<>(Arrays.asList(conditions)); | ||
| 183 | + List<List<IotSceneRuleDO.TriggerCondition>> groups = new ArrayList<>(); | ||
| 184 | + groups.add(group); | ||
| 185 | + return groups; | ||
| 186 | + } | ||
| 187 | + | ||
| 188 | + // ========== 测试用例 ========== | ||
| 189 | + | ||
| 190 | + @Nested | ||
| 191 | + @DisplayName("空条件组测试 - Validates: Requirement 2.1") | ||
| 192 | + class EmptyConditionGroupsTest { | ||
| 193 | + | ||
| 194 | + @Test | ||
| 195 | + @DisplayName("定时触发器无条件组时，应直接执行动作") | ||
| 196 | + void testTimerTrigger_withNullConditionGroups_shouldExecuteActions() { | ||
| 197 | + // 准备数据 | ||
| 198 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 199 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", null); | ||
| 200 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 201 | + | ||
| 202 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 203 | + | ||
| 204 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 205 | + | ||
| 206 | + verify(sceneRuleMapper, times(1)).selectById(SCENE_RULE_ID); | ||
| 207 | + verify(devicePropertyService, never()).getLatestDeviceProperties(any()); | ||
| 208 | + verify(deviceService, never()).getDevice(any()); | ||
| 209 | + } | ||
| 210 | + | ||
| 211 | + @Test | ||
| 212 | + @DisplayName("定时触发器条件组为空列表时，应直接执行动作") | ||
| 213 | + void testTimerTrigger_withEmptyConditionGroups_shouldExecuteActions() { | ||
| 214 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 215 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", Collections.emptyList()); | ||
| 216 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 217 | + | ||
| 218 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 219 | + | ||
| 220 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 221 | + | ||
| 222 | + verify(sceneRuleMapper, times(1)).selectById(SCENE_RULE_ID); | ||
| 223 | + verify(devicePropertyService, never()).getLatestDeviceProperties(any()); | ||
| 224 | + } | ||
| 225 | + } | ||
| 226 | + | ||
| 227 | + @Nested | ||
| 228 | + @DisplayName("条件组 OR 逻辑测试 - Validates: Requirements 2.2, 2.3") | ||
| 229 | + class ConditionGroupOrLogicTest { | ||
| 230 | + | ||
| 231 | + @Test | ||
| 232 | + @DisplayName("多个条件组中第一个满足时，应执行动作") | ||
| 233 | + void testMultipleConditionGroups_firstGroupMatches_shouldExecuteActions() { | ||
| 234 | + IotSceneRuleDO.TriggerCondition condition1 = createDevicePropertyCondition( | ||
| 235 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 236 | + IotSceneRuleDO.TriggerCondition condition2 = createDevicePropertyCondition( | ||
| 237 | + DEVICE_ID + 1, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "50"); | ||
| 238 | + | ||
| 239 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 240 | + createTwoSingleConditionGroups(condition1, condition2); | ||
| 241 | + | ||
| 242 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 243 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 244 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 245 | + | ||
| 246 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 247 | + mockDeviceProperty(DEVICE_ID + 1, PROPERTY_IDENTIFIER, 30); | ||
| 248 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 249 | + | ||
| 250 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 251 | + | ||
| 252 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 253 | + } | ||
| 254 | + | ||
| 255 | + @Test | ||
| 256 | + @DisplayName("多个条件组中第二个满足时，应执行动作") | ||
| 257 | + void testMultipleConditionGroups_secondGroupMatches_shouldExecuteActions() { | ||
| 258 | + IotSceneRuleDO.TriggerCondition condition1 = createDevicePropertyCondition( | ||
| 259 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "50"); | ||
| 260 | + IotSceneRuleDO.TriggerCondition condition2 = createDevicePropertyCondition( | ||
| 261 | + DEVICE_ID + 1, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 262 | + | ||
| 263 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 264 | + createTwoSingleConditionGroups(condition1, condition2); | ||
| 265 | + | ||
| 266 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 267 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 268 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 269 | + | ||
| 270 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 271 | + mockDeviceProperty(DEVICE_ID + 1, PROPERTY_IDENTIFIER, 30); | ||
| 272 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 273 | + | ||
| 274 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 275 | + | ||
| 276 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 277 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID + 1); | ||
| 278 | + } | ||
| 279 | + } | ||
| 280 | + | ||
| 281 | + @Nested | ||
| 282 | + @DisplayName("条件组内 AND 逻辑测试 - Validates: Requirement 2.4") | ||
| 283 | + class ConditionGroupAndLogicTest { | ||
| 284 | + | ||
| 285 | + @Test | ||
| 286 | + @DisplayName("条件组内所有条件都满足时，该组应匹配成功") | ||
| 287 | + void testSingleConditionGroup_allConditionsMatch_shouldPass() { | ||
| 288 | + IotSceneRuleDO.TriggerCondition condition1 = createDevicePropertyCondition( | ||
| 289 | + DEVICE_ID, "temperature", IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 290 | + IotSceneRuleDO.TriggerCondition condition2 = createDevicePropertyCondition( | ||
| 291 | + DEVICE_ID, "humidity", IotSceneRuleConditionOperatorEnum.LESS_THAN.getOperator(), "80"); | ||
| 292 | + | ||
| 293 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 294 | + createSingleGroupWithMultipleConditions(condition1, condition2); | ||
| 295 | + | ||
| 296 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 297 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 298 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 299 | + | ||
| 300 | + Map<String, IotDevicePropertyDO> properties = new HashMap<>(); | ||
| 301 | + IotDevicePropertyDO tempProperty = new IotDevicePropertyDO(); | ||
| 302 | + tempProperty.setValue(30); | ||
| 303 | + properties.put("temperature", tempProperty); | ||
| 304 | + IotDevicePropertyDO humidityProperty = new IotDevicePropertyDO(); | ||
| 305 | + humidityProperty.setValue(60); | ||
| 306 | + properties.put("humidity", humidityProperty); | ||
| 307 | + when(devicePropertyService.getLatestDeviceProperties(DEVICE_ID)).thenReturn(properties); | ||
| 308 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 309 | + | ||
| 310 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 311 | + | ||
| 312 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 313 | + } | ||
| 314 | + | ||
| 315 | + @Test | ||
| 316 | + @DisplayName("条件组内有一个条件不满足时，该组应匹配失败") | ||
| 317 | + void testSingleConditionGroup_oneConditionFails_shouldFail() { | ||
| 318 | + IotSceneRuleDO.TriggerCondition condition1 = createDevicePropertyCondition( | ||
| 319 | + DEVICE_ID, "temperature", IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 320 | + IotSceneRuleDO.TriggerCondition condition2 = createDevicePropertyCondition( | ||
| 321 | + DEVICE_ID, "humidity", IotSceneRuleConditionOperatorEnum.LESS_THAN.getOperator(), "50"); | ||
| 322 | + | ||
| 323 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 324 | + createSingleGroupWithMultipleConditions(condition1, condition2); | ||
| 325 | + | ||
| 326 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 327 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 328 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 329 | + | ||
| 330 | + Map<String, IotDevicePropertyDO> properties = new HashMap<>(); | ||
| 331 | + IotDevicePropertyDO tempProperty = new IotDevicePropertyDO(); | ||
| 332 | + tempProperty.setValue(30); | ||
| 333 | + properties.put("temperature", tempProperty); | ||
| 334 | + IotDevicePropertyDO humidityProperty = new IotDevicePropertyDO(); | ||
| 335 | + humidityProperty.setValue(60); // 不满足 < 50 | ||
| 336 | + properties.put("humidity", humidityProperty); | ||
| 337 | + when(devicePropertyService.getLatestDeviceProperties(DEVICE_ID)).thenReturn(properties); | ||
| 338 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 339 | + | ||
| 340 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 341 | + | ||
| 342 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 343 | + } | ||
| 344 | + } | ||
| 345 | + | ||
| 346 | + @Nested | ||
| 347 | + @DisplayName("所有条件组不满足测试 - Validates: Requirement 2.5") | ||
| 348 | + class AllConditionGroupsFailTest { | ||
| 349 | + | ||
| 350 | + @Test | ||
| 351 | + @DisplayName("所有条件组都不满足时，应跳过动作执行") | ||
| 352 | + void testAllConditionGroups_allFail_shouldSkipExecution() { | ||
| 353 | + IotSceneRuleDO.TriggerCondition condition1 = createDevicePropertyCondition( | ||
| 354 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "50"); | ||
| 355 | + IotSceneRuleDO.TriggerCondition condition2 = createDevicePropertyCondition( | ||
| 356 | + DEVICE_ID + 1, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "50"); | ||
| 357 | + | ||
| 358 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 359 | + createTwoSingleConditionGroups(condition1, condition2); | ||
| 360 | + | ||
| 361 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 362 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 363 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 364 | + | ||
| 365 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 366 | + mockDeviceProperty(DEVICE_ID + 1, PROPERTY_IDENTIFIER, 30); | ||
| 367 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 368 | + | ||
| 369 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 370 | + | ||
| 371 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 372 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID + 1); | ||
| 373 | + } | ||
| 374 | + } | ||
| 375 | + | ||
| 376 | + @Nested | ||
| 377 | + @DisplayName("设备状态条件测试 - Validates: Requirements 4.1, 4.2") | ||
| 378 | + class DeviceStateConditionTest { | ||
| 379 | + | ||
| 380 | + @Test | ||
| 381 | + @DisplayName("设备在线状态条件满足时，应匹配成功") | ||
| 382 | + void testDeviceStateCondition_online_shouldMatch() { | ||
| 383 | + IotSceneRuleDO.TriggerCondition condition = createDeviceStateCondition( | ||
| 384 | + DEVICE_ID, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), | ||
| 385 | + String.valueOf(IotDeviceStateEnum.ONLINE.getState())); | ||
| 386 | + | ||
| 387 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = createSingleConditionGroups(condition); | ||
| 388 | + | ||
| 389 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 390 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 391 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 392 | + | ||
| 393 | + mockDeviceState(DEVICE_ID, IotDeviceStateEnum.ONLINE.getState()); | ||
| 394 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 395 | + | ||
| 396 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 397 | + | ||
| 398 | + verify(deviceService, atLeastOnce()).getDevice(DEVICE_ID); | ||
| 399 | + } | ||
| 400 | + | ||
| 401 | + @Test | ||
| 402 | + @DisplayName("设备不存在时，条件应不匹配") | ||
| 403 | + void testDeviceStateCondition_deviceNotExists_shouldNotMatch() { | ||
| 404 | + IotSceneRuleDO.TriggerCondition condition = createDeviceStateCondition( | ||
| 405 | + DEVICE_ID, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), | ||
| 406 | + String.valueOf(IotDeviceStateEnum.ONLINE.getState())); | ||
| 407 | + | ||
| 408 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = createSingleConditionGroups(condition); | ||
| 409 | + | ||
| 410 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 411 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 412 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 413 | + | ||
| 414 | + when(deviceService.getDevice(DEVICE_ID)).thenReturn(null); | ||
| 415 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 416 | + | ||
| 417 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 418 | + | ||
| 419 | + verify(deviceService, atLeastOnce()).getDevice(DEVICE_ID); | ||
| 420 | + } | ||
| 421 | + } | ||
| 422 | + | ||
| 423 | + @Nested | ||
| 424 | + @DisplayName("设备属性条件测试 - Validates: Requirements 3.1, 3.2, 3.3") | ||
| 425 | + class DevicePropertyConditionTest { | ||
| 426 | + | ||
| 427 | + @Test | ||
| 428 | + @DisplayName("设备属性条件满足时，应匹配成功") | ||
| 429 | + void testDevicePropertyCondition_match_shouldPass() { | ||
| 430 | + IotSceneRuleDO.TriggerCondition condition = createDevicePropertyCondition( | ||
| 431 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "25"); | ||
| 432 | + | ||
| 433 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = createSingleConditionGroups(condition); | ||
| 434 | + | ||
| 435 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 436 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 437 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 438 | + | ||
| 439 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 440 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 441 | + | ||
| 442 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 443 | + | ||
| 444 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 445 | + } | ||
| 446 | + | ||
| 447 | + @Test | ||
| 448 | + @DisplayName("设备属性不存在时，条件应不匹配") | ||
| 449 | + void testDevicePropertyCondition_propertyNotExists_shouldNotMatch() { | ||
| 450 | + IotSceneRuleDO.TriggerCondition condition = createDevicePropertyCondition( | ||
| 451 | + DEVICE_ID, "nonexistent", IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "25"); | ||
| 452 | + | ||
| 453 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = createSingleConditionGroups(condition); | ||
| 454 | + | ||
| 455 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 456 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 457 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 458 | + | ||
| 459 | + when(devicePropertyService.getLatestDeviceProperties(DEVICE_ID)).thenReturn(Collections.emptyMap()); | ||
| 460 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 461 | + | ||
| 462 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 463 | + | ||
| 464 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 465 | + } | ||
| 466 | + | ||
| 467 | + @Test | ||
| 468 | + @DisplayName("设备属性等于条件测试") | ||
| 469 | + void testDevicePropertyCondition_equals_shouldMatch() { | ||
| 470 | + IotSceneRuleDO.TriggerCondition condition = createDevicePropertyCondition( | ||
| 471 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), "30"); | ||
| 472 | + | ||
| 473 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = createSingleConditionGroups(condition); | ||
| 474 | + | ||
| 475 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 476 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 477 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 478 | + | ||
| 479 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 480 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 481 | + | ||
| 482 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 483 | + | ||
| 484 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 485 | + } | ||
| 486 | + } | ||
| 487 | + | ||
| 488 | + @Nested | ||
| 489 | + @DisplayName("场景规则状态测试") | ||
| 490 | + class SceneRuleStatusTest { | ||
| 491 | + | ||
| 492 | + @Test | ||
| 493 | + @DisplayName("场景规则不存在时，应直接返回") | ||
| 494 | + void testSceneRule_notExists_shouldReturn() { | ||
| 495 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(null); | ||
| 496 | + | ||
| 497 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 498 | + | ||
| 499 | + verify(devicePropertyService, never()).getLatestDeviceProperties(any()); | ||
| 500 | + } | ||
| 501 | + | ||
| 502 | + @Test | ||
| 503 | + @DisplayName("场景规则已禁用时，应直接返回") | ||
| 504 | + void testSceneRule_disabled_shouldReturn() { | ||
| 505 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 506 | + sceneRule.setStatus(CommonStatusEnum.DISABLE.getStatus()); | ||
| 507 | + | ||
| 508 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 509 | + | ||
| 510 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 511 | + | ||
| 512 | + verify(devicePropertyService, never()).getLatestDeviceProperties(any()); | ||
| 513 | + } | ||
| 514 | + | ||
| 515 | + @Test | ||
| 516 | + @DisplayName("场景规则无定时触发器时，应直接返回") | ||
| 517 | + void testSceneRule_noTimerTrigger_shouldReturn() { | ||
| 518 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 519 | + IotSceneRuleDO.Trigger deviceTrigger = new IotSceneRuleDO.Trigger(); | ||
| 520 | + deviceTrigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_PROPERTY_POST.getType()); | ||
| 521 | + sceneRule.setTriggers(ListUtil.toList(deviceTrigger)); | ||
| 522 | + | ||
| 523 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 524 | + | ||
| 525 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 526 | + | ||
| 527 | + verify(devicePropertyService, never()).getLatestDeviceProperties(any()); | ||
| 528 | + } | ||
| 529 | + } | ||
| 530 | + | ||
| 531 | + @Nested | ||
| 532 | + @DisplayName("复杂条件组合测试") | ||
| 533 | + class ComplexConditionCombinationTest { | ||
| 534 | + | ||
| 535 | + @Test | ||
| 536 | + @DisplayName("混合条件类型测试：设备属性 + 设备状态") | ||
| 537 | + void testMixedConditionTypes_propertyAndState() { | ||
| 538 | + IotSceneRuleDO.TriggerCondition propertyCondition = createDevicePropertyCondition( | ||
| 539 | + DEVICE_ID, PROPERTY_IDENTIFIER, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 540 | + IotSceneRuleDO.TriggerCondition stateCondition = createDeviceStateCondition( | ||
| 541 | + DEVICE_ID, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), | ||
| 542 | + String.valueOf(IotDeviceStateEnum.ONLINE.getState())); | ||
| 543 | + | ||
| 544 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = | ||
| 545 | + createSingleGroupWithMultipleConditions(propertyCondition, stateCondition); | ||
| 546 | + | ||
| 547 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 548 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 549 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 550 | + | ||
| 551 | + mockDeviceProperty(DEVICE_ID, PROPERTY_IDENTIFIER, 30); | ||
| 552 | + mockDeviceState(DEVICE_ID, IotDeviceStateEnum.ONLINE.getState()); | ||
| 553 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 554 | + | ||
| 555 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 556 | + | ||
| 557 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 558 | + verify(deviceService, atLeastOnce()).getDevice(DEVICE_ID); | ||
| 559 | + } | ||
| 560 | + | ||
| 561 | + @Test | ||
| 562 | + @DisplayName("多条件组 OR 逻辑 + 组内 AND 逻辑综合测试") | ||
| 563 | + void testComplexOrAndLogic() { | ||
| 564 | + // 条件组1：温度 > 30 AND 湿度 < 50（不满足） | ||
| 565 | + // 条件组2：温度 > 20 AND 设备在线（满足） | ||
| 566 | + IotSceneRuleDO.TriggerCondition group1Cond1 = createDevicePropertyCondition( | ||
| 567 | + DEVICE_ID, "temperature", IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "30"); | ||
| 568 | + IotSceneRuleDO.TriggerCondition group1Cond2 = createDevicePropertyCondition( | ||
| 569 | + DEVICE_ID, "humidity", IotSceneRuleConditionOperatorEnum.LESS_THAN.getOperator(), "50"); | ||
| 570 | + | ||
| 571 | + IotSceneRuleDO.TriggerCondition group2Cond1 = createDevicePropertyCondition( | ||
| 572 | + DEVICE_ID, "temperature", IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), "20"); | ||
| 573 | + IotSceneRuleDO.TriggerCondition group2Cond2 = createDeviceStateCondition( | ||
| 574 | + DEVICE_ID, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), | ||
| 575 | + String.valueOf(IotDeviceStateEnum.ONLINE.getState())); | ||
| 576 | + | ||
| 577 | + // 创建两个条件组 | ||
| 578 | + List<IotSceneRuleDO.TriggerCondition> group1 = new ArrayList<>(); | ||
| 579 | + group1.add(group1Cond1); | ||
| 580 | + group1.add(group1Cond2); | ||
| 581 | + List<IotSceneRuleDO.TriggerCondition> group2 = new ArrayList<>(); | ||
| 582 | + group2.add(group2Cond1); | ||
| 583 | + group2.add(group2Cond2); | ||
| 584 | + List<List<IotSceneRuleDO.TriggerCondition>> conditionGroups = new ArrayList<>(); | ||
| 585 | + conditionGroups.add(group1); | ||
| 586 | + conditionGroups.add(group2); | ||
| 587 | + | ||
| 588 | + IotSceneRuleDO sceneRule = createBaseSceneRule(); | ||
| 589 | + IotSceneRuleDO.Trigger trigger = createTimerTrigger("0 0 12 * * ?", conditionGroups); | ||
| 590 | + sceneRule.setTriggers(ListUtil.toList(trigger)); | ||
| 591 | + | ||
| 592 | + // Mock：温度 25，湿度 60，设备在线 | ||
| 593 | + Map<String, IotDevicePropertyDO> properties = new HashMap<>(); | ||
| 594 | + IotDevicePropertyDO tempProperty = new IotDevicePropertyDO(); | ||
| 595 | + tempProperty.setValue(25); | ||
| 596 | + properties.put("temperature", tempProperty); | ||
| 597 | + IotDevicePropertyDO humidityProperty = new IotDevicePropertyDO(); | ||
| 598 | + humidityProperty.setValue(60); | ||
| 599 | + properties.put("humidity", humidityProperty); | ||
| 600 | + when(devicePropertyService.getLatestDeviceProperties(DEVICE_ID)).thenReturn(properties); | ||
| 601 | + mockDeviceState(DEVICE_ID, IotDeviceStateEnum.ONLINE.getState()); | ||
| 602 | + when(sceneRuleMapper.selectById(SCENE_RULE_ID)).thenReturn(sceneRule); | ||
| 603 | + | ||
| 604 | + assertDoesNotThrow(() -> sceneRuleService.executeSceneRuleByTimer(SCENE_RULE_ID)); | ||
| 605 | + | ||
| 606 | + verify(devicePropertyService, atLeastOnce()).getLatestDeviceProperties(DEVICE_ID); | ||
| 607 | + } | ||
| 608 | + } | ||
| 609 | + | ||
| 610 | +} |
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java
| @@ -378,6 +378,268 @@ public class IotDeviceServiceInvokeTriggerMatcherTest extends IotBaseConditionMa | @@ -378,6 +378,268 @@ public class IotDeviceServiceInvokeTriggerMatcherTest extends IotBaseConditionMa | ||
| 378 | assertFalse(result); | 378 | assertFalse(result); |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | + | ||
| 382 | + // ========== 参数条件匹配测试 ========== | ||
| 383 | + | ||
| 384 | + /** | ||
| 385 | + * 测试无参数条件时的匹配逻辑 - 只要标识符匹配就返回 true | ||
| 386 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 387 | + * **Validates: Requirements 5.2** | ||
| 388 | + */ | ||
| 389 | + @Test | ||
| 390 | + public void testMatches_noParameterCondition_success() { | ||
| 391 | + // 准备参数 | ||
| 392 | + String serviceIdentifier = "testService"; | ||
| 393 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 394 | + .put("identifier", serviceIdentifier) | ||
| 395 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 396 | + .put("level", 5) | ||
| 397 | + .build()) | ||
| 398 | + .build(); | ||
| 399 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 400 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 401 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 402 | + trigger.setIdentifier(serviceIdentifier); | ||
| 403 | + trigger.setOperator(null); // 无参数条件 | ||
| 404 | + trigger.setValue(null); | ||
| 405 | + | ||
| 406 | + // 调用 | ||
| 407 | + boolean result = matcher.matches(message, trigger); | ||
| 408 | + | ||
| 409 | + // 断言 | ||
| 410 | + assertTrue(result); | ||
| 411 | + } | ||
| 412 | + | ||
| 413 | + /** | ||
| 414 | + * 测试有参数条件时的匹配逻辑 - 参数条件匹配成功 | ||
| 415 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 416 | + * **Validates: Requirements 5.1** | ||
| 417 | + */ | ||
| 418 | + @Test | ||
| 419 | + public void testMatches_withParameterCondition_greaterThan_success() { | ||
| 420 | + // 准备参数 | ||
| 421 | + String serviceIdentifier = "level"; | ||
| 422 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 423 | + .put("identifier", serviceIdentifier) | ||
| 424 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 425 | + .put("level", 5) | ||
| 426 | + .build()) | ||
| 427 | + .build(); | ||
| 428 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 429 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 430 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 431 | + trigger.setIdentifier(serviceIdentifier); | ||
| 432 | + trigger.setOperator(">"); // 大于操作符 | ||
| 433 | + trigger.setValue("3"); | ||
| 434 | + | ||
| 435 | + // 调用 | ||
| 436 | + boolean result = matcher.matches(message, trigger); | ||
| 437 | + | ||
| 438 | + // 断言 | ||
| 439 | + assertTrue(result); | ||
| 440 | + } | ||
| 441 | + | ||
| 442 | + /** | ||
| 443 | + * 测试有参数条件时的匹配逻辑 - 参数条件匹配失败 | ||
| 444 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 445 | + * **Validates: Requirements 5.1** | ||
| 446 | + */ | ||
| 447 | + @Test | ||
| 448 | + public void testMatches_withParameterCondition_greaterThan_failure() { | ||
| 449 | + // 准备参数 | ||
| 450 | + String serviceIdentifier = "level"; | ||
| 451 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 452 | + .put("identifier", serviceIdentifier) | ||
| 453 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 454 | + .put("level", 2) | ||
| 455 | + .build()) | ||
| 456 | + .build(); | ||
| 457 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 458 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 459 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 460 | + trigger.setIdentifier(serviceIdentifier); | ||
| 461 | + trigger.setOperator(">"); // 大于操作符 | ||
| 462 | + trigger.setValue("3"); | ||
| 463 | + | ||
| 464 | + // 调用 | ||
| 465 | + boolean result = matcher.matches(message, trigger); | ||
| 466 | + | ||
| 467 | + // 断言 | ||
| 468 | + assertFalse(result); | ||
| 469 | + } | ||
| 470 | + | ||
| 471 | + /** | ||
| 472 | + * 测试有参数条件时的匹配逻辑 - 等于操作符 | ||
| 473 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 474 | + * **Validates: Requirements 5.1** | ||
| 475 | + */ | ||
| 476 | + @Test | ||
| 477 | + public void testMatches_withParameterCondition_equals_success() { | ||
| 478 | + // 准备参数 | ||
| 479 | + String serviceIdentifier = "mode"; | ||
| 480 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 481 | + .put("identifier", serviceIdentifier) | ||
| 482 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 483 | + .put("mode", "auto") | ||
| 484 | + .build()) | ||
| 485 | + .build(); | ||
| 486 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 487 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 488 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 489 | + trigger.setIdentifier(serviceIdentifier); | ||
| 490 | + trigger.setOperator("=="); // 等于操作符 | ||
| 491 | + trigger.setValue("auto"); | ||
| 492 | + | ||
| 493 | + // 调用 | ||
| 494 | + boolean result = matcher.matches(message, trigger); | ||
| 495 | + | ||
| 496 | + // 断言 | ||
| 497 | + assertTrue(result); | ||
| 498 | + } | ||
| 499 | + | ||
| 500 | + /** | ||
| 501 | + * 测试参数缺失时的处理 - 消息中缺少 inputData | ||
| 502 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 503 | + * **Validates: Requirements 5.3** | ||
| 504 | + */ | ||
| 505 | + @Test | ||
| 506 | + public void testMatches_withParameterCondition_missingInputData() { | ||
| 507 | + // 准备参数 | ||
| 508 | + String serviceIdentifier = "testService"; | ||
| 509 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 510 | + .put("identifier", serviceIdentifier) | ||
| 511 | + // 缺少 inputData 字段 | ||
| 512 | + .build(); | ||
| 513 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 514 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 515 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 516 | + trigger.setIdentifier(serviceIdentifier); | ||
| 517 | + trigger.setOperator(">"); // 配置了参数条件 | ||
| 518 | + trigger.setValue("3"); | ||
| 519 | + | ||
| 520 | + // 调用 | ||
| 521 | + boolean result = matcher.matches(message, trigger); | ||
| 522 | + | ||
| 523 | + // 断言 | ||
| 524 | + assertFalse(result); | ||
| 525 | + } | ||
| 526 | + | ||
| 527 | + /** | ||
| 528 | + * 测试参数缺失时的处理 - inputData 中缺少指定参数 | ||
| 529 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 530 | + * **Validates: Requirements 5.3** | ||
| 531 | + */ | ||
| 532 | + @Test | ||
| 533 | + public void testMatches_withParameterCondition_missingParam() { | ||
| 534 | + // 准备参数 | ||
| 535 | + String serviceIdentifier = "level"; | ||
| 536 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 537 | + .put("identifier", serviceIdentifier) | ||
| 538 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 539 | + .put("otherParam", 5) // 不是 level 参数 | ||
| 540 | + .build()) | ||
| 541 | + .build(); | ||
| 542 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 543 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 544 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 545 | + trigger.setIdentifier(serviceIdentifier); | ||
| 546 | + trigger.setOperator(">"); // 配置了参数条件 | ||
| 547 | + trigger.setValue("3"); | ||
| 548 | + | ||
| 549 | + // 调用 | ||
| 550 | + boolean result = matcher.matches(message, trigger); | ||
| 551 | + | ||
| 552 | + // 断言 | ||
| 553 | + assertFalse(result); | ||
| 554 | + } | ||
| 555 | + | ||
| 556 | + /** | ||
| 557 | + * 测试只有 operator 没有 value 时不触发参数条件匹配 | ||
| 558 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 559 | + * **Validates: Requirements 5.2** | ||
| 560 | + */ | ||
| 561 | + @Test | ||
| 562 | + public void testMatches_onlyOperator_noValue() { | ||
| 563 | + // 准备参数 | ||
| 564 | + String serviceIdentifier = "testService"; | ||
| 565 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 566 | + .put("identifier", serviceIdentifier) | ||
| 567 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 568 | + .put("level", 5) | ||
| 569 | + .build()) | ||
| 570 | + .build(); | ||
| 571 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 572 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 573 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 574 | + trigger.setIdentifier(serviceIdentifier); | ||
| 575 | + trigger.setOperator(">"); // 只有 operator | ||
| 576 | + trigger.setValue(null); // 没有 value | ||
| 577 | + | ||
| 578 | + // 调用 | ||
| 579 | + boolean result = matcher.matches(message, trigger); | ||
| 580 | + | ||
| 581 | + // 断言：只有 operator 没有 value 时，不触发参数条件匹配，标识符匹配即成功 | ||
| 582 | + assertTrue(result); | ||
| 583 | + } | ||
| 584 | + | ||
| 585 | + /** | ||
| 586 | + * 测试只有 value 没有 operator 时不触发参数条件匹配 | ||
| 587 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 588 | + * **Validates: Requirements 5.2** | ||
| 589 | + */ | ||
| 590 | + @Test | ||
| 591 | + public void testMatches_onlyValue_noOperator() { | ||
| 592 | + // 准备参数 | ||
| 593 | + String serviceIdentifier = "testService"; | ||
| 594 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 595 | + .put("identifier", serviceIdentifier) | ||
| 596 | + .put("inputData", MapUtil.builder(new HashMap<String, Object>()) | ||
| 597 | + .put("level", 5) | ||
| 598 | + .build()) | ||
| 599 | + .build(); | ||
| 600 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 601 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 602 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 603 | + trigger.setIdentifier(serviceIdentifier); | ||
| 604 | + trigger.setOperator(null); // 没有 operator | ||
| 605 | + trigger.setValue("3"); // 只有 value | ||
| 606 | + | ||
| 607 | + // 调用 | ||
| 608 | + boolean result = matcher.matches(message, trigger); | ||
| 609 | + | ||
| 610 | + // 断言：只有 value 没有 operator 时，不触发参数条件匹配，标识符匹配即成功 | ||
| 611 | + assertTrue(result); | ||
| 612 | + } | ||
| 613 | + | ||
| 614 | + /** | ||
| 615 | + * 测试使用 inputParams 字段（替代 inputData） | ||
| 616 | + * **Property 4: 服务调用触发器参数匹配逻辑** | ||
| 617 | + * **Validates: Requirements 5.1** | ||
| 618 | + */ | ||
| 619 | + @Test | ||
| 620 | + public void testMatches_withInputParams_success() { | ||
| 621 | + // 准备参数 | ||
| 622 | + String serviceIdentifier = "level"; | ||
| 623 | + Map<String, Object> serviceParams = MapUtil.builder(new HashMap<String, Object>()) | ||
| 624 | + .put("identifier", serviceIdentifier) | ||
| 625 | + .put("inputParams", MapUtil.builder(new HashMap<String, Object>()) // 使用 inputParams 而不是 inputData | ||
| 626 | + .put("level", 5) | ||
| 627 | + .build()) | ||
| 628 | + .build(); | ||
| 629 | + IotDeviceMessage message = createServiceInvokeMessage(serviceParams); | ||
| 630 | + IotSceneRuleDO.Trigger trigger = new IotSceneRuleDO.Trigger(); | ||
| 631 | + trigger.setType(IotSceneRuleTriggerTypeEnum.DEVICE_SERVICE_INVOKE.getType()); | ||
| 632 | + trigger.setIdentifier(serviceIdentifier); | ||
| 633 | + trigger.setOperator(">"); // 大于操作符 | ||
| 634 | + trigger.setValue("3"); | ||
| 635 | + | ||
| 636 | + // 调用 | ||
| 637 | + boolean result = matcher.matches(message, trigger); | ||
| 638 | + | ||
| 639 | + // 断言 | ||
| 640 | + assertTrue(result); | ||
| 641 | + } | ||
| 642 | + | ||
| 381 | // ========== 辅助方法 ========== | 643 | // ========== 辅助方法 ========== |
| 382 | 644 | ||
| 383 | /** | 645 | /** |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/IotDeviceCommonApi.java
| @@ -7,6 +7,12 @@ import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceRespDTO; | @@ -7,6 +7,12 @@ import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceRespDTO; | ||
| 7 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotModbusDeviceConfigRespDTO; | 7 | import cn.iocoder.yudao.module.iot.core.biz.dto.IotModbusDeviceConfigRespDTO; |
| 8 | 8 | ||
| 9 | import java.util.List; | 9 | import java.util.List; |
| 10 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotSubDeviceRegisterFullReqDTO; | ||
| 11 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO; | ||
| 12 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO; | ||
| 13 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterRespDTO; | ||
| 14 | + | ||
| 15 | +import java.util.List; | ||
| 10 | 16 | ||
| 11 | /** | 17 | /** |
| 12 | * IoT 设备通用 API | 18 | * IoT 设备通用 API |
| @@ -32,6 +38,22 @@ public interface IotDeviceCommonApi { | @@ -32,6 +38,22 @@ public interface IotDeviceCommonApi { | ||
| 32 | CommonResult<IotDeviceRespDTO> getDevice(IotDeviceGetReqDTO infoReqDTO); | 38 | CommonResult<IotDeviceRespDTO> getDevice(IotDeviceGetReqDTO infoReqDTO); |
| 33 | 39 | ||
| 34 | /** | 40 | /** |
| 41 | + * 直连/网关设备动态注册（一型一密） | ||
| 42 | + * | ||
| 43 | + * @param reqDTO 动态注册请求 | ||
| 44 | + * @return 注册结果（包含 DeviceSecret） | ||
| 45 | + */ | ||
| 46 | + CommonResult<IotDeviceRegisterRespDTO> registerDevice(IotDeviceRegisterReqDTO reqDTO); | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * 网关子设备动态注册（网关代理转发） | ||
| 50 | + * | ||
| 51 | + * @param reqDTO 子设备注册请求（包含网关标识和子设备列表） | ||
| 52 | + * @return 注册结果列表 | ||
| 53 | + */ | ||
| 54 | + CommonResult<List<IotSubDeviceRegisterRespDTO>> registerSubDevices(IotSubDeviceRegisterFullReqDTO reqDTO); | ||
| 55 | + | ||
| 56 | + /** | ||
| 35 | * 获取所有启用的 Modbus 设备配置列表 | 57 | * 获取所有启用的 Modbus 设备配置列表 |
| 36 | * | 58 | * |
| 37 | * @return Modbus 设备配置列表 | 59 | * @return Modbus 设备配置列表 |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
| 1 | package cn.iocoder.yudao.module.iot.core.biz.dto; | 1 | package cn.iocoder.yudao.module.iot.core.biz.dto; |
| 2 | 2 | ||
| 3 | import jakarta.validation.constraints.NotEmpty; | 3 | import jakarta.validation.constraints.NotEmpty; |
| 4 | +import lombok.AllArgsConstructor; | ||
| 4 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import lombok.NoArgsConstructor; | ||
| 5 | 7 | ||
| 6 | /** | 8 | /** |
| 7 | * IoT 设备认证 Request DTO | 9 | * IoT 设备认证 Request DTO |
| @@ -9,6 +11,8 @@ import lombok.Data; | @@ -9,6 +11,8 @@ import lombok.Data; | ||
| 9 | * @author 芋道源码 | 11 | * @author 芋道源码 |
| 10 | */ | 12 | */ |
| 11 | @Data | 13 | @Data |
| 14 | +@NoArgsConstructor | ||
| 15 | +@AllArgsConstructor | ||
| 12 | public class IotDeviceAuthReqDTO { | 16 | public class IotDeviceAuthReqDTO { |
| 13 | 17 | ||
| 14 | /** | 18 | /** |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotSubDeviceRegisterFullReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.biz.dto; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterReqDTO; | ||
| 4 | +import jakarta.validation.constraints.NotEmpty; | ||
| 5 | +import jakarta.validation.constraints.NotNull; | ||
| 6 | +import lombok.Data; | ||
| 7 | + | ||
| 8 | +import java.util.List; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * IoT 子设备动态注册 Request DTO | ||
| 12 | + * <p> | ||
| 13 | + * 额外包含了网关设备的标识信息 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + */ | ||
| 17 | +@Data | ||
| 18 | +public class IotSubDeviceRegisterFullReqDTO { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 网关设备 ProductKey | ||
| 22 | + */ | ||
| 23 | + @NotEmpty(message = "网关产品标识不能为空") | ||
| 24 | + private String gatewayProductKey; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 网关设备 DeviceName | ||
| 28 | + */ | ||
| 29 | + @NotEmpty(message = "网关设备名称不能为空") | ||
| 30 | + private String gatewayDeviceName; | ||
| 31 | + | ||
| 32 | + /** | ||
| 33 | + * 子设备注册列表 | ||
| 34 | + */ | ||
| 35 | + @NotNull(message = "子设备注册列表不能为空") | ||
| 36 | + private List<IotSubDeviceRegisterReqDTO> subDevices; | ||
| 37 | + | ||
| 38 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageMethodEnum.java
| @@ -24,12 +24,28 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> { | @@ -24,12 +24,28 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> { | ||
| 24 | 24 | ||
| 25 | // TODO 芋艿：要不要加个 ping 消息； | 25 | // TODO 芋艿：要不要加个 ping 消息； |
| 26 | 26 | ||
| 27 | + // ========== 拓扑管理 ========== | ||
| 28 | + // 可参考：https://help.aliyun.com/zh/iot/user-guide/manage-topological-relationships | ||
| 29 | + | ||
| 30 | + TOPO_ADD("thing.topo.add", "添加拓扑关系", true), | ||
| 31 | + TOPO_DELETE("thing.topo.delete", "删除拓扑关系", true), | ||
| 32 | + TOPO_GET("thing.topo.get", "获取拓扑关系", true), | ||
| 33 | + TOPO_CHANGE("thing.topo.change", "拓扑关系变更通知", false), | ||
| 34 | + | ||
| 35 | + // ========== 设备注册 ========== | ||
| 36 | + // 可参考：https://help.aliyun.com/zh/iot/user-guide/unique-certificate-per-product-verification | ||
| 37 | + | ||
| 38 | + DEVICE_REGISTER("thing.auth.register", "设备动态注册", true), | ||
| 39 | + SUB_DEVICE_REGISTER("thing.auth.register.sub", "子设备动态注册", true), | ||
| 40 | + | ||
| 27 | // ========== 设备属性 ========== | 41 | // ========== 设备属性 ========== |
| 28 | // 可参考：https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services | 42 | // 可参考：https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services |
| 29 | 43 | ||
| 30 | PROPERTY_POST("thing.property.post", "属性上报", true), | 44 | PROPERTY_POST("thing.property.post", "属性上报", true), |
| 31 | PROPERTY_SET("thing.property.set", "属性设置", false), | 45 | PROPERTY_SET("thing.property.set", "属性设置", false), |
| 32 | 46 | ||
| 47 | + PROPERTY_PACK_POST("thing.event.property.pack.post", "批量上报（属性 + 事件 + 子设备）", true), // 网关独有 | ||
| 48 | + | ||
| 33 | // ========== 设备事件 ========== | 49 | // ========== 设备事件 ========== |
| 34 | // 可参考：https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services | 50 | // 可参考：https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services |
| 35 | 51 | ||
| @@ -50,6 +66,7 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> { | @@ -50,6 +66,7 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> { | ||
| 50 | 66 | ||
| 51 | OTA_UPGRADE("thing.ota.upgrade", "OTA 固定信息推送", false), | 67 | OTA_UPGRADE("thing.ota.upgrade", "OTA 固定信息推送", false), |
| 52 | OTA_PROGRESS("thing.ota.progress", "OTA 升级进度上报", true), | 68 | OTA_PROGRESS("thing.ota.progress", "OTA 升级进度上报", true), |
| 69 | + | ||
| 53 | ; | 70 | ; |
| 54 | 71 | ||
| 55 | public static final String[] ARRAYS = Arrays.stream(values()).map(IotDeviceMessageMethodEnum::getMethod) | 72 | public static final String[] ARRAYS = Arrays.stream(values()).map(IotDeviceMessageMethodEnum::getMethod) |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageTypeEnum.java deleted
| 1 | -package cn.iocoder.yudao.module.iot.core.enums; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 4 | -import lombok.Getter; | ||
| 5 | -import lombok.RequiredArgsConstructor; | ||
| 6 | - | ||
| 7 | -import java.util.Arrays; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * IoT 设备消息类型枚举 | ||
| 11 | - */ | ||
| 12 | -@Getter | ||
| 13 | -@RequiredArgsConstructor | ||
| 14 | -public enum IotDeviceMessageTypeEnum implements ArrayValuable<String> { | ||
| 15 | - | ||
| 16 | - STATE("state"), // 设备状态 | ||
| 17 | -// PROPERTY("property"), // 设备属性：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 18 | - EVENT("event"), // 设备事件：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 19 | - SERVICE("service"), // 设备服务：可参考 https://help.aliyun.com/zh/iot/user-guide/device-properties-events-and-services 设备属性、事件、服务 | ||
| 20 | - CONFIG("config"), // 设备配置：可参考 https://help.aliyun.com/zh/iot/user-guide/remote-configuration-1 远程配置 | ||
| 21 | - OTA("ota"), // 设备 OTA：可参考 https://help.aliyun.com/zh/iot/user-guide/ota-update OTA 升级 | ||
| 22 | - REGISTER("register"), // 设备注册：可参考 https://help.aliyun.com/zh/iot/user-guide/register-devices 设备身份注册 | ||
| 23 | - TOPOLOGY("topology"),; // 设备拓扑：可参考 https://help.aliyun.com/zh/iot/user-guide/manage-topological-relationships 设备拓扑 | ||
| 24 | - | ||
| 25 | - public static final String[] ARRAYS = Arrays.stream(values()).map(IotDeviceMessageTypeEnum::getType).toArray(String[]::new); | ||
| 26 | - | ||
| 27 | - /** | ||
| 28 | - * 属性 | ||
| 29 | - */ | ||
| 30 | - private final String type; | ||
| 31 | - | ||
| 32 | - @Override | ||
| 33 | - public String[] array() { | ||
| 34 | - return ARRAYS; | ||
| 35 | - } | ||
| 36 | - | ||
| 37 | -} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotProtocolTypeEnum.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.enums; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.util.ArrayUtil; | ||
| 4 | +import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 5 | +import lombok.Getter; | ||
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 7 | + | ||
| 8 | +import java.util.Arrays; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * IoT 协议类型枚举 | ||
| 12 | + * | ||
| 13 | + * 用于定义传输层协议类型 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + */ | ||
| 17 | +@RequiredArgsConstructor | ||
| 18 | +@Getter | ||
| 19 | +public enum IotProtocolTypeEnum implements ArrayValuable<String> { | ||
| 20 | + | ||
| 21 | + TCP("tcp"), | ||
| 22 | + UDP("udp"), | ||
| 23 | + WEBSOCKET("websocket"), | ||
| 24 | + HTTP("http"), | ||
| 25 | + MQTT("mqtt"), | ||
| 26 | + EMQX("emqx"), | ||
| 27 | + COAP("coap"), | ||
| 28 | + MODBUS_TCP("modbus_tcp"); | ||
| 29 | + | ||
| 30 | + public static final String[] ARRAYS = Arrays.stream(values()).map(IotProtocolTypeEnum::getType).toArray(String[]::new); | ||
| 31 | + | ||
| 32 | + /** | ||
| 33 | + * 类型 | ||
| 34 | + */ | ||
| 35 | + private final String type; | ||
| 36 | + | ||
| 37 | + @Override | ||
| 38 | + public String[] array() { | ||
| 39 | + return ARRAYS; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + public static IotProtocolTypeEnum of(String type) { | ||
| 43 | + return ArrayUtil.firstMatch(e -> e.getType().equals(type), values()); | ||
| 44 | + } | ||
| 45 | + | ||
| 46 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotSerializeTypeEnum.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.enums; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.util.ArrayUtil; | ||
| 4 | +import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 5 | +import lombok.Getter; | ||
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 7 | + | ||
| 8 | +import java.util.Arrays; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * IoT 序列化类型枚举 | ||
| 12 | + * | ||
| 13 | + * 用于定义设备消息的序列化格式 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + */ | ||
| 17 | +@RequiredArgsConstructor | ||
| 18 | +@Getter | ||
| 19 | +public enum IotSerializeTypeEnum implements ArrayValuable<String> { | ||
| 20 | + | ||
| 21 | + JSON("json"), | ||
| 22 | + BINARY("binary"); | ||
| 23 | + | ||
| 24 | + public static final String[] ARRAYS = Arrays.stream(values()).map(IotSerializeTypeEnum::getType).toArray(String[]::new); | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 类型 | ||
| 28 | + */ | ||
| 29 | + private final String type; | ||
| 30 | + | ||
| 31 | + @Override | ||
| 32 | + public String[] array() { | ||
| 33 | + return ARRAYS; | ||
| 34 | + } | ||
| 35 | + | ||
| 36 | + public static IotSerializeTypeEnum of(String type) { | ||
| 37 | + return ArrayUtil.firstMatch(e -> e.getType().equals(type), values()); | ||
| 38 | + } | ||
| 39 | + | ||
| 40 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/IotMessageBus.java
| @@ -24,4 +24,14 @@ public interface IotMessageBus { | @@ -24,4 +24,14 @@ public interface IotMessageBus { | ||
| 24 | */ | 24 | */ |
| 25 | void register(IotMessageSubscriber<?> subscriber); | 25 | void register(IotMessageSubscriber<?> subscriber); |
| 26 | 26 | ||
| 27 | + /** | ||
| 28 | + * 取消注册消息订阅者 | ||
| 29 | + * | ||
| 30 | + * @param subscriber 订阅者 | ||
| 31 | + */ | ||
| 32 | + default void unregister(IotMessageSubscriber<?> subscriber) { | ||
| 33 | + // TODO 芋艿：暂时不实现，需求量不大，但是 | ||
| 34 | + // throw new UnsupportedOperationException("取消注册消息订阅者功能，尚未实现"); | ||
| 35 | + } | ||
| 36 | + | ||
| 27 | } | 37 | } |
| 28 | \ No newline at end of file | 38 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/IotMessageSubscriber.java
| @@ -26,4 +26,16 @@ public interface IotMessageSubscriber<T> { | @@ -26,4 +26,16 @@ public interface IotMessageSubscriber<T> { | ||
| 26 | */ | 26 | */ |
| 27 | void onMessage(T message); | 27 | void onMessage(T message); |
| 28 | 28 | ||
| 29 | + /** | ||
| 30 | + * 启动订阅 | ||
| 31 | + */ | ||
| 32 | + default void start() { | ||
| 33 | + } | ||
| 34 | + | ||
| 35 | + /** | ||
| 36 | + * 停止订阅 | ||
| 37 | + */ | ||
| 38 | + default void stop() { | ||
| 39 | + } | ||
| 40 | + | ||
| 29 | } | 41 | } |
| 30 | \ No newline at end of file | 42 | \ No newline at end of file |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/mq/message/IotDeviceMessage.java
| @@ -60,7 +60,7 @@ public class IotDeviceMessage { | @@ -60,7 +60,7 @@ public class IotDeviceMessage { | ||
| 60 | */ | 60 | */ |
| 61 | private String serverId; | 61 | private String serverId; |
| 62 | 62 | ||
| 63 | - // ========== codec（编解码）字段 ========== | 63 | + // ========== serialize（序列化）相关字段 ========== |
| 64 | 64 | ||
| 65 | /** | 65 | /** |
| 66 | * 请求编号 | 66 | * 请求编号 |
| @@ -94,7 +94,7 @@ public class IotDeviceMessage { | @@ -94,7 +94,7 @@ public class IotDeviceMessage { | ||
| 94 | */ | 94 | */ |
| 95 | private String msg; | 95 | private String msg; |
| 96 | 96 | ||
| 97 | - // ========== 基础方法：只传递"codec（编解码）字段" ========== | 97 | + // ========== 基础方法：只传递"serialize（序列化）相关字段" ========== |
| 98 | 98 | ||
| 99 | public static IotDeviceMessage requestOf(String method) { | 99 | public static IotDeviceMessage requestOf(String method) { |
| 100 | return requestOf(null, method, null); | 100 | return requestOf(null, method, null); |
| @@ -108,6 +108,23 @@ public class IotDeviceMessage { | @@ -108,6 +108,23 @@ public class IotDeviceMessage { | ||
| 108 | return of(requestId, method, params, null, null, null); | 108 | return of(requestId, method, params, null, null, null); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | + /** | ||
| 112 | + * 创建设备请求消息（包含设备信息） | ||
| 113 | + * | ||
| 114 | + * @param deviceId 设备编号 | ||
| 115 | + * @param tenantId 租户编号 | ||
| 116 | + * @param serverId 服务标识 | ||
| 117 | + * @param method 消息方法 | ||
| 118 | + * @param params 消息参数 | ||
| 119 | + * @return 消息对象 | ||
| 120 | + */ | ||
| 121 | + public static IotDeviceMessage requestOf(Long deviceId, Long tenantId, String serverId, | ||
| 122 | + String method, Object params) { | ||
| 123 | + IotDeviceMessage message = of(null, method, params, null, null, null); | ||
| 124 | + return message.setId(IotDeviceMessageUtils.generateMessageId()) | ||
| 125 | + .setDeviceId(deviceId).setTenantId(tenantId).setServerId(serverId); | ||
| 126 | + } | ||
| 127 | + | ||
| 111 | public static IotDeviceMessage replyOf(String requestId, String method, | 128 | public static IotDeviceMessage replyOf(String requestId, String method, |
| 112 | Object data, Integer code, String msg) { | 129 | Object data, Integer code, String msg) { |
| 113 | if (code == null) { | 130 | if (code == null) { |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/IotDeviceIdentity.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic; | ||
| 2 | + | ||
| 3 | +import jakarta.validation.constraints.NotEmpty; | ||
| 4 | +import lombok.AllArgsConstructor; | ||
| 5 | +import lombok.Data; | ||
| 6 | +import lombok.NoArgsConstructor; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * IoT 设备标识 | ||
| 10 | + * | ||
| 11 | + * 用于标识一个设备的基本信息（productKey + deviceName） | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + */ | ||
| 15 | +@Data | ||
| 16 | +@NoArgsConstructor | ||
| 17 | +@AllArgsConstructor | ||
| 18 | +public class IotDeviceIdentity { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 产品标识 | ||
| 22 | + */ | ||
| 23 | + @NotEmpty(message = "产品标识不能为空") | ||
| 24 | + private String productKey; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 设备名称 | ||
| 28 | + */ | ||
| 29 | + @NotEmpty(message = "设备名称不能为空") | ||
| 30 | + private String deviceName; | ||
| 31 | + | ||
| 32 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotDeviceRegisterReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.auth; | ||
| 2 | + | ||
| 3 | +import jakarta.validation.constraints.NotEmpty; | ||
| 4 | +import lombok.Data; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * IoT 设备动态注册 Request DTO | ||
| 8 | + * <p> | ||
| 9 | + * 用于直连设备/网关的一型一密动态注册：使用 productSecret 验证，返回 deviceSecret | ||
| 10 | + * | ||
| 11 | + * @author 芋道源码 | ||
| 12 | + * @see <a href="https://help.aliyun.com/zh/iot/user-guide/unique-certificate-per-product-verification">阿里云 - 一型一密</a> | ||
| 13 | + */ | ||
| 14 | +@Data | ||
| 15 | +public class IotDeviceRegisterReqDTO { | ||
| 16 | + | ||
| 17 | + /** | ||
| 18 | + * 产品标识 | ||
| 19 | + */ | ||
| 20 | + @NotEmpty(message = "产品标识不能为空") | ||
| 21 | + private String productKey; | ||
| 22 | + | ||
| 23 | + /** | ||
| 24 | + * 设备名称 | ||
| 25 | + */ | ||
| 26 | + @NotEmpty(message = "设备名称不能为空") | ||
| 27 | + private String deviceName; | ||
| 28 | + | ||
| 29 | + /** | ||
| 30 | + * 产品密钥 | ||
| 31 | + */ | ||
| 32 | + @NotEmpty(message = "产品密钥不能为空") | ||
| 33 | + private String productSecret; | ||
| 34 | + | ||
| 35 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotDeviceRegisterRespDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.auth; | ||
| 2 | + | ||
| 3 | +import lombok.AllArgsConstructor; | ||
| 4 | +import lombok.Data; | ||
| 5 | +import lombok.NoArgsConstructor; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * IoT 设备动态注册 Response DTO | ||
| 9 | + * <p> | ||
| 10 | + * 用于直连设备/网关的一型一密动态注册响应 | ||
| 11 | + * | ||
| 12 | + * @author 芋道源码 | ||
| 13 | + * @see <a href="https://help.aliyun.com/zh/iot/user-guide/unique-certificate-per-product-verification">阿里云 - 一型一密</a> | ||
| 14 | + */ | ||
| 15 | +@Data | ||
| 16 | +@NoArgsConstructor | ||
| 17 | +@AllArgsConstructor | ||
| 18 | +public class IotDeviceRegisterRespDTO { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 产品标识 | ||
| 22 | + */ | ||
| 23 | + private String productKey; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 设备名称 | ||
| 27 | + */ | ||
| 28 | + private String deviceName; | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 设备密钥 | ||
| 32 | + */ | ||
| 33 | + private String deviceSecret; | ||
| 34 | + | ||
| 35 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotSubDeviceRegisterReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.auth; | ||
| 2 | + | ||
| 3 | +import jakarta.validation.constraints.NotEmpty; | ||
| 4 | +import lombok.Data; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * IoT 子设备动态注册 Request DTO | ||
| 8 | + * <p> | ||
| 9 | + * 用于 thing.auth.register.sub 消息的 params 数组元素 | ||
| 10 | + * | ||
| 11 | + * 特殊：网关子设备的动态注册，必须已经创建好该网关子设备（不然哪来的 {@link #deviceName} 字段）。更多的好处，是设备不用提前烧录 deviceSecret 密钥。 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + * @see <a href="https://help.aliyun.com/zh/iot/user-guide/register-devices">阿里云 - 动态注册子设备</a> | ||
| 15 | + */ | ||
| 16 | +@Data | ||
| 17 | +public class IotSubDeviceRegisterReqDTO { | ||
| 18 | + | ||
| 19 | + /** | ||
| 20 | + * 子设备 ProductKey | ||
| 21 | + */ | ||
| 22 | + @NotEmpty(message = "产品标识不能为空") | ||
| 23 | + private String productKey; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 子设备 DeviceName | ||
| 27 | + */ | ||
| 28 | + @NotEmpty(message = "设备名称不能为空") | ||
| 29 | + private String deviceName; | ||
| 30 | + | ||
| 31 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotSubDeviceRegisterRespDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.auth; | ||
| 2 | + | ||
| 3 | +import lombok.AllArgsConstructor; | ||
| 4 | +import lombok.Data; | ||
| 5 | +import lombok.NoArgsConstructor; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * IoT 子设备动态注册 Response DTO | ||
| 9 | + * <p> | ||
| 10 | + * 用于 thing.auth.register.sub 响应的设备信息 | ||
| 11 | + * | ||
| 12 | + * @author 芋道源码 | ||
| 13 | + * @see <a href="https://help.aliyun.com/zh/iot/user-guide/register-devices">阿里云 - 动态注册子设备</a> | ||
| 14 | + */ | ||
| 15 | +@Data | ||
| 16 | +@NoArgsConstructor | ||
| 17 | +@AllArgsConstructor | ||
| 18 | +public class IotSubDeviceRegisterRespDTO { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 子设备 ProductKey | ||
| 22 | + */ | ||
| 23 | + private String productKey; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 子设备 DeviceName | ||
| 27 | + */ | ||
| 28 | + private String deviceName; | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 分配的 DeviceSecret | ||
| 32 | + */ | ||
| 33 | + private String deviceSecret; | ||
| 34 | + | ||
| 35 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/event/IotDeviceEventPostReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.event; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +/** | ||
| 6 | + * IoT 设备事件上报 Request DTO | ||
| 7 | + * <p> | ||
| 8 | + * 用于 thing.event.post 消息的 params 参数 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + * @see <a href="http://help.aliyun.com/zh/marketplace/device-reporting-events">阿里云 - 设备上报事件</a> | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class IotDeviceEventPostReqDTO { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 事件标识符 | ||
| 18 | + */ | ||
| 19 | + private String identifier; | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 事件输出参数 | ||
| 23 | + */ | ||
| 24 | + private Object value; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 上报时间（毫秒时间戳，可选） | ||
| 28 | + */ | ||
| 29 | + private Long time; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 创建事件上报 DTO | ||
| 33 | + * | ||
| 34 | + * @param identifier 事件标识符 | ||
| 35 | + * @param value 事件值 | ||
| 36 | + * @return DTO 对象 | ||
| 37 | + */ | ||
| 38 | + public static IotDeviceEventPostReqDTO of(String identifier, Object value) { | ||
| 39 | + return of(identifier, value, null); | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + /** | ||
| 43 | + * 创建事件上报 DTO（带时间） | ||
| 44 | + * | ||
| 45 | + * @param identifier 事件标识符 | ||
| 46 | + * @param value 事件值 | ||
| 47 | + * @param time 上报时间 | ||
| 48 | + * @return DTO 对象 | ||
| 49 | + */ | ||
| 50 | + public static IotDeviceEventPostReqDTO of(String identifier, Object value, Long time) { | ||
| 51 | + return new IotDeviceEventPostReqDTO().setIdentifier(identifier).setValue(value).setTime(time); | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/package-info.java
0 → 100644
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/property/IotDevicePropertyPackPostReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.property; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 4 | +import lombok.Data; | ||
| 5 | + | ||
| 6 | +import java.util.List; | ||
| 7 | +import java.util.Map; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * IoT 设备属性批量上报 Request DTO | ||
| 11 | + * <p> | ||
| 12 | + * 用于 thing.event.property.pack.post 消息的 params 参数 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + * @see <a href="http://help.aliyun.com/zh/marketplace/gateway-reports-data-in-batches">阿里云 - 网关批量上报数据</a> | ||
| 16 | + */ | ||
| 17 | +@Data | ||
| 18 | +public class IotDevicePropertyPackPostReqDTO { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 网关自身属性 | ||
| 22 | + * <p> | ||
| 23 | + * key: 属性标识符 | ||
| 24 | + * value: 属性值 | ||
| 25 | + */ | ||
| 26 | + private Map<String, Object> properties; | ||
| 27 | + | ||
| 28 | + /** | ||
| 29 | + * 网关自身事件 | ||
| 30 | + * <p> | ||
| 31 | + * key: 事件标识符 | ||
| 32 | + * value: 事件值对象（包含 value 和 time） | ||
| 33 | + */ | ||
| 34 | + private Map<String, EventValue> events; | ||
| 35 | + | ||
| 36 | + /** | ||
| 37 | + * 子设备数据列表 | ||
| 38 | + */ | ||
| 39 | + private List<SubDeviceData> subDevices; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 事件值对象 | ||
| 43 | + */ | ||
| 44 | + @Data | ||
| 45 | + public static class EventValue { | ||
| 46 | + | ||
| 47 | + /** | ||
| 48 | + * 事件参数 | ||
| 49 | + */ | ||
| 50 | + private Object value; | ||
| 51 | + | ||
| 52 | + /** | ||
| 53 | + * 上报时间（毫秒时间戳） | ||
| 54 | + */ | ||
| 55 | + private Long time; | ||
| 56 | + | ||
| 57 | + } | ||
| 58 | + | ||
| 59 | + /** | ||
| 60 | + * 子设备数据 | ||
| 61 | + */ | ||
| 62 | + @Data | ||
| 63 | + public static class SubDeviceData { | ||
| 64 | + | ||
| 65 | + /** | ||
| 66 | + * 子设备标识 | ||
| 67 | + */ | ||
| 68 | + private IotDeviceIdentity identity; | ||
| 69 | + | ||
| 70 | + /** | ||
| 71 | + * 子设备属性 | ||
| 72 | + * <p> | ||
| 73 | + * key: 属性标识符 | ||
| 74 | + * value: 属性值 | ||
| 75 | + */ | ||
| 76 | + private Map<String, Object> properties; | ||
| 77 | + | ||
| 78 | + /** | ||
| 79 | + * 子设备事件 | ||
| 80 | + * <p> | ||
| 81 | + * key: 事件标识符 | ||
| 82 | + * value: 事件值对象（包含 value 和 time） | ||
| 83 | + */ | ||
| 84 | + private Map<String, EventValue> events; | ||
| 85 | + | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/property/IotDevicePropertyPostReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.property; | ||
| 2 | + | ||
| 3 | +import java.util.HashMap; | ||
| 4 | +import java.util.Map; | ||
| 5 | + | ||
| 6 | +/** | ||
| 7 | + * IoT 设备属性上报 Request DTO | ||
| 8 | + * <p> | ||
| 9 | + * 用于 thing.property.post 消息的 params 参数 | ||
| 10 | + * <p> | ||
| 11 | + * 本质是一个 Map，key 为属性标识符，value 为属性值 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + * @see <a href="http://help.aliyun.com/zh/marketplace/device-reporting-attributes">阿里云 - 设备上报属性</a> | ||
| 15 | + */ | ||
| 16 | +public class IotDevicePropertyPostReqDTO extends HashMap<String, Object> { | ||
| 17 | + | ||
| 18 | + public IotDevicePropertyPostReqDTO() { | ||
| 19 | + super(); | ||
| 20 | + } | ||
| 21 | + | ||
| 22 | + public IotDevicePropertyPostReqDTO(Map<String, Object> properties) { | ||
| 23 | + super(properties); | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 创建属性上报 DTO | ||
| 28 | + * | ||
| 29 | + * @param properties 属性数据 | ||
| 30 | + * @return DTO 对象 | ||
| 31 | + */ | ||
| 32 | + public static IotDevicePropertyPostReqDTO of(Map<String, Object> properties) { | ||
| 33 | + return new IotDevicePropertyPostReqDTO(properties); | ||
| 34 | + } | ||
| 35 | + | ||
| 36 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoAddReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.topo; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; | ||
| 4 | +import jakarta.validation.constraints.NotEmpty; | ||
| 5 | +import lombok.Data; | ||
| 6 | + | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * IoT 设备拓扑添加 Request DTO | ||
| 11 | + * <p> | ||
| 12 | + * 用于 thing.topo.add 消息的 params 参数 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + * @see <a href="http://help.aliyun.com/zh/marketplace/add-topological-relationship">阿里云 - 添加拓扑关系</a> | ||
| 16 | + */ | ||
| 17 | +@Data | ||
| 18 | +public class IotDeviceTopoAddReqDTO { | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 子设备认证信息列表 | ||
| 22 | + * <p> | ||
| 23 | + * 复用 {@link IotDeviceAuthReqDTO}，包含 clientId、username、password | ||
| 24 | + */ | ||
| 25 | + @NotEmpty(message = "子设备认证信息列表不能为空") | ||
| 26 | + private List<IotDeviceAuthReqDTO> subDevices; | ||
| 27 | + | ||
| 28 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoChangeReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.topo; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 4 | +import lombok.AllArgsConstructor; | ||
| 5 | +import lombok.Data; | ||
| 6 | +import lombok.NoArgsConstructor; | ||
| 7 | + | ||
| 8 | +import java.util.List; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * IoT 设备拓扑关系变更通知 Request DTO | ||
| 12 | + * <p> | ||
| 13 | + * 用于 thing.topo.change 下行消息的 params 参数 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + * @see <a href="https://help.aliyun.com/zh/marketplace/notify-gateway-topology-changes">阿里云 - 通知网关拓扑关系变化</a> | ||
| 17 | + */ | ||
| 18 | +@Data | ||
| 19 | +@NoArgsConstructor | ||
| 20 | +@AllArgsConstructor | ||
| 21 | +public class IotDeviceTopoChangeReqDTO { | ||
| 22 | + | ||
| 23 | + public static final Integer STATUS_CREATE = 0; | ||
| 24 | + public static final Integer STATUS_DELETE = 1; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 拓扑关系状态 | ||
| 28 | + */ | ||
| 29 | + private Integer status; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 子设备列表 | ||
| 33 | + */ | ||
| 34 | + private List<IotDeviceIdentity> subList; | ||
| 35 | + | ||
| 36 | + public static IotDeviceTopoChangeReqDTO ofCreate(List<IotDeviceIdentity> subList) { | ||
| 37 | + return new IotDeviceTopoChangeReqDTO(STATUS_CREATE, subList); | ||
| 38 | + } | ||
| 39 | + | ||
| 40 | + public static IotDeviceTopoChangeReqDTO ofDelete(List<IotDeviceIdentity> subList) { | ||
| 41 | + return new IotDeviceTopoChangeReqDTO(STATUS_DELETE, subList); | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoDeleteReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.topo; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 4 | +import jakarta.validation.Valid; | ||
| 5 | +import jakarta.validation.constraints.NotEmpty; | ||
| 6 | +import lombok.Data; | ||
| 7 | + | ||
| 8 | +import java.util.List; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * IoT 设备拓扑删除 Request DTO | ||
| 12 | + * <p> | ||
| 13 | + * 用于 thing.topo.delete 消息的 params 参数 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + * @see <a href="https://help.aliyun.com/zh/marketplace/delete-a-topological-relationship">阿里云 - 删除拓扑关系</a> | ||
| 17 | + */ | ||
| 18 | +@Data | ||
| 19 | +public class IotDeviceTopoDeleteReqDTO { | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 子设备标识列表 | ||
| 23 | + */ | ||
| 24 | + @Valid | ||
| 25 | + @NotEmpty(message = "子设备标识列表不能为空") | ||
| 26 | + private List<IotDeviceIdentity> subDevices; | ||
| 27 | + | ||
| 28 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoGetReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.topo; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +/** | ||
| 6 | + * IoT 设备拓扑关系获取 Request DTO | ||
| 7 | + * <p> | ||
| 8 | + * 用于 thing.topo.get 请求的 params 参数（目前为空，预留扩展） | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + * @see <a href="https://help.aliyun.com/zh/marketplace/obtain-topological-relationship">阿里云 - 获取拓扑关系</a> | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class IotDeviceTopoGetReqDTO { | ||
| 15 | + | ||
| 16 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoGetRespDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.core.topic.topo; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 4 | +import lombok.Data; | ||
| 5 | + | ||
| 6 | +import java.util.List; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * IoT 设备拓扑关系获取 Response DTO | ||
| 10 | + * <p> | ||
| 11 | + * 用于 thing.topo.get 响应 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + * @see <a href="https://help.aliyun.com/zh/marketplace/obtain-topological-relationship">阿里云 - 获取拓扑关系</a> | ||
| 15 | + */ | ||
| 16 | +@Data | ||
| 17 | +public class IotDeviceTopoGetRespDTO { | ||
| 18 | + | ||
| 19 | + /** | ||
| 20 | + * 子设备列表 | ||
| 21 | + */ | ||
| 22 | + private List<IotDeviceIdentity> subDevices; | ||
| 23 | + | ||
| 24 | +} |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceAuthUtils.java
| 1 | package cn.iocoder.yudao.module.iot.core.util; | 1 | package cn.iocoder.yudao.module.iot.core.util; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.util.StrUtil; | ||
| 3 | import cn.hutool.crypto.digest.DigestUtil; | 4 | import cn.hutool.crypto.digest.DigestUtil; |
| 4 | import cn.hutool.crypto.digest.HmacAlgorithm; | 5 | import cn.hutool.crypto.digest.HmacAlgorithm; |
| 5 | -import lombok.AllArgsConstructor; | ||
| 6 | -import lombok.Data; | ||
| 7 | -import lombok.NoArgsConstructor; | 6 | +import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; |
| 7 | +import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity; | ||
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | * IoT 设备【认证】的工具类，参考阿里云 | 10 | * IoT 设备【认证】的工具类，参考阿里云 |
| @@ -13,73 +13,40 @@ import lombok.NoArgsConstructor; | @@ -13,73 +13,40 @@ import lombok.NoArgsConstructor; | ||
| 13 | */ | 13 | */ |
| 14 | public class IotDeviceAuthUtils { | 14 | public class IotDeviceAuthUtils { |
| 15 | 15 | ||
| 16 | - /** | ||
| 17 | - * 认证信息 | ||
| 18 | - */ | ||
| 19 | - @Data | ||
| 20 | - @NoArgsConstructor | ||
| 21 | - @AllArgsConstructor | ||
| 22 | - public static class AuthInfo { | ||
| 23 | - | ||
| 24 | - /** | ||
| 25 | - * 客户端 ID | ||
| 26 | - */ | ||
| 27 | - private String clientId; | ||
| 28 | - | ||
| 29 | - /** | ||
| 30 | - * 用户名 | ||
| 31 | - */ | ||
| 32 | - private String username; | ||
| 33 | - | ||
| 34 | - /** | ||
| 35 | - * 密码 | ||
| 36 | - */ | ||
| 37 | - private String password; | ||
| 38 | - | ||
| 39 | - } | ||
| 40 | - | ||
| 41 | - /** | ||
| 42 | - * 设备信息 | ||
| 43 | - */ | ||
| 44 | - @Data | ||
| 45 | - public static class DeviceInfo { | ||
| 46 | - | ||
| 47 | - private String productKey; | ||
| 48 | - | ||
| 49 | - private String deviceName; | ||
| 50 | - | ||
| 51 | - } | ||
| 52 | - | ||
| 53 | - public static AuthInfo getAuthInfo(String productKey, String deviceName, String deviceSecret) { | 16 | + public static IotDeviceAuthReqDTO getAuthInfo(String productKey, String deviceName, String deviceSecret) { |
| 54 | String clientId = buildClientId(productKey, deviceName); | 17 | String clientId = buildClientId(productKey, deviceName); |
| 55 | String username = buildUsername(productKey, deviceName); | 18 | String username = buildUsername(productKey, deviceName); |
| 56 | - String content = "clientId" + clientId + | ||
| 57 | - "deviceName" + deviceName + | ||
| 58 | - "deviceSecret" + deviceSecret + | ||
| 59 | - "productKey" + productKey; | ||
| 60 | - String password = buildPassword(deviceSecret, content); | ||
| 61 | - return new AuthInfo(clientId, username, password); | 19 | + String password = buildPassword(deviceSecret, |
| 20 | + buildContent(clientId, productKey, deviceName, deviceSecret)); | ||
| 21 | + return new IotDeviceAuthReqDTO(clientId, username, password); | ||
| 62 | } | 22 | } |
| 63 | 23 | ||
| 64 | - private static String buildClientId(String productKey, String deviceName) { | 24 | + public static String buildClientId(String productKey, String deviceName) { |
| 65 | return String.format("%s.%s", productKey, deviceName); | 25 | return String.format("%s.%s", productKey, deviceName); |
| 66 | } | 26 | } |
| 67 | 27 | ||
| 68 | - private static String buildUsername(String productKey, String deviceName) { | 28 | + public static String buildUsername(String productKey, String deviceName) { |
| 69 | return String.format("%s&%s", deviceName, productKey); | 29 | return String.format("%s&%s", deviceName, productKey); |
| 70 | } | 30 | } |
| 71 | 31 | ||
| 72 | - private static String buildPassword(String deviceSecret, String content) { | ||
| 73 | - return DigestUtil.hmac(HmacAlgorithm.HmacSHA256, deviceSecret.getBytes()) | 32 | + public static String buildPassword(String deviceSecret, String content) { |
| 33 | + return DigestUtil.hmac(HmacAlgorithm.HmacSHA256, StrUtil.utf8Bytes(deviceSecret)) | ||
| 74 | .digestHex(content); | 34 | .digestHex(content); |
| 75 | } | 35 | } |
| 76 | 36 | ||
| 77 | - public static DeviceInfo parseUsername(String username) { | 37 | + private static String buildContent(String clientId, String productKey, String deviceName, String deviceSecret) { |
| 38 | + return "clientId" + clientId + | ||
| 39 | + "deviceName" + deviceName + | ||
| 40 | + "deviceSecret" + deviceSecret + | ||
| 41 | + "productKey" + productKey; | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | + public static IotDeviceIdentity parseUsername(String username) { | ||
| 78 | String[] usernameParts = username.split("&"); | 45 | String[] usernameParts = username.split("&"); |
| 79 | if (usernameParts.length != 2) { | 46 | if (usernameParts.length != 2) { |
| 80 | return null; | 47 | return null; |
| 81 | } | 48 | } |
| 82 | - return new DeviceInfo().setProductKey(usernameParts[1]).setDeviceName(usernameParts[0]); | 49 | + return new IotDeviceIdentity(usernameParts[1], usernameParts[0]); |
| 83 | } | 50 | } |
| 84 | 51 | ||
| 85 | } | 52 | } |
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java
| @@ -72,7 +72,7 @@ public class IotDeviceMessageUtils { | @@ -72,7 +72,7 @@ public class IotDeviceMessageUtils { | ||
| 72 | 72 | ||
| 73 | /** | 73 | /** |
| 74 | * 判断消息中是否包含指定的标识符 | 74 | * 判断消息中是否包含指定的标识符 |
| 75 | - * | 75 | + * <p> |
| 76 | * 对于不同消息类型的处理： | 76 | * 对于不同消息类型的处理： |
| 77 | * - EVENT_POST/SERVICE_INVOKE：检查 params.identifier 是否匹配 | 77 | * - EVENT_POST/SERVICE_INVOKE：检查 params.identifier 是否匹配 |
| 78 | * - STATE_UPDATE：检查 params.state 是否匹配 | 78 | * - STATE_UPDATE：检查 params.state 是否匹配 |
| @@ -100,6 +100,17 @@ public class IotDeviceMessageUtils { | @@ -100,6 +100,17 @@ public class IotDeviceMessageUtils { | ||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | /** | 102 | /** |
| 103 | + * 判断消息中是否不包含指定的标识符 | ||
| 104 | + * | ||
| 105 | + * @param message 消息 | ||
| 106 | + * @param identifier 要检查的标识符 | ||
| 107 | + * @return 是否不包含 | ||
| 108 | + */ | ||
| 109 | + public static boolean notContainsIdentifier(IotDeviceMessage message, String identifier) { | ||
| 110 | + return !containsIdentifier(message, identifier); | ||
| 111 | + } | ||
| 112 | + | ||
| 113 | + /** | ||
| 103 | * 将 params 解析为 Map | 114 | * 将 params 解析为 Map |
| 104 | * | 115 | * |
| 105 | * @param params 参数（可能是 Map 或 JSON 字符串） | 116 | * @param params 参数（可能是 Map 或 JSON 字符串） |
| @@ -144,20 +155,19 @@ public class IotDeviceMessageUtils { | @@ -144,20 +155,19 @@ public class IotDeviceMessageUtils { | ||
| 144 | return null; | 155 | return null; |
| 145 | } | 156 | } |
| 146 | 157 | ||
| 147 | - // 策略1：如果 params 不是 Map，直接返回该值（适用于简单的单属性消息） | 158 | + // 策略 1：如果 params 不是 Map，直接返回该值（适用于简单的单属性消息） |
| 148 | if (!(params instanceof Map)) { | 159 | if (!(params instanceof Map)) { |
| 149 | return params; | 160 | return params; |
| 150 | } | 161 | } |
| 151 | 162 | ||
| 163 | + // 策略 2：直接通过标识符获取属性值 | ||
| 152 | Map<String, Object> paramsMap = (Map<String, Object>) params; | 164 | Map<String, Object> paramsMap = (Map<String, Object>) params; |
| 153 | - | ||
| 154 | - // 策略2：直接通过标识符获取属性值 | ||
| 155 | Object directValue = paramsMap.get(identifier); | 165 | Object directValue = paramsMap.get(identifier); |
| 156 | if (directValue != null) { | 166 | if (directValue != null) { |
| 157 | return directValue; | 167 | return directValue; |
| 158 | } | 168 | } |
| 159 | 169 | ||
| 160 | - // 策略3：从 properties 字段中获取（适用于标准属性上报消息） | 170 | + // 策略 3：从 properties 字段中获取（适用于标准属性上报消息） |
| 161 | Object properties = paramsMap.get("properties"); | 171 | Object properties = paramsMap.get("properties"); |
| 162 | if (properties instanceof Map) { | 172 | if (properties instanceof Map) { |
| 163 | Map<String, Object> propertiesMap = (Map<String, Object>) properties; | 173 | Map<String, Object> propertiesMap = (Map<String, Object>) properties; |
| @@ -167,7 +177,7 @@ public class IotDeviceMessageUtils { | @@ -167,7 +177,7 @@ public class IotDeviceMessageUtils { | ||
| 167 | } | 177 | } |
| 168 | } | 178 | } |
| 169 | 179 | ||
| 170 | - // 策略4：从 data 字段中获取（适用于某些消息格式） | 180 | + // 策略 4：从 data 字段中获取（适用于某些消息格式） |
| 171 | Object data = paramsMap.get("data"); | 181 | Object data = paramsMap.get("data"); |
| 172 | if (data instanceof Map) { | 182 | if (data instanceof Map) { |
| 173 | Map<String, Object> dataMap = (Map<String, Object>) data; | 183 | Map<String, Object> dataMap = (Map<String, Object>) data; |
| @@ -177,13 +187,13 @@ public class IotDeviceMessageUtils { | @@ -177,13 +187,13 @@ public class IotDeviceMessageUtils { | ||
| 177 | } | 187 | } |
| 178 | } | 188 | } |
| 179 | 189 | ||
| 180 | - // 策略5：从 value 字段中获取（适用于单值消息） | 190 | + // 策略 5：从 value 字段中获取（适用于单值消息） |
| 181 | Object value = paramsMap.get("value"); | 191 | Object value = paramsMap.get("value"); |
| 182 | if (value != null) { | 192 | if (value != null) { |
| 183 | return value; | 193 | return value; |
| 184 | } | 194 | } |
| 185 | 195 | ||
| 186 | - // 策略6：如果 Map 只有两个字段且包含 identifier，返回另一个字段的值 | 196 | + // 策略 6：如果 Map 只有两个字段且包含 identifier，返回另一个字段的值 |
| 187 | if (paramsMap.size() == 2 && paramsMap.containsKey("identifier")) { | 197 | if (paramsMap.size() == 2 && paramsMap.containsKey("identifier")) { |
| 188 | for (Map.Entry<String, Object> entry : paramsMap.entrySet()) { | 198 | for (Map.Entry<String, Object> entry : paramsMap.entrySet()) { |
| 189 | if (!"identifier".equals(entry.getKey())) { | 199 | if (!"identifier".equals(entry.getKey())) { |
| @@ -196,6 +206,43 @@ public class IotDeviceMessageUtils { | @@ -196,6 +206,43 @@ public class IotDeviceMessageUtils { | ||
| 196 | return null; | 206 | return null; |
| 197 | } | 207 | } |
| 198 | 208 | ||
| 209 | + /** | ||
| 210 | + * 从服务调用消息中提取输入参数 | ||
| 211 | + * <p> | ||
| 212 | + * 服务调用消息的 params 结构通常为： | ||
| 213 | + * { | ||
| 214 | + * "identifier": "serviceIdentifier", | ||
| 215 | + * "inputData": { ... } 或 "inputParams": { ... } | ||
| 216 | + * } | ||
| 217 | + * | ||
| 218 | + * @param message 设备消息 | ||
| 219 | + * @return 输入参数 Map，如果未找到则返回 null | ||
| 220 | + */ | ||
| 221 | + @SuppressWarnings("unchecked") | ||
| 222 | + public static Map<String, Object> extractServiceInputParams(IotDeviceMessage message) { | ||
| 223 | + // 1. 参数校验 | ||
| 224 | + Object params = message.getParams(); | ||
| 225 | + if (params == null) { | ||
| 226 | + return null; | ||
| 227 | + } | ||
| 228 | + if (!(params instanceof Map)) { | ||
| 229 | + return null; | ||
| 230 | + } | ||
| 231 | + Map<String, Object> paramsMap = (Map<String, Object>) params; | ||
| 232 | + | ||
| 233 | + // 尝试从 inputData 字段获取 | ||
| 234 | + Object inputData = paramsMap.get("inputData"); | ||
| 235 | + if (inputData instanceof Map) { | ||
| 236 | + return (Map<String, Object>) inputData; | ||
| 237 | + } | ||
| 238 | + // 尝试从 inputParams 字段获取 | ||
| 239 | + Object inputParams = paramsMap.get("inputParams"); | ||
| 240 | + if (inputParams instanceof Map) { | ||
| 241 | + return (Map<String, Object>) inputParams; | ||
| 242 | + } | ||
| 243 | + return null; | ||
| 244 | + } | ||
| 245 | + | ||
| 199 | // ========== Topic 相关 ========== | 246 | // ========== Topic 相关 ========== |
| 200 | 247 | ||
| 201 | public static String buildMessageBusGatewayDeviceMessageTopic(String serverId) { | 248 | public static String buildMessageBusGatewayDeviceMessageTopic(String serverId) { |
yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java
| 1 | package cn.iocoder.yudao.module.iot.core.util; | 1 | package cn.iocoder.yudao.module.iot.core.util; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; | ||
| 3 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; | 4 | import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; |
| 4 | import org.junit.jupiter.api.Test; | 5 | import org.junit.jupiter.api.Test; |
| 5 | 6 | ||
| 6 | import java.util.HashMap; | 7 | import java.util.HashMap; |
| 7 | import java.util.Map; | 8 | import java.util.Map; |
| 8 | 9 | ||
| 9 | -import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| 10 | -import static org.junit.jupiter.api.Assertions.assertNull; | 10 | +import static org.junit.jupiter.api.Assertions.*; |
| 11 | 11 | ||
| 12 | /** | 12 | /** |
| 13 | * {@link IotDeviceMessageUtils} 的单元测试 | 13 | * {@link IotDeviceMessageUtils} 的单元测试 |
| @@ -138,4 +138,72 @@ public class IotDeviceMessageUtilsTest { | @@ -138,4 +138,72 @@ public class IotDeviceMessageUtilsTest { | ||
| 138 | Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); | 138 | Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); |
| 139 | assertEquals(25.5, result); // 应该返回直接标识符的值 | 139 | assertEquals(25.5, result); // 应该返回直接标识符的值 |
| 140 | } | 140 | } |
| 141 | + | ||
| 142 | + // ========== notContainsIdentifier 测试 ========== | ||
| 143 | + | ||
| 144 | + /** | ||
| 145 | + * 测试 notContainsIdentifier 与 containsIdentifier 的互补性 | ||
| 146 | + * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性** | ||
| 147 | + * **Validates: Requirements 4.1** | ||
| 148 | + */ | ||
| 149 | + @Test | ||
| 150 | + public void testNotContainsIdentifier_complementary_whenContains() { | ||
| 151 | + // 准备参数：消息包含指定标识符 | ||
| 152 | + IotDeviceMessage message = new IotDeviceMessage(); | ||
| 153 | + message.setMethod(IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod()); | ||
| 154 | + Map<String, Object> params = new HashMap<>(); | ||
| 155 | + params.put("temperature", 25); | ||
| 156 | + message.setParams(params); | ||
| 157 | + String identifier = "temperature"; | ||
| 158 | + | ||
| 159 | + // 调用 & 断言：验证互补性 | ||
| 160 | + boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier); | ||
| 161 | + boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier); | ||
| 162 | + assertTrue(containsResult); | ||
| 163 | + assertFalse(notContainsResult); | ||
| 164 | + assertEquals(!containsResult, notContainsResult); | ||
| 165 | + } | ||
| 166 | + | ||
| 167 | + /** | ||
| 168 | + * 测试 notContainsIdentifier 与 containsIdentifier 的互补性 | ||
| 169 | + * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性** | ||
| 170 | + * **Validates: Requirements 4.1** | ||
| 171 | + */ | ||
| 172 | + @Test | ||
| 173 | + public void testNotContainsIdentifier_complementary_whenNotContains() { | ||
| 174 | + // 准备参数：消息不包含指定标识符 | ||
| 175 | + IotDeviceMessage message = new IotDeviceMessage(); | ||
| 176 | + message.setMethod(IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod()); | ||
| 177 | + Map<String, Object> params = new HashMap<>(); | ||
| 178 | + params.put("temperature", 25); | ||
| 179 | + message.setParams(params); | ||
| 180 | + String identifier = "humidity"; | ||
| 181 | + | ||
| 182 | + // 调用 & 断言：验证互补性 | ||
| 183 | + boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier); | ||
| 184 | + boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier); | ||
| 185 | + assertFalse(containsResult); | ||
| 186 | + assertTrue(notContainsResult); | ||
| 187 | + assertEquals(!containsResult, notContainsResult); | ||
| 188 | + } | ||
| 189 | + | ||
| 190 | + /** | ||
| 191 | + * 测试 notContainsIdentifier 与 containsIdentifier 的互补性 - 空参数场景 | ||
| 192 | + * **Property 2: notContainsIdentifier 与 containsIdentifier 互补性** | ||
| 193 | + * **Validates: Requirements 4.1** | ||
| 194 | + */ | ||
| 195 | + @Test | ||
| 196 | + public void testNotContainsIdentifier_complementary_nullParams() { | ||
| 197 | + // 准备参数：params 为 null | ||
| 198 | + IotDeviceMessage message = new IotDeviceMessage(); | ||
| 199 | + message.setParams(null); | ||
| 200 | + String identifier = "temperature"; | ||
| 201 | + | ||
| 202 | + // 调用 & 断言：验证互补性 | ||
| 203 | + boolean containsResult = IotDeviceMessageUtils.containsIdentifier(message, identifier); | ||
| 204 | + boolean notContainsResult = IotDeviceMessageUtils.notContainsIdentifier(message, identifier); | ||
| 205 | + assertFalse(containsResult); | ||
| 206 | + assertTrue(notContainsResult); | ||
| 207 | + assertEquals(!containsResult, notContainsResult); | ||
| 208 | + } | ||
| 141 | } | 209 | } |
yudao-module-iot/yudao-module-iot-gateway/pom.xml
| @@ -55,6 +55,12 @@ | @@ -55,6 +55,12 @@ | ||
| 55 | <version>3.2.1</version> | 55 | <version>3.2.1</version> |
| 56 | </dependency> | 56 | </dependency> |
| 57 | 57 | ||
| 58 | + <!-- CoAP 相关 - Eclipse Californium --> | ||
| 59 | + <dependency> | ||
| 60 | + <groupId>org.eclipse.californium</groupId> | ||
| 61 | + <artifactId>californium-core</artifactId> | ||
| 62 | + </dependency> | ||
| 63 | + | ||
| 58 | <!-- 测试相关 --> | 64 | <!-- 测试相关 --> |
| 59 | <dependency> | 65 | <dependency> |
| 60 | <groupId>cn.iocoder.boot</groupId> | 66 | <groupId>cn.iocoder.boot</groupId> |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/alink/IotAlinkDeviceMessageCodec.java
| @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; | @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; | ||
| 18 | @Component | 18 | @Component |
| 19 | public class IotAlinkDeviceMessageCodec implements IotDeviceMessageCodec { | 19 | public class IotAlinkDeviceMessageCodec implements IotDeviceMessageCodec { |
| 20 | 20 | ||
| 21 | - private static final String TYPE = "Alink"; | 21 | + public static final String TYPE = "Alink"; |
| 22 | 22 | ||
| 23 | @Data | 23 | @Data |
| 24 | @NoArgsConstructor | 24 | @NoArgsConstructor |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/simple/package-info.java deleted
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java
| @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; | @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; | ||
| 13 | import java.nio.charset.StandardCharsets; | 13 | import java.nio.charset.StandardCharsets; |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | - * TCP 二进制格式 {@link IotDeviceMessage} 编解码器 | 16 | + * TCP/UDP 二进制格式 {@link IotDeviceMessage} 编解码器 |
| 17 | * <p> | 17 | * <p> |
| 18 | * 二进制协议格式（所有数值使用大端序）： | 18 | * 二进制协议格式（所有数值使用大端序）： |
| 19 | * | 19 | * |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java
| @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; | @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; | ||
| 11 | import org.springframework.stereotype.Component; | 11 | import org.springframework.stereotype.Component; |
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | - * TCP JSON 格式 {@link IotDeviceMessage} 编解码器 | 14 | + * TCP/UDP JSON 格式 {@link IotDeviceMessage} 编解码器 |
| 15 | * | 15 | * |
| 16 | * 采用纯 JSON 格式传输，格式如下： | 16 | * 采用纯 JSON 格式传输，格式如下： |
| 17 | * { | 17 | * { |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayConfiguration.java
| 1 | package cn.iocoder.yudao.module.iot.gateway.config; | 1 | package cn.iocoder.yudao.module.iot.gateway.config; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus; | 3 | import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus; |
| 4 | +import cn.iocoder.yudao.module.iot.gateway.protocol.IotProtocolManager; | ||
| 4 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxAuthEventProtocol; | 5 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxAuthEventProtocol; |
| 5 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxDownstreamSubscriber; | 6 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxDownstreamSubscriber; |
| 6 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxUpstreamProtocol; | 7 | import cn.iocoder.yudao.module.iot.gateway.protocol.emqx.IotEmqxUpstreamProtocol; |
| @@ -18,14 +19,7 @@ import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.IotMqttDownstreamSubscr | @@ -18,14 +19,7 @@ import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.IotMqttDownstreamSubscr | ||
| 18 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.IotMqttUpstreamProtocol; | 19 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.IotMqttUpstreamProtocol; |
| 19 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.manager.IotMqttConnectionManager; | 20 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.manager.IotMqttConnectionManager; |
| 20 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.router.IotMqttDownstreamHandler; | 21 | import cn.iocoder.yudao.module.iot.gateway.protocol.mqtt.router.IotMqttDownstreamHandler; |
| 21 | -import cn.iocoder.yudao.module.iot.gateway.protocol.mqttws.IotMqttWsDownstreamSubscriber; | ||
| 22 | -import cn.iocoder.yudao.module.iot.gateway.protocol.mqttws.IotMqttWsUpstreamProtocol; | ||
| 23 | -import cn.iocoder.yudao.module.iot.gateway.protocol.mqttws.manager.IotMqttWsConnectionManager; | ||
| 24 | -import cn.iocoder.yudao.module.iot.gateway.protocol.mqttws.router.IotMqttWsDownstreamHandler; | ||
| 25 | -import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.IotTcpDownstreamSubscriber; | ||
| 26 | -import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.IotTcpUpstreamProtocol; | ||
| 27 | -import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.manager.IotTcpConnectionManager; | ||
| 28 | -import cn.iocoder.yudao.module.iot.gateway.service.device.IotDeviceService; | 22 | +import cn.iocoder.yudao.module.iot.gateway.serialize.IotMessageSerializerManager; |
| 29 | import cn.iocoder.yudao.module.iot.gateway.service.device.message.IotDeviceMessageService; | 23 | import cn.iocoder.yudao.module.iot.gateway.service.device.message.IotDeviceMessageService; |
| 30 | import io.vertx.core.Vertx; | 24 | import io.vertx.core.Vertx; |
| 31 | import lombok.extern.slf4j.Slf4j; | 25 | import lombok.extern.slf4j.Slf4j; |
| @@ -36,29 +30,20 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties | @@ -36,29 +30,20 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties | ||
| 36 | import org.springframework.context.annotation.Bean; | 30 | import org.springframework.context.annotation.Bean; |
| 37 | import org.springframework.context.annotation.Configuration; | 31 | import org.springframework.context.annotation.Configuration; |
| 38 | 32 | ||
| 33 | + | ||
| 39 | @Configuration | 34 | @Configuration |
| 40 | @EnableConfigurationProperties(IotGatewayProperties.class) | 35 | @EnableConfigurationProperties(IotGatewayProperties.class) |
| 41 | @Slf4j | 36 | @Slf4j |
| 42 | public class IotGatewayConfiguration { | 37 | public class IotGatewayConfiguration { |
| 43 | 38 | ||
| 44 | - /** | ||
| 45 | - * IoT 网关 HTTP 协议配置类 | ||
| 46 | - */ | ||
| 47 | - @Configuration | ||
| 48 | - @ConditionalOnProperty(prefix = "yudao.iot.gateway.protocol.http", name = "enabled", havingValue = "true") | ||
| 49 | - @Slf4j | ||
| 50 | - public static class HttpProtocolConfiguration { | ||
| 51 | - | ||
| 52 | - @Bean | ||
| 53 | - public IotHttpUpstreamProtocol iotHttpUpstreamProtocol(IotGatewayProperties gatewayProperties) { | ||
| 54 | - return new IotHttpUpstreamProtocol(gatewayProperties.getProtocol().getHttp()); | ||
| 55 | - } | 39 | + @Bean |
| 40 | + public IotMessageSerializerManager iotMessageSerializerManager() { | ||
| 41 | + return new IotMessageSerializerManager(); | ||
| 42 | + } | ||
| 56 | 43 | ||
| 57 | - @Bean | ||
| 58 | - public IotHttpDownstreamSubscriber iotHttpDownstreamSubscriber(IotHttpUpstreamProtocol httpUpstreamProtocol, | ||
| 59 | - IotMessageBus messageBus) { | ||
| 60 | - return new IotHttpDownstreamSubscriber(httpUpstreamProtocol, messageBus); | ||
| 61 | - } | 44 | + @Bean |
| 45 | + public IotProtocolManager iotProtocolManager(IotGatewayProperties gatewayProperties) { | ||
| 46 | + return new IotProtocolManager(gatewayProperties); | ||
| 62 | } | 47 | } |
| 63 | 48 | ||
| 64 | /** | 49 | /** |
| @@ -94,41 +79,6 @@ public class IotGatewayConfiguration { | @@ -94,41 +79,6 @@ public class IotGatewayConfiguration { | ||
| 94 | } | 79 | } |
| 95 | 80 | ||
| 96 | /** | 81 | /** |
| 97 | - * IoT 网关 TCP 协议配置类 | ||
| 98 | - */ | ||
| 99 | - @Configuration | ||
| 100 | - @ConditionalOnProperty(prefix = "yudao.iot.gateway.protocol.tcp", name = "enabled", havingValue = "true") | ||
| 101 | - @Slf4j | ||
| 102 | - public static class TcpProtocolConfiguration { | ||
| 103 | - | ||
| 104 | - @Bean(name = "tcpVertx", destroyMethod = "close") | ||
| 105 | - public Vertx tcpVertx() { | ||
| 106 | - return Vertx.vertx(); | ||
| 107 | - } | ||
| 108 | - | ||
| 109 | - @Bean | ||
| 110 | - public IotTcpUpstreamProtocol iotTcpUpstreamProtocol(IotGatewayProperties gatewayProperties, | ||
| 111 | - IotDeviceService deviceService, | ||
| 112 | - IotDeviceMessageService messageService, | ||
| 113 | - IotTcpConnectionManager connectionManager, | ||
| 114 | - @Qualifier("tcpVertx") Vertx tcpVertx) { | ||
| 115 | - return new IotTcpUpstreamProtocol(gatewayProperties.getProtocol().getTcp(), | ||
| 116 | - deviceService, messageService, connectionManager, tcpVertx); | ||
| 117 | - } | ||
| 118 | - | ||
| 119 | - @Bean | ||
| 120 | - public IotTcpDownstreamSubscriber iotTcpDownstreamSubscriber(IotTcpUpstreamProtocol protocolHandler, | ||
| 121 | - IotDeviceMessageService messageService, | ||
| 122 | - IotDeviceService deviceService, | ||
| 123 | - IotTcpConnectionManager connectionManager, | ||
| 124 | - IotMessageBus messageBus) { | ||
| 125 | - return new IotTcpDownstreamSubscriber(protocolHandler, messageService, deviceService, connectionManager, | ||
| 126 | - messageBus); | ||
| 127 | - } | ||
| 128 | - | ||
| 129 | - } | ||
| 130 | - | ||
| 131 | - /** | ||
| 132 | * IoT 网关 MQTT 协议配置类 | 82 | * IoT 网关 MQTT 协议配置类 |
| 133 | */ | 83 | */ |
| 134 | @Configuration | 84 | @Configuration |
| @@ -166,44 +116,6 @@ public class IotGatewayConfiguration { | @@ -166,44 +116,6 @@ public class IotGatewayConfiguration { | ||
| 166 | } | 116 | } |
| 167 | 117 | ||
| 168 | /** | 118 | /** |
| 169 | - * IoT 网关 MQTT WebSocket 协议配置类 | ||
| 170 | - */ | ||
| 171 | - @Configuration | ||
| 172 | - @ConditionalOnProperty(prefix = "yudao.iot.gateway.protocol.mqtt-ws", name = "enabled", havingValue = "true") | ||
| 173 | - @Slf4j | ||
| 174 | - public static class MqttWsProtocolConfiguration { | ||
| 175 | - | ||
| 176 | - @Bean(name = "mqttWsVertx", destroyMethod = "close") | ||
| 177 | - public Vertx mqttWsVertx() { | ||
| 178 | - return Vertx.vertx(); | ||
| 179 | - } | ||
| 180 | - | ||
| 181 | - @Bean | ||
| 182 | - public IotMqttWsUpstreamProtocol iotMqttWsUpstreamProtocol(IotGatewayProperties gatewayProperties, | ||
| 183 | - IotDeviceMessageService messageService, | ||
| 184 | - IotMqttWsConnectionManager connectionManager, | ||
| 185 | - @Qualifier("mqttWsVertx") Vertx mqttWsVertx) { | ||
| 186 | - return new IotMqttWsUpstreamProtocol(gatewayProperties.getProtocol().getMqttWs(), | ||
| 187 | - messageService, connectionManager, mqttWsVertx); | ||
| 188 | - } | ||
| 189 | - | ||
| 190 | - @Bean | ||
| 191 | - public IotMqttWsDownstreamHandler iotMqttWsDownstreamHandler(IotDeviceMessageService messageService, | ||
| 192 | - IotDeviceService deviceService, | ||
| 193 | - IotMqttWsConnectionManager connectionManager) { | ||
| 194 | - return new IotMqttWsDownstreamHandler(messageService, deviceService, connectionManager); | ||
| 195 | - } | ||
| 196 | - | ||
| 197 | - @Bean | ||
| 198 | - public IotMqttWsDownstreamSubscriber iotMqttWsDownstreamSubscriber(IotMqttWsUpstreamProtocol mqttWsUpstreamProtocol, | ||
| 199 | - IotMqttWsDownstreamHandler downstreamHandler, | ||
| 200 | - IotMessageBus messageBus) { | ||
| 201 | - return new IotMqttWsDownstreamSubscriber(mqttWsUpstreamProtocol, downstreamHandler, messageBus); | ||
| 202 | - } | ||
| 203 | - | ||
| 204 | - } | ||
| 205 | - | ||
| 206 | - /** | ||
| 207 | * IoT 网关 Modbus TCP 协议配置类 | 119 | * IoT 网关 Modbus TCP 协议配置类 |
| 208 | */ | 120 | */ |
| 209 | @Configuration | 121 | @Configuration |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
| 1 | package cn.iocoder.yudao.module.iot.gateway.config; | 1 | package cn.iocoder.yudao.module.iot.gateway.config; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.enums.IotProtocolTypeEnum; | ||
| 4 | +import cn.iocoder.yudao.module.iot.gateway.protocol.coap.IotCoapConfig; | ||
| 5 | +import cn.iocoder.yudao.module.iot.gateway.protocol.http.IotHttpConfig; | ||
| 6 | +import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.IotTcpConfig; | ||
| 7 | +import cn.iocoder.yudao.module.iot.gateway.protocol.udp.IotUdpConfig; | ||
| 8 | +import cn.iocoder.yudao.module.iot.gateway.protocol.websocket.IotWebSocketConfig; | ||
| 9 | +import io.vertx.core.net.KeyCertOptions; | ||
| 10 | +import io.vertx.core.net.TrustOptions; | ||
| 11 | +import jakarta.validation.Valid; | ||
| 3 | import jakarta.validation.constraints.NotEmpty; | 12 | import jakarta.validation.constraints.NotEmpty; |
| 4 | import jakarta.validation.constraints.NotNull; | 13 | import jakarta.validation.constraints.NotNull; |
| 5 | import lombok.Data; | 14 | import lombok.Data; |
| @@ -24,10 +33,15 @@ public class IotGatewayProperties { | @@ -24,10 +33,15 @@ public class IotGatewayProperties { | ||
| 24 | private TokenProperties token; | 33 | private TokenProperties token; |
| 25 | 34 | ||
| 26 | /** | 35 | /** |
| 27 | - * 协议配置 | 36 | + * 协议配置（旧版，保持兼容） |
| 28 | */ | 37 | */ |
| 29 | private ProtocolProperties protocol; | 38 | private ProtocolProperties protocol; |
| 30 | 39 | ||
| 40 | + /** | ||
| 41 | + * 协议实例列表 | ||
| 42 | + */ | ||
| 43 | + private List<ProtocolInstanceProperties> protocols; | ||
| 44 | + | ||
| 31 | @Data | 45 | @Data |
| 32 | public static class RpcProperties { | 46 | public static class RpcProperties { |
| 33 | 47 | ||
| @@ -69,31 +83,16 @@ public class IotGatewayProperties { | @@ -69,31 +83,16 @@ public class IotGatewayProperties { | ||
| 69 | public static class ProtocolProperties { | 83 | public static class ProtocolProperties { |
| 70 | 84 | ||
| 71 | /** | 85 | /** |
| 72 | - * HTTP 组件配置 | ||
| 73 | - */ | ||
| 74 | - private HttpProperties http; | ||
| 75 | - | ||
| 76 | - /** | ||
| 77 | * EMQX 组件配置 | 86 | * EMQX 组件配置 |
| 78 | */ | 87 | */ |
| 79 | private EmqxProperties emqx; | 88 | private EmqxProperties emqx; |
| 80 | 89 | ||
| 81 | /** | 90 | /** |
| 82 | - * TCP 组件配置 | ||
| 83 | - */ | ||
| 84 | - private TcpProperties tcp; | ||
| 85 | - | ||
| 86 | - /** | ||
| 87 | * MQTT 组件配置 | 91 | * MQTT 组件配置 |
| 88 | */ | 92 | */ |
| 89 | private MqttProperties mqtt; | 93 | private MqttProperties mqtt; |
| 90 | 94 | ||
| 91 | /** | 95 | /** |
| 92 | - * MQTT WebSocket 组件配置 | ||
| 93 | - */ | ||
| 94 | - private MqttWsProperties mqttWs; | ||
| 95 | - | ||
| 96 | - /** | ||
| 97 | * Modbus TCP 组件配置 | 96 | * Modbus TCP 组件配置 |
| 98 | */ | 97 | */ |
| 99 | private ModbusTcpProperties modbusTcp; | 98 | private ModbusTcpProperties modbusTcp; |
| @@ -300,47 +299,6 @@ public class IotGatewayProperties { | @@ -300,47 +299,6 @@ public class IotGatewayProperties { | ||
| 300 | } | 299 | } |
| 301 | 300 | ||
| 302 | @Data | 301 | @Data |
| 303 | - public static class TcpProperties { | ||
| 304 | - | ||
| 305 | - /** | ||
| 306 | - * 是否开启 | ||
| 307 | - */ | ||
| 308 | - @NotNull(message = "是否开启不能为空") | ||
| 309 | - private Boolean enabled; | ||
| 310 | - | ||
| 311 | - /** | ||
| 312 | - * 服务器端口 | ||
| 313 | - */ | ||
| 314 | - private Integer port = 8091; | ||
| 315 | - | ||
| 316 | - /** | ||
| 317 | - * 心跳超时时间（毫秒） | ||
| 318 | - */ | ||
| 319 | - private Long keepAliveTimeoutMs = 30000L; | ||
| 320 | - | ||
| 321 | - /** | ||
| 322 | - * 最大连接数 | ||
| 323 | - */ | ||
| 324 | - private Integer maxConnections = 1000; | ||
| 325 | - | ||
| 326 | - /** | ||
| 327 | - * 是否启用SSL | ||
| 328 | - */ | ||
| 329 | - private Boolean sslEnabled = false; | ||
| 330 | - | ||
| 331 | - /** | ||
| 332 | - * SSL证书路径 | ||
| 333 | - */ | ||
| 334 | - private String sslCertPath; | ||
| 335 | - | ||
| 336 | - /** | ||
| 337 | - * SSL私钥路径 | ||
| 338 | - */ | ||
| 339 | - private String sslKeyPath; | ||
| 340 | - | ||
| 341 | - } | ||
| 342 | - | ||
| 343 | - @Data | ||
| 344 | public static class MqttProperties { | 302 | public static class MqttProperties { |
| 345 | 303 | ||
| 346 | /** | 304 | /** |
| @@ -368,6 +326,7 @@ public class IotGatewayProperties { | @@ -368,6 +326,7 @@ public class IotGatewayProperties { | ||
| 368 | */ | 326 | */ |
| 369 | private Integer keepAliveTimeoutSeconds = 300; | 327 | private Integer keepAliveTimeoutSeconds = 300; |
| 370 | 328 | ||
| 329 | + // NOTE：SSL 相关参数后续统一到 protocol 层级（优先级低） | ||
| 371 | /** | 330 | /** |
| 372 | * 是否启用 SSL | 331 | * 是否启用 SSL |
| 373 | */ | 332 | */ |
| @@ -386,11 +345,11 @@ public class IotGatewayProperties { | @@ -386,11 +345,11 @@ public class IotGatewayProperties { | ||
| 386 | /** | 345 | /** |
| 387 | * 密钥证书选项 | 346 | * 密钥证书选项 |
| 388 | */ | 347 | */ |
| 389 | - private io.vertx.core.net.KeyCertOptions keyCertOptions; | 348 | + private KeyCertOptions keyCertOptions; |
| 390 | /** | 349 | /** |
| 391 | * 信任选项 | 350 | * 信任选项 |
| 392 | */ | 351 | */ |
| 393 | - private io.vertx.core.net.TrustOptions trustOptions; | 352 | + private TrustOptions trustOptions; |
| 394 | /** | 353 | /** |
| 395 | * SSL 证书路径 | 354 | * SSL 证书路径 |
| 396 | */ | 355 | */ |
| @@ -412,99 +371,75 @@ public class IotGatewayProperties { | @@ -412,99 +371,75 @@ public class IotGatewayProperties { | ||
| 412 | 371 | ||
| 413 | } | 372 | } |
| 414 | 373 | ||
| 374 | + // NOTE：暂未统一为 ProtocolProperties，待协议改造完成再调整 | ||
| 375 | + /** | ||
| 376 | + * 协议实例配置 | ||
| 377 | + */ | ||
| 415 | @Data | 378 | @Data |
| 416 | - public static class MqttWsProperties { | 379 | + public static class ProtocolInstanceProperties { |
| 417 | 380 | ||
| 418 | /** | 381 | /** |
| 419 | - * 是否开启 | 382 | + * 协议实例 ID，如 "http-alink"、"tcp-binary" |
| 420 | */ | 383 | */ |
| 421 | - @NotNull(message = "是否开启不能为空") | ||
| 422 | - private Boolean enabled; | ||
| 423 | - | 384 | + @NotEmpty(message = "协议实例 ID 不能为空") |
| 385 | + private String id; | ||
| 424 | /** | 386 | /** |
| 425 | - * WebSocket 服务器端口（默认：8083） | 387 | + * 是否启用 |
| 426 | */ | 388 | */ |
| 427 | - private Integer port = 8083; | ||
| 428 | - | 389 | + @NotNull(message = "是否启用不能为空") |
| 390 | + private Boolean enabled = true; | ||
| 429 | /** | 391 | /** |
| 430 | - * WebSocket 路径（默认：/mqtt） | 392 | + * 协议类型 |
| 393 | + * | ||
| 394 | + * @see cn.iocoder.yudao.module.iot.core.enums.IotProtocolTypeEnum | ||
| 431 | */ | 395 | */ |
| 432 | - @NotEmpty(message = "WebSocket 路径不能为空") | ||
| 433 | - private String path = "/mqtt"; | ||
| 434 | - | 396 | + @NotEmpty(message = "协议类型不能为空") |
| 397 | + private String type; | ||
| 435 | /** | 398 | /** |
| 436 | - * 最大消息大小（字节） | 399 | + * 服务端口 |
| 437 | */ | 400 | */ |
| 438 | - private Integer maxMessageSize = 8192; | ||
| 439 | - | 401 | + @NotNull(message = "服务端口不能为空") |
| 402 | + private Integer port; | ||
| 440 | /** | 403 | /** |
| 441 | - * 连接超时时间（秒） | 404 | + * 序列化类型（可选） |
| 405 | + * | ||
| 406 | + * @see cn.iocoder.yudao.module.iot.core.enums.IotSerializeTypeEnum | ||
| 407 | + * | ||
| 408 | + * 为什么是可选的呢？ | ||
| 409 | + * 1. {@link IotProtocolTypeEnum#HTTP}、${@link IotProtocolTypeEnum#COAP} 协议，目前强制是 JSON 格式 | ||
| 410 | + * 2. {@link IotProtocolTypeEnum#EMQX} 协议，目前支持根据产品（设备）配置的序列化类型来解析 | ||
| 442 | */ | 411 | */ |
| 443 | - private Integer connectTimeoutSeconds = 60; | 412 | + private String serialize; |
| 444 | 413 | ||
| 445 | /** | 414 | /** |
| 446 | - * 保持连接超时时间（秒） | 415 | + * HTTP 协议配置 |
| 447 | */ | 416 | */ |
| 448 | - private Integer keepAliveTimeoutSeconds = 300; | 417 | + @Valid |
| 418 | + private IotHttpConfig http; | ||
| 449 | 419 | ||
| 450 | /** | 420 | /** |
| 451 | - * 是否启用 SSL（wss://） | 421 | + * TCP 协议配置 |
| 452 | */ | 422 | */ |
| 453 | - private Boolean sslEnabled = false; | 423 | + @Valid |
| 424 | + private IotTcpConfig tcp; | ||
| 454 | 425 | ||
| 455 | /** | 426 | /** |
| 456 | - * SSL 配置 | 427 | + * UDP 协议配置 |
| 457 | */ | 428 | */ |
| 458 | - private SslOptions sslOptions = new SslOptions(); | 429 | + @Valid |
| 430 | + private IotUdpConfig udp; | ||
| 459 | 431 | ||
| 460 | /** | 432 | /** |
| 461 | - * WebSocket 子协议（通常为 "mqtt" 或 "mqttv3.1"） | 433 | + * CoAP 协议配置 |
| 462 | */ | 434 | */ |
| 463 | - @NotEmpty(message = "WebSocket 子协议不能为空") | ||
| 464 | - private String subProtocol = "mqtt"; | 435 | + @Valid |
| 436 | + private IotCoapConfig coap; | ||
| 465 | 437 | ||
| 466 | /** | 438 | /** |
| 467 | - * 最大帧大小（字节） | 439 | + * WebSocket 协议配置 |
| 468 | */ | 440 | */ |
| 469 | - private Integer maxFrameSize = 65536; | ||
| 470 | - | ||
| 471 | - /** | ||
| 472 | - * SSL 配置选项 | ||
| 473 | - */ | ||
| 474 | - @Data | ||
| 475 | - public static class SslOptions { | ||
| 476 | - | ||
| 477 | - /** | ||
| 478 | - * 密钥证书选项 | ||
| 479 | - */ | ||
| 480 | - private io.vertx.core.net.KeyCertOptions keyCertOptions; | ||
| 481 | - | ||
| 482 | - /** | ||
| 483 | - * 信任选项 | ||
| 484 | - */ | ||
| 485 | - private io.vertx.core.net.TrustOptions trustOptions; | ||
| 486 | - | ||
| 487 | - /** | ||
| 488 | - * SSL 证书路径 | ||
| 489 | - */ | ||
| 490 | - private String certPath; | ||
| 491 | - | ||
| 492 | - /** | ||
| 493 | - * SSL 私钥路径 | ||
| 494 | - */ | ||
| 495 | - private String keyPath; | ||
| 496 | - | ||
| 497 | - /** | ||
| 498 | - * 信任存储路径 | ||
| 499 | - */ | ||
| 500 | - private String trustStorePath; | ||
| 501 | - | ||
| 502 | - /** | ||
| 503 | - * 信任存储密码 | ||
| 504 | - */ | ||
| 505 | - private String trustStorePassword; | ||
| 506 | - | ||
| 507 | - } | 441 | + @Valid |
| 442 | + private IotWebSocketConfig websocket; | ||
| 508 | 443 | ||
| 509 | } | 444 | } |
| 510 | 445 |
yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/IotProtocol.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.iot.gateway.protocol; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.iot.core.enums.IotProtocolTypeEnum; | ||
| 4 | + | ||
| 5 | +/** | ||
| 6 | + * IoT 协议接口 | ||
| 7 | + * | ||
| 8 | + * 定义传输层协议的生命周期管理 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + */ | ||
| 12 | +public interface IotProtocol { | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 获取协议实例 ID | ||
| 16 | + * | ||
| 17 | + * @return 协议实例 ID，如 "http-alink"、"tcp-binary" | ||
| 18 | + */ | ||
| 19 | + String getId(); | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 获取服务器 ID（用于消息追踪，全局唯一） | ||
| 23 | + * | ||
| 24 | + * @return 服务器 ID | ||
| 25 | + */ | ||
| 26 | + String getServerId(); | ||
| 27 | + | ||
| 28 | + /** | ||
| 29 | + * 获取协议类型 | ||
| 30 | + * | ||
| 31 | + * @return 协议类型枚举 | ||
| 32 | + */ | ||
| 33 | + IotProtocolTypeEnum getType(); | ||
| 34 | + | ||
| 35 | + /** | ||
| 36 | + * 启动协议服务 | ||
| 37 | + */ | ||
| 38 | + void start(); | ||
| 39 | + | ||
| 40 | + /** | ||
| 41 | + * 停止协议服务 | ||
| 42 | + */ | ||
| 43 | + void stop(); | ||
| 44 | + | ||
| 45 | + /** | ||
| 46 | + * 检查协议服务是否正在运行 | ||
| 47 | + * | ||
| 48 | + * @return 是否正在运行 | ||
| 49 | + */ | ||
| 50 | + boolean isRunning(); | ||
| 51 | + | ||
| 52 | +} |