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
|
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
|
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 的代码
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
|
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 |
|
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 |
|
haohao
|
341e72c0b1
|
feat: 【IoT 物联网】新增简单类型处理器配置和处理器，优化 JSON 解析问题
|
2025-09-22 23:10:26 +08:00 |
|
YunaiV
|
5ae0224b55
|
review：【iot 物联网】场景联动的缓存等
|
2025-09-20 16:15:33 +08:00 |
|
puhui999
|
c5b4968e55
|
feat: 【IoT 物联网】数据流转目的 TCP 执行器
|
2025-09-19 18:05:47 +08:00 |
|
puhui999
|
997bfe8fa1
|
feat: 【IoT 物联网】场景联动规则的数据缓存，使用 Spring Cache 操作
|
2025-09-19 14:37:25 +08:00 |
|
puhui999
|
057f924bd1
|
refactor: 【IoT 物联网】统一场景联动 ‘IoT’ 前缀
|
2025-09-19 10:59:32 +08:00 |
|
YunaiV
|
e639dbfeb7
|
review：【iot 物联网】场景联动
|
2025-09-03 23:24:22 +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
|
1cdae71d94
|
feat: 【IoT 物联网】实现场景规则定时触发器的注册，新增定时触发器处理器，支持场景规则的定时任务注册、更新、删除等生命周期管理
|
2025-09-01 17:48:20 +08:00 |
|
puhui999
|
bc0292eb61
|
feat: 【IoT 物联网】重构设备属性设置执行器，支持单设备和批量设备操作。重构设备属性设置执行器，支持单设备和批量设备操作。
|
2025-09-01 17:20:15 +08:00 |
|
puhui999
|
fe0c1bbf34
|
refactor: 【IoT 物联网】修复设备属性条件匹配器设计问题并重构属性值提取逻辑
|
2025-09-01 16:26:51 +08:00 |
|
puhui999
|
796d69b241
|
refactor: 【IoT 物联网】test BaseMockitoUnitTest → BaseMatcherTest，支持 Spring 上下文
|
2025-09-01 15:17:06 +08:00 |
|
YunaiV
|
269c1fdabf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
|
2025-08-31 10:08:12 +08:00 |
|
YunaiV
|
ecda40d300
|
fix：单测报错
|
2025-08-31 10:07:33 +08:00 |
|
YunaiV
|
040899d8c9
|
reactor：移除 @Accessors 和 @EqualsAndHashCode 注解
|
2025-08-30 17:48:16 +08:00 |
|
YunaiV
|
0d70b4dd87
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 11:16:26 +08:00 |
|
YunaiV
|
e86be20a8e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/IotDeviceUpstreamApi.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceConfigSetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceDownstreamAbstractReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertyGetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertySetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceServiceInvokeReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceEventReportReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDevicePropertyReportReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceRegisterSubReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceStateUpdateReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceTopologyAddReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceUpstreamAbstractReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotPluginInstanceHeartbeatReqDTO.java
# yudao-module-iot/yudao-module-iot-biz/pom.xml
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceUpstreamApiImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceLogController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceDownstreamReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceUpstreamReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDeviceLogPageReqVO.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/controller/admin/device/vo/device/IotDeviceSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeRecordController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeTaskController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/PluginConfigController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/vo/config/PluginConfigImportReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotRuleSceneController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgeSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/vo/IotStatisticsReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/redis/plugin/DevicePluginProcessIdRedisDAO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/plugin/IotPluginInstancesJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/rule/IotRuleSceneJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceLogMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceOnlineMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDevicePropertyMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotRuleSceneMessageHandler.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/producer/device/IotDeviceProducer.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/control/IotDeviceDownstreamService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceDownstreamServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDeviceLogServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyService.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/ota/IotOtaFirmwareServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginInstanceServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotRuleSceneServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDeviceControlAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotHttpDataSinkAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.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-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java
# yudao-server/src/main/resources/application-local.yaml
|
2025-08-30 11:02:21 +08:00 |
|
YunaiV
|
37db99e20b
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 10:57:10 +08:00 |
|
puhui999
|
2b3e2d6dbd
|
perf:【IoT 物联网】场景联动优化 review 提到的逻辑
|
2025-08-24 15:25:36 +08:00 |
|
puhui999
|
9c6c1584e7
|
perf:【IoT 物联网】优化 CurrentTimeConditionMatcher 时间条件匹配器 switch 兼容 jdk8
|
2025-08-24 12:04:08 +08:00 |
|
puhui999
|
94abcdff00
|
fix:【IoT 物联网】修复设备导入缺失上报方式的逻辑
|
2025-08-24 11:46:45 +08:00 |
|
YunaiV
|
887bf175af
|
review：【iot 物联网】场景联动相关实现
|
2025-08-19 23:49:17 +08:00 |
|
puhui999
|
7661c7165c
|
feat:【IoT 物联网】场景联动规则匹配器单元测试
|
2025-08-18 15:21:09 +08:00 |
|
puhui999
|
fb35807ebf
|
perf:【IoT 物联网】场景联动优化 review 提到的逻辑
|
2025-08-18 11:34:18 +08:00 |
|
puhui999
|
34f1a2ed71
|
perf:【IoT 物联网】场景联动规则匹配接口拆分使职责更清晰
|
2025-08-17 22:04:59 +08:00 |
|
puhui999
|
1e17e3578d
|
perf:【IoT 物联网】场景联动规则根据类型，新建 trigger、condition 包
|
2025-08-17 11:22:53 +08:00 |
|
YunaiV
|
6791c62858
|
review：【iot 物联网】场景联动相关实现
|
2025-08-16 20:37:22 +08:00 |
|
puhui999
|
a328dcf172
|
perf:【IoT 物联网】优化 IotRedisRuleAction
|
2025-08-15 17:51:26 +08:00 |
|
puhui999
|
378cf1e997
|
perf:【IoT 物联网】场景规则匹配优化
|
2025-08-15 17:35:01 +08:00 |
|
puhui999
|
93aaffddfe
|
feat:【IoT 物联网】新增场景规则触发器匹配子条件策略接口和实现
|
2025-08-15 17:27:15 +08:00 |
|
puhui999
|
cfb5230c2a
|
perf:【IoT 物联网】场景规则匹配优化
|
2025-08-15 16:22:29 +08:00 |
|
puhui999
|
49bf744b74
|
feat:【IoT 物联网】新增场景规则触发器匹配策略接口和实现
|
2025-08-15 15:02:10 +08:00 |
|
puhui999
|
0d288077d3
|
feat:【IoT 物联网】获取设备的精简信息列表时多返回一个属性：state
|
2025-08-15 14:37:41 +08:00 |
|
puhui999
|
4c051620b1
|
refactor:【IoT 物联网】重命名 RuleScene => SceneRule
|
2025-08-11 11:53:35 +08:00 |
|
puhui999
|
2e5aa3d6ec
|
style:【IoT 物联网】测试 sql 格式调整
|
2025-08-11 10:48:29 +08:00 |
|