|
|
d2f2e06c58
|
test: 更新测试数据以适配配置模型变更
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
- SignalLossRuleProcessorTest: 更新测试用例
- area_device_relation_full_config.sql: 移除buttonEvent配置
- badge_device_dispatch_test_data.sql: 更新测试数据
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-01 00:57:52 +08:00 |
|
|
|
3839da2966
|
refactor(iot): 适配规则处理器使用新的配置查询方法
- ButtonEventRuleProcessor: 改为从设备 config 读取按键配置
- TrafficThresholdRuleProcessor: 使用 getConfigWrapperByDeviceId 方法
- BeaconDetectionRuleProcessor: 使用 getConfigByAreaIdAndRelationType 方法
- SignalLossRuleProcessor: 使用 getConfigByAreaIdAndRelationType 方法
- CleanRuleProcessorManager: 更新处理流程
- 添加性能优化 TODO 注释
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-01 00:57:23 +08:00 |
|
|
|
89e68eceb2
|
refactor(iot): 重构配置模型与实现双层缓存优化
- 将 buttonEvent 配置从区域级移至设备级(iot_device.config)
- 添加 getConfigWrapperByDeviceId 方法支持一对一设备查询
- 实现设备索引缓存 + 区域配置缓存的双层缓存设计
- 添加设备类型常量 DEVICE_RELATION_TYPES
- 完善 JavaDoc 注释说明配置层级划分
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-01 00:57:03 +08:00 |
|
|
|
dbf96e521a
|
fix(beacon): 修复RSSI滑动窗口检测逻辑 - 窗口大小改用max(enter/exit.windowSize) - 进入/退出检测分别使用各自的windowSize子窗口 - 到岗确认时清理RSSI窗口避免历史脏数据
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
|
2026-01-30 10:24:20 +08:00 |
|
|
|
895fcc2712
|
fix(iot): 定时任务设置租户上下文,确保RocketMQ消息正确携带租户信息
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
|
2026-01-30 09:09:08 +08:00 |
|
|
|
6ff40b61d7
|
fix(beacon): 修复信标检测重复触发到岗事件bug - determineState优先检查本地arrivedTime判断状态 - 离岗警告阶段保持IN_AREA状态不清除arrivedTime - arrivedTime仅在工单完成时由SignalLossRuleProcessor清除
|
2026-01-30 00:50:01 +08:00 |
|
|
|
13c9b6564f
|
fix(iot): 修复事件上报处理逻辑,支持 button_event 事件
1. CleanRuleProcessorManager 新增 processEventData() 方法
- 区分处理属性上报和事件上报
- 事件上报从 identifier 字段提取事件类型
2. ButtonEventRuleProcessor.parseButtonId() 支持事件上报格式
- 属性上报:value 直接是按键ID
- 事件上报:value 是 Map,包含 keyId 和 keyState 字段
Co-Authored-By: Claude (MiniMax-M2.1) <noreply@anthropic.com>
|
2026-01-29 21:28:43 +08:00 |
|
|
|
5142b38d12
|
refactor(ops): optimize badge device status management and add sync job
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
|
2026-01-29 11:35:11 +08:00 |
|
|
|
7f53debc43
|
fix(iot): 添加 AreaDeviceApi 到 Feign 客户端配置
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
修复问题:
- 启动时 Bean 创建失败:iotCleanRuleMessageHandler 注入依赖失败
- 原因:@EnableFeignClients 未包含 AreaDeviceApi
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-28 23:14:58 +08:00 |
|
|
|
d87d4dd914
|
refactor(ops,iot): 重构区域设备关联模块并添加Redis缓存
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
主要变更:
1. 将 ops_area_device_relation 表所有权移至 Ops 模块
- 新增 OpsAreaDeviceRelationDO、Mapper、Service、Controller
- 新增 AreaDeviceApi Feign 接口供其他模块调用
- ���除 IoT 模块中的旧 DO 和 Mapper
2. 实现 Redis JSON 缓存(IoT 可读)
- 统一缓存 Key: ops:area:device:{deviceId}
- 统一缓存 Key: ops:area:{areaId}:type:{relationType}
- TTL: 30分钟,空值缓存: 1分钟
3. IoT 模块通过 Feign 调用 Ops
- 优先读 Redis 缓存,未命中时调用 Ops API
- 缓存由 Ops 模块统一管理
4. 删除 IoT 模块废弃文件
- OpsAreaDeviceRelationDO.java
- OpsAreaDeviceRelationMapper.java
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-28 22:35:41 +08:00 |
|
|
|
3c92bfc02c
|
fix: 统一工单优先级类型为Integer
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
修改:
- TrafficThresholdConfig.orderPriority: String -> Integer
- CleanOrderCreateEventDTO.priority: String -> Integer
- CleanOrderCreateEventHandler: 移除Integer.parseInt调用
与数据库tinyint类型保持一致
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-28 14:12:24 +08:00 |
|
|
|
eae021c464
|
fix(iot): 修复保洁规则处理器租户上下文丢失问题
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
使用 TenantUtils.execute 包装消息处理逻辑,确保 Redis Stream
异步线程中正确传递租户上下文,避免数据库查询时报错
"TenantContextHolder 不存在租户编号"
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-27 17:01:57 +08:00 |
|
|
|
a3909a0482
|
test: Adapt tests to master branch refactoring (handlers and dispatch logic)
|
2026-01-25 18:41:00 +08:00 |
|
|
|
130048d958
|
Merge remote-tracking branch 'origin/master' into test/cleaning-coverage
|
2026-01-25 18:29:47 +08:00 |
|
|
|
373f379b01
|
refactor(iot): 移除Redis DAO,使用统一服务接口
- 删除 DeviceCurrentOrderRedisDAO
- 各 RuleProcessor 直接调用 BadgeDeviceStatusService
- 简化调用链,移除中间层
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 18:23:15 +08:00 |
|
|
|
8782a530fe
|
feat(ops): 统一语音播报模板管理
- 新建 CleanNotificationConstants 类,集中管理所有播报模板
- VoiceTemplate: 定义各种场景的播报模板常量
- VoiceBuilder: 提供构建器方法,支持参数化和标题截断
- NotifyParamsBuilder: 站内信参数构建辅助方法
- 更新 CleanOrderAuditEventHandler 查询播报为显示当前工单而非位置
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 18:21:04 +08:00 |
|
|
|
577fd25f8e
|
refactor(iot): 清理保洁配置服务中的冗余缓存设计
删除未使用的方法和缓存 key:
- getConfigByDeviceId() 方法:未被任何地方调用
- CONFIG_DEVICE_KEY_PATTERN:仅用于已删除的方法
- CONFIG_AREA_KEY_PATTERN:定义了但从未使用
- formatDeviceKey() 和 formatAreaKey():对应方法已删除
简化后的设计只保留两个缓存 key:
- CONFIG_WRAPPER_KEY_PATTERN:按 deviceId 缓存完整配置
- CONFIG_AREA_TYPE_KEY_PATTERN:按 areaId + relationType 缓存
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 09:49:29 +08:00 |
|
|
|
0ee7611a7d
|
feat(iot): 优化保洁工单配置缓存服务
- 新增空值缓存机制,防止缓存穿透
- 新增区域+类型配置查询缓存
- 统一缓存 TTL 为 5 分钟,空值缓存 60 秒
- 新增缓存失效方法 evictAreaCache
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 09:38:36 +08:00 |
|
|
|
0a5fe13e68
|
refactor(iot): 移除属性保存中的同步规则处理
规则处理已迁移到独立消息订阅者 IotCleanRuleMessageHandler
通过订阅同一消息总线的 Topic 异步处理,不再阻塞属性保存主流程
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 09:38:28 +08:00 |
|
|
|
2a2cfb9030
|
fix(iot): 修复 TrafficThresholdRuleProcessor 编译错误
- 将 StringRedisTemplate 声明移至类顶部字段区域
- 修复变量使用顺序导致的编译错误
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 09:38:20 +08:00 |
|
|
|
22d7a31194
|
feat(iot): 新增保洁规则消息订阅者,实现规则处理异步解耦
新增 IotCleanRuleMessageHandler 订阅设备消息总线,与属性保存主流程解耦
新增 CleanRuleProcessorManager 统一管理保洁规则处理器
优化点:
- 独立消费组,不阻塞属性保存主流程
- 与场景规则引擎架构一致,便于维护
- 支持 PROPERTY_POST 和 EVENT_POST 两种消息类型
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-25 09:38:12 +08:00 |
|
|
|
382e4d6ae2
|
test: Fix master branch test configs and add comprehensive tests for Badge Device Dispatch and Signal Loss logic
|
2026-01-23 14:29:46 +08:00 |
|
|
|
bb1ee0be1d
|
Merge branch 'master' of http://124.221.55.225:3000/XW-AIOT/aiot-platform-cloud into test/cleaning-coverage
|
2026-01-23 13:57:49 +08:00 |
|
|
|
ebbefe7980
|
Merge branch 'test/cleaning-coverage'
|
2026-01-23 13:49:00 +08:00 |
|
|
|
fffada3761
|
feat(iot): 调整信标和信号丢失处理器以支持配置拆分
配置已按设备类型拆分(BADGE/BEACON/TRAFFIC_COUNTER 各自存储),
工牌设备需要从区域的 BEACON 设备获取信标配置。
- BeaconDetectionRuleProcessor: 从区域 BEACON 设备获取 beaconPresence 配置
- SignalLossRuleProcessor: 从区域 BEACON 设备获取信标配置用于超时检测
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-23 13:47:04 +08:00 |
|
|
|
06ca3070cd
|
feat(iot): 支持按区域和设备类型查询配置
新增 getConfigByAreaIdAndRelationType 方法,用于跨设备获取配置场景。
例如:工牌设备需要获取该区域的信标配置。
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-23 13:46:49 +08:00 |
|
|
|
5bb3ff6979
|
test: Add comprehensive tests for dispatch strategies and IoT signal processing, fix SignalLossRuleProcessor bug
|
2026-01-23 11:44:49 +08:00 |
|
|
|
fa619710ef
|
refactor(iot): 优化事件发布机制并修复状态值解析
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
1. IntegrationEventPublisher 只保留设备状态变更事件发布
- 注释掉 publishPropertyChanged 和 publishEventOccurred 接口
- RocketMQIntegrationEventPublisher 对应实现改为注释
2. IotDevicePropertyServiceImpl 属性消息发布暂停
- 注释掉 saveDeviceProperty 中的 publishPropertyMessage 调用
- 注释掉 publishToIntegrationEventBus 中的实际发布逻辑
3. IotDeviceMessageServiceImpl 新增状态值解析兼容
- 新增 parseStateValue 方法支持整数和字符串格式状态值
- 支持 "online"/"offline" 字符串解析
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-21 22:56:13 +08:00 |
|
|
|
110cfc8cf8
|
fix(iot-server): 消费者优先判断skipReply字段
- handleUpstreamDeviceMessage 优先检查 skipReply 字段
- 协议层已处理回复的消息跳过业务层回复逻辑
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-21 22:12:56 +08:00 |
|
|
|
e6406f7c6e
|
fix(iot): 修复RssiSlidingWindowDetector-component注解
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
|
2026-01-21 15:04:51 +08:00 |
|
|
|
1d056a5e7a
|
feat(iot): 信号丢失提醒 & 工单完成检测排除P0
|
2026-01-19 10:52:21 +08:00 |
|
|
|
64928f5a3f
|
feat(ops): add-iot-clean-order-integration阶段3-客流计数器重置
|
2026-01-17 17:44:30 +08:00 |
|
|
|
6933a22e1c
|
feat(ops): add-iot-clean-order-integration阶段2-ButtonEventRuleProcessor补充
|
2026-01-17 17:27:29 +08:00 |
|
|
|
de427b15ab
|
feat(iot): add-iot-clean-order-integration阶段二-规则处理器
|
2026-01-17 15:54:12 +08:00 |
|
|
|
471cd45162
|
feat(iot): add-iot-clean-order-integration阶段一-基础设施
|
2026-01-17 15:20:57 +08:00 |
|
|
|
7b3e028bea
|
feat(iot): 实现设备 API 接口及更新网关处理逻辑
|
2026-01-15 16:14:25 +08:00 |
|
|
|
2a1cdfc4dc
|
Merge remote-tracking branch 'origin/master' into merge-temp
|
2026-01-14 22:49:28 +08:00 |
|
|
|
244c8aee96
|
fix: iot-server暂时禁用rabbitMQ
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
|
2026-01-14 17:23:21 +08:00 |
|
|
|
3194ea7f10
|
fix: iot-server添加admin监控
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
|
2026-01-14 17:12:55 +08:00 |
|
|
|
01f900a6fe
|
fix: 修改xxl-job地址
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
|
2026-01-14 15:43:41 +08:00 |
|
|
|
d04b2e91e1
|
fix: Jenkins修复7-tdengine从 TAOS-WS 改为 TAOS-RS
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
|
2026-01-14 13:25:52 +08:00 |
|
|
|
4162783263
|
fix: Jenkins修复3-iot-server时序库缺失
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
|
2026-01-14 12:02:30 +08:00 |
|
|
|
52017f7e23
|
fix: Jenkins修复3-prod缺失配置添加
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
|
2026-01-14 11:43:47 +08:00 |
|
|
|
a20ef566d0
|
fix: Jenkins修复3-修改nacos配置
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
|
2026-01-14 11:12:28 +08:00 |
|
|
|
efe05ad624
|
refactor: 重构配置管理,移除.env依赖,使用docker-compose环境变量+Nacos配置中心
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
- 更新所有application-prod.yaml,将环境变量占位符替换为硬编码默认值
- 重写docker-compose.core.yml,使用Spring Boot环境变量命名规范
- 修复Jenkins pipeline中的getContainerName方法调用错误
- 配置优先级:Nacos配置中心 > Docker环境变量 > application-prod.yaml
变更文件:
- viewsh-gateway/src/main/resources/application-prod.yaml
- viewsh-module-system-server/src/main/resources/application-prod.yaml
- viewsh-module-infra-server/src/main/resources/application-prod.yaml
- viewsh-module-iot-server/src/main/resources/application-prod.yaml
- viewsh-module-iot-gateway/src/main/resources/application-prod.yaml
- docker-compose.core.yml
- Jenkinsfile
|
2026-01-13 23:50:37 +08:00 |
|
|
|
2b9c1aa7d8
|
feat: 添加所有核心服务的生产环境配置文件
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
- 创建 application-prod.yaml 支持环境变量占位符
- 支持 Docker Compose 环境变量注入
- 支持 Nacos 配置中心覆盖
- 涵盖 5 个核心服务: gateway, system, infra, iot-server, iot-gateway
|
2026-01-13 11:52:27 +08:00 |
|
|
|
4f293436ef
|
chore: system、infra、iot、server配置文件调整 - nacos使用124.221.55.225
|
2025-12-31 14:21:48 +08:00 |
|
|
|
ba22a96e44
|
chore: system、infra、iot、server配置文件调整v1.0
|
2025-12-31 14:09:36 +08:00 |
|
|
|
98f5f031a2
|
chore: IOT模块单体版本 - 代码合并
|
2025-12-31 13:32:26 +08:00 |
|
|
|
8ccfafe2bb
|
first commit
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
|
2025-12-31 11:48:19 +08:00 |
|