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 |
|
YunaiV
|
bec3d070f0
|
review：【iot 物联网】场景联动相关实现
|
2025-08-06 21:45:52 +08:00 |
|
puhui999
|
895b6c29a6
|
perf:【IoT 物联网】场景联动执行器和触发器的参数值类型都调整为了字符串类型
|
2025-08-05 21:29:47 +08:00 |
|
puhui999
|
dd0c1a00f3
|
feat:【IoT 物联网】新增场景联动单元测试，抽离出测试代码
|
2025-08-05 20:28:30 +08:00 |
|
puhui999
|
cf3ecd3e5b
|
refactor:【IoT 物联网】IotRuleSceneDO => IotSceneRuleDO
|
2025-08-05 11:21:28 +08:00 |
|
YunaiV
|
00bd4293f0
|
review：【iot 物联网】场景联动的逻辑
|
2025-08-04 22:13:07 +08:00 |
|
puhui999
|
3a956adc2f
|
feat:【IoT 物联网】场景联动新增状态切换接口
|
2025-08-04 15:48:01 +08:00 |
|
puhui999
|
fe1a8c0f66
|
Merge remote-tracking branch 'yudao/feature/iot' into feature/iot
|
2025-08-03 21:36:00 +08:00 |
|
puhui999
|
91ee067d27
|
perf:【IoT 物联网】场景联动代码优化
|
2025-08-03 21:35:55 +08:00 |
|
YunaiV
|
da6b970a8d
|
【同步】BOOT 和 CLOUD 的功能
|
2025-08-02 11:38:32 +08:00 |
|
YunaiV
|
53d5c394b6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceMqttConnectionParamsRespVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaFirmwareController.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/thingmodel/vo/IotThingModelRespVO.java
|
2025-08-02 10:50:12 +08:00 |
|
YunaiV
|
6b79cab09a
|
review：【iot 物联网】tcp 协议的接入
|
2025-07-28 21:28:40 +08:00 |
|
haohao
|
c9b9fc1f31
|
feat：【IoT 物联网】重构 TCP 协议处理，新增 TCP 会话和认证管理
|
2025-07-26 22:15:37 +08:00 |
|
YunaiV
|
b208f100a6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
|
2025-07-26 17:25:10 +08:00 |
|
芋道源码
|
b8889a94c7
|
!1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
|
2025-07-26 09:20:20 +00:00 |
|
YunaiV
|
8cef02613d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-07-23 22:23:10 +08:00 |
|
YunaiV
|
d128d78718
|
reactor：easy-trans 默认禁用，避免影响接口性能
|
2025-07-23 22:17:54 +08:00 |
|
YunaiV
|
a912be64ee
|
feat：【IoT 物联网】优化 IotRuleSceneTriggerTypeEnum 注释
|
2025-07-06 10:46:04 +08:00 |
|
haohao
|
def9ff11dd
|
review：【IoT 物联网】OTA 相关实现
|
2025-07-05 12:40:55 +08:00 |
|
YunaiV
|
f05470e68d
|
review：【IoT 物联网】设备 location 逻辑
|
2025-07-05 11:10:11 +08:00 |
|
芋道源码
|
66c451009a
|
!1383 feat【iot】:iot设备定位部分功能
Merge pull request !1383 from alwayssuper/feature/iot
|
2025-07-04 12:01:57 +00:00 |
|
YunaiV
|
0fb6f2b590
|
feat：【IoT 物联网】实现 OTA updateOtaRecordProgress
|
2025-07-04 19:30:10 +08:00 |
|
alwayssuper
|
428bc4a9fa
|
feat:iot设备手动上传地图功能
|
2025-07-04 17:46:52 +08:00 |
|
YunaiV
|
af1f993a4f
|
feat：【IoT 物联网】实现 OTA 升级推送任务 IotOtaUpgradeJob
|
2025-07-04 00:05:38 +08:00 |
|
YunaiV
|
14cbdad374
|
feat：【IoT 物联网】增加 OTA 相关的任务、记录取消
|
2025-07-03 19:13:04 +08:00 |
|
alwayssuper
|
2905efec28
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
|
2025-07-03 07:43:14 +08:00 |
|
YunaiV
|
e5ce195279
|
feat：【IoT 物联网】增加 OTA 相关的数据读取
|
2025-07-02 23:28:03 +08:00 |
|
YunaiV
|
ecf6a4a846
|
feat：【IoT 物联网】增加 OTA 升级任务的实现
|
2025-07-01 22:10:29 +08:00 |
|