Commit Graph

609 Commits

Author SHA1 Message Date
YunaiV
3a832d9fb4 feat(iot):【设备订单:50%】简化设备定位功能,支持 GeoLocation 自动更新,基于 calm-roaming-pillow.md 2026-01-20 21:41:43 +08:00
YunaiV
7646884008 【同步】jdk21 和 jdk8 的代码 2026-01-18 18:35:15 +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
YunaiV
28a30d4b79 feat:【iot】默认关闭 mqttws 协议,= = 要合并 master 一下,避免不一定大家都用 2026-01-18 18:26:31 +08:00
YunaiV
52b8e66466 feat:【iot】modbus-tcp 协议接入 100%:完善注释、完善单测 2026-01-18 11:47:56 +08:00
YunaiV
6991a2dea4 fix:【iot】coap 协议接入:testEventPost 单测的数据格式不正确 2026-01-18 11:23:23 +08:00
YunaiV
b2fef46b2c feat:【iot】udp 协议接入 50%:初始化,基于 soft-frolicking-breeze.md 实现 2026-01-18 11:19:59 +08:00
YunaiV
b270d82d75 feat:【iot】coap 协议接入 100%:,基于 rippling-noodling-wombat.d 规划 2026-01-18 09:55:34 +08:00
YunaiV
bec8cc6ef8 feat:【iot】coap 协议接入 50%:初始化整体实现,基于 pure-wishing-muffin.md 规划 2026-01-18 09:05:00 +08:00
haohao
3027caa1d2 feat:【iot】新增数据目的类型字段及其查询条件 2026-01-17 11:33:10 +08:00
haohao
832b36ac47 feat:【iot】新增数据流转规则和目的名称唯一性校验功能 2026-01-17 11:15:59 +08:00
YunaiV
5086e1225f review:【iot】“修复了一些 Iot 模块 TODO 提到的问题” 2026-01-13 23:04:28 +08:00
puhui999
9febc2b0b0 feat:【iot】executeSceneRuleAction 更新规则场景的最后触发时间 2026-01-13 16:44:24 +08:00
puhui999
a42202e7eb fix:【iot】属性上报可能同时上报多个属性,所以需要判断 trigger.getIdentifier() 是否在 message 的 params 中 2026-01-13 16:31:43 +08:00
puhui999
a7f655e1e7 fix:【iot】修复当多个协议同时启用时,出现 Bean 冲突的问题 2026-01-13 16:04:08 +08:00
puhui999
908f95875d fix:【iot】saveDeviceProperty 中,类型要转换 2026-01-13 15:49:19 +08:00
puhui999
9fbced1192 perf:【iot】IotDataSinkWebSocketConfig 常量枚举 2026-01-13 15:42:06 +08:00
puhui999
60817a6a5b perf:【iot】IotDataSinkTcpConfig 常量枚举 2026-01-13 15:38:33 +08:00
puhui999
158576740d feat:【iot】新增 WebSocket 的 {@link IotDataRuleAction} 实现类 2026-01-13 15:29:29 +08:00
YunaiV
a8ed2111f8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-dependencies/pom.xml
2026-01-05 20:30:11 +08:00
YunaiV
50a88a9ce7 review:【iot】mqtt websocket 协议 2026-01-05 20:26:16 +08:00
haohao
6fdd91d01e feat: 【IoT 物联网】新增网关设备 ID 字段到 IotDevicePageReqVO,支持网关子设备的功能 2026-01-04 12:21:54 +08:00
haohao
ca014bdba5 fix: 【IoT 物联网】修复 IotDeviceServiceImpl 中的更新支持逻辑,确保在不支持更新时抛出异常 2025-12-06 12:38:07 +08:00
YunaiV
755d5e48cc Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-11-26 18:49:11 +08:00
YunaiV
490e91d0ca fix:【iot】产品精简列表,未返回设备状态 2025-11-24 19:51:20 +08:00
YunaiV
94780ebcf3 fix:【iot】IotDeviceEventPostTriggerMatcher 应该使用 params 判断,而不是 data 2025-11-24 19:44:02 +08:00
YunaiV
27a0aca516 fix:【iot】IotSceneRuleServiceImpl 缓存处理不正确,导致 getSelf NPE 问题 2025-11-24 19:36:16 +08:00
YunaiV
d5e2f1d142 fix:【iot】spring redis 配置多了 data 层,修复 https://t.zsxq.com/51v5n 2025-11-24 19:25:20 +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
9ea8d9e4aa fix:iot-gateway-server 的 spring-boot-maven-plugin 缺少版本号,对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/ID5LU4 2025-11-24 18:04:16 +08:00
YunaiV
ec0c4eebdb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-11-24 17:03:53 +08:00
YunaiV
e7b0d4e86b fix:【iot】修复 scene_rule_ids 错误成 scene_rule_id 2025-11-21 22:14:32 +08:00
YunaiV
06b0f7e08a fix:【IoT】IotSceneRuleMessageHandler 默认关闭的问题 2025-11-21 20:31:19 +08:00
YunaiV
daf828e2db 【同步】jdk21 和 jdk8 的代码 2025-10-12 14:52:44 +08:00
YunaiV
6aba222d9e 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/action/IotDeviceServiceInvokeSceneRuleAction.java
2025-10-12 11:04:05 +08:00
haohao
68437cd830 feat:【IoT 物联网】新增 MQTT WebSocket 协议支持 2025-10-09 22:27:30 +08:00
YunaiV
283c1009a4 【同步】jdk21 和 jdk8 的代码 2025-10-02 19:06:00 +08:00
YunaiV
f6232cf433 fix:【iot 物联网】增强 jdk8 的兼容性 2025-10-02 19:03:20 +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
b167b419f4 fix:【iot 物联网】增强 jdk8 的兼容性 2025-10-02 18:51:19 +08:00
YunaiV
3f83569edc feat: 【IoT 物联网】新增简单类型处理器配置和处理器,优化 JSON 解析问题(移除,已经解决) 2025-10-01 15:51:52 +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
haohao
341e72c0b1 feat: 【IoT 物联网】新增简单类型处理器配置和处理器,优化 JSON 解析问题 2025-09-22 23:10:26 +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
5ae0224b55 review:【iot 物联网】场景联动的缓存等 2025-09-20 16:15:33 +08:00
YunaiV
ef0bf372e5 fix:【iot 物联网】设备配置 CONFIG_PUSH 应该是下行 2025-09-20 12:20:08 +08:00
YunaiV
5573ce20db fix:【iot 物联网】增强 jdk8 的兼容性 2025-09-20 12:17:46 +08:00
YunaiV
21bd03b4cd fix:【iot 物联网】增强 jdk8 的兼容性 2025-09-20 12:09:46 +08:00
puhui999
c5b4968e55 feat: 【IoT 物联网】数据流转目的 TCP 执行器 2025-09-19 18:05:47 +08:00