Commit Graph

59 Commits

Author SHA1 Message Date
YunaiV
b33e44510a 【同步】jdk21 和 jdk8 的代码 2026-01-29 22:36:32 +08:00
YunaiV
9392da82b2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	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-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
2026-01-29 22:17:13 +08:00
YunaiV
edc460a2b9 fix(iot):禁用 iot 不通过的单测,避免影响编译 2026-01-29 22:08:09 +08:00
YunaiV
9be7d6fac0 review(iot):【场景联动】增加相关的 review 说明 2026-01-25 21:57:22 +08:00
芋道源码
f3878c3056 !1505 perf(iot):【场景联动】优化
Merge pull request !1505 from puhui999/feature/iot
2026-01-25 13:39:03 +00:00
puhui999
6c971631b0 Merge remote-tracking branch 'origin/feature/iot' into feature/iot 2026-01-25 17:45:56 +08:00
YunaiV
b4ce72ea7d feat(iot):【网关设备:72%】动态注册的初步实现(未测试、额外优化代码),基于 stateful-sauteeing-pillow.md 规划 2026-01-25 12:58:17 +08:00
YunaiV
38a21ad59c feat(iot):【网关设备:70%】动态注册的初步实现(未测试),基于 stateful-sauteeing-pillow.md 规划 2026-01-25 11:16:07 +08:00
YunaiV
1309be39c3 feat(iot):【网关设备:80%】整体流程跑通,并增加 IotGatewayDeviceHttpProtocolIntegrationTest、IotGatewaySubDeviceHttpProtocolIntegrationTest 单测 2026-01-24 23:00:05 +08:00
YunaiV
679b696abe feat(iot):HTTP 协议增加 IotDirectDeviceHttpProtocolIntegrationTest 测试类 2026-01-24 21:06:03 +08:00
YunaiV
268a2ad4cf feat(iot):【网关设备:68%】整体初步实现(修复少量 review agent 发现的缺陷) 2026-01-24 19:31:47 +08:00
YunaiV
bfbc352a1c feat(iot):【网关设备:65%】整体初步实现(优化部分代码) 2026-01-24 13:12:37 +08:00
YunaiV
18ed7b50be feat(iot):【网关设备:60%】整体初步实现(优化部分代码) 2026-01-24 09:15:01 +08:00
YunaiV
a2750693eb feat(iot):【网关设备:50%】整体初步实现(未测试),基于 gateway-device-topic-design.md 规划 2026-01-23 22:18:34 +08:00
YunaiV
e765099a33 refactor(iot): 删除 3 个不再使用的枚举 2026-01-23 01:07:45 +08:00
puhui999
4ad4fcf6cf perf:【iot】增强 IotDeviceServiceInvokeTriggerMatcher 参数校验 2026-01-21 22:06:02 +08:00
puhui999
5bc8a4e487 perf:【iot】添加 IotDeviceMessageUtils.notContainsIdentifier 方法 2026-01-21 21:37:39 +08:00
YunaiV
a39647efc0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
2026-01-18 18:27:48 +08:00
puhui999
a42202e7eb fix:【iot】属性上报可能同时上报多个属性,所以需要判断 trigger.getIdentifier() 是否在 message 的 params 中 2026-01-13 16:31:43 +08:00
YunaiV
8d4fba8aa7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-11-24 18:24:47 +08:00
YunaiV
e336f36cce fix:【iot】单测报错的问题 2025-11-24 18:24:02 +08:00
YunaiV
c80ffe437f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2025-10-02 18:52:15 +08:00
YunaiV
98f9e44b24 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot 2025-09-27 14:17:33 +08:00
YunaiV
455a012644 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
2025-09-20 21:32:03 +08:00
YunaiV
ef0bf372e5 fix:【iot 物联网】设备配置 CONFIG_PUSH 应该是下行 2025-09-20 12:20:08 +08:00
YunaiV
67a44fd334 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot 2025-09-03 22:42:43 +08:00
puhui999
fe0c1bbf34 refactor: 【IoT 物联网】修复设备属性条件匹配器设计问题并重构属性值提取逻辑 2025-09-01 16:26:51 +08:00
YunaiV
ecda40d300 fix:单测报错 2025-08-31 10:07:33 +08:00
YunaiV
a3bbfe6cca feat:【IoT 物联网】新版本同步 2025-08-30 11:31:23 +08:00
YunaiV
0d70b4dd87 feat:【IoT 物联网】新版本同步 2025-08-30 11:16:26 +08:00
YunaiV
0fb6f2b590 feat:【IoT 物联网】实现 OTA updateOtaRecordProgress 2025-07-04 19:30:10 +08:00
YunaiV
af1f993a4f feat:【IoT 物联网】实现 OTA 升级推送任务 IotOtaUpgradeJob 2025-07-04 00:05:38 +08:00
YunaiV
3535fda9e1 feat:【IoT 物联网】新增全局配置类 YudaoIotProperties,优化设备离线检测逻辑 2025-06-28 22:09:45 +08:00
YunaiV
0faee76ffd reactor:【IoT 物联网】清理 yudao-module-iot-api 2025-06-26 23:39:29 +08:00
YunaiV
1ad4e08cb8 reactor:【IoT 物联网】增加 IotRuleScene2DO 新的定义,对标阿里云 IoT 的「事件响应」 2025-06-23 08:52:57 +08:00
YunaiV
a17d4bb281 feat:【IoT 物联网】增加配置推送哈 2025-06-20 09:36:42 +08:00
YunaiV
f5c2ee2ae5 feat:【IoT 物联网】设备消息查询时,增加 pair 查询 2025-06-19 23:33:16 +08:00
YunaiV
05ac902dc9 feat:【IoT 物联网】增加 redis + event-bus 的实现(增加 job 清理能力) 2025-06-14 21:58:26 +08:00
YunaiV
19cf311b7e feat:【IoT 物联网】增加 redis + event-bus 的实现 2025-06-14 20:53:29 +08:00
YunaiV
d346a8d2ae feat:【IoT 物联网】完善设备消息的查询 2025-06-14 11:10:54 +08:00
YunaiV
7e49c90156 review:【IoT 物联网】MqTT 协议 2025-06-13 23:13:29 +08:00
haohao
569eef4a74 feat:【IoT 物联网】更新设备消息处理逻辑,重构 MQTT 下行消息处理器,优化主题构建和消息发布流程 2025-06-13 11:51:05 +08:00
YunaiV
6488d5bcaa review:【IoT 物联网】mqtt 协议的 review 2025-06-12 22:07:39 +08:00
haohao
a4e80d45fe fix:【IoT 物联网】修复设备属性上报和配置设置主题,优化 MQTT 消息处理逻辑,更新相关配置文件 2025-06-12 18:59:16 +08:00
YunaiV
33fed79820 reactor:【IoT 物联网】优化设备缓存的加载逻辑 2025-06-11 20:35:09 +08:00
YunaiV
66b42367cb reactor:【IoT 物联网】重新梳理下行消息的逻辑(未测试,用于相互 review 作用) 2025-06-11 09:56:59 +08:00
haohao
4ea6e08f99 feat:【IoT 物联网】新增设备信息查询功能,优化 MQTT 消息处理逻辑 2025-06-10 10:21:24 +08:00
YunaiV
120029bb17 reactor:【IoT 物联网】实现 alink 的 IotAlinkDeviceMessageCodec,并尝试接入 http 协议 2025-06-09 21:44:47 +08:00
YunaiV
40a9242691 reactor:【IoT 物联网】阅读 thingsboard 后,增加 IotDeviceMessage 优化的 TODO 2025-06-07 18:03:40 +08:00
YunaiV
643cc4cfd2 feat:【IoT 物联网】增加网关 HTTP 协议的鉴权,基于 JWT 轻量级 2025-06-03 13:22:55 +08:00