XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468 Commits 4 Branches 0 Tags
73e67dd3ec0c8f29d470e1cde9b1f461b885222a
Commit Graph

468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lzh
73e67dd3ec Merge branch 'master' into feat/multi-tenant 
Resolve conflicts by accepting master changes for:
- Jenkinsfile (CI/CD release/next branch support)
- OrderCodeGenerator (Redis seq sync fix)
- OrderCodeGeneratorTest (updated tests)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-16 18:08:14 +08:00
lzh
40a1593bb0 chore: init gsd 2026-04-16 15:28:49 +08:00
lzh
6bbd49355d fix(ops): 修复工单编号生成器 Redis 序号与数据库不同步导致的重复编号问题
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
问题：Redis 重启或 key 过期后序号从 1 重新计数，与数据库已有编号冲突。

修复方案：
- 应用启动后首次生成时，从数据库查询当天最大序号校准 Redis
- 使用 Lua 脚本原子操作（校准 + 自增），避免并发竞态
- 后续调用走纯 Redis INCR，无额外数据库开销
- SQL 使用 deleted = b'0' 兼容 bit(1) 列类型
- LIKE 查询转义 % 和 _ 通配符
- 校准异常向上抛出，避免静默产生重复
- calibratedKeys 跨天自动清理旧条目

同步更新单元测试，覆盖校准、纯 Redis 自增、异常处理、SQL 转义等 13 个用例。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-13 23:19:20 +08:00
lzh
7707455a24 feat(ops): 手动派单放宽校验，支持跨区域和向忙碌设备派单 
移除 canAcceptNewOrder、区域绑定和区域匹配校验，仅保留在线检查。
手动派单由调度员人工判断合理性，自动派单的校验仍在 BadgeDeviceAreaAssignStrategy 中完成。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-13 23:18:54 +08:00
lzh
ea374d131a feat(ops): 工牌状态返回昵称字段，手动派单支持传入设备名称 
- BadgeStatusRespDTO 新增 nickname 字段，透传设备昵称
- CleanManualDispatchReqDTO 新增 assigneeName，派单时携带设备显示名
- CleanWorkOrderServiceImpl 将 assigneeName 传递给派单引擎

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-13 23:18:30 +08:00
lzh
a32a4375bc build(ci): CI/CD 支持 release/next 预发布分支
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
- Jenkinsfile: Deploy 和 Health Check 阶段支持 release/next 分支
- release/next 部署到 staging 服务器（172.17.16.7），master 部署到 prod
- 仅 master 分支推送 latest 镜像标签，避免预发布覆盖生产镜像
- GitHub Actions 添加 release/next 分支触发构建

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-13 14:44:20 +08:00
lzh
705717a5b1 Merge branch 'master' into feat/multi-tenant 
# Conflicts:
#	viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/redis/TrafficActiveOrderRedisDAO.java
#	viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/badge/BadgeDeviceStatusServiceImpl.java
#	viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/dispatch/UserDispatchStatusServiceImpl.java
 2026-04-13 14:35:27 +08:00
lzh
1ca472ea93 feat(iot): 客流计数器支持累计值上报模式（CUMULATIVE）
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
TrafficThresholdConfig 新增 reportMode 字段，支持 INCREMENTAL（默认）和 CUMULATIVE 两种模式。
累计值设备通过 Redis 存储上次值自动算差值，处理首次上报跳过和设备重启归零场景。
现有增量设备无需改配置，行为完全兼容。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 13:59:20 +08:00
lzh
c8ba3e63cb feat(iot): 新增恒华D5客流摄像机编解码器，对接拌线人数统计（type=1）
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
走通用路由，新增 IotHenghuaD5Codec 解析 form-urlencoded 格式数据，
映射 InNum/OutNum 到 people_in/people_out，业务层完全复用现有客流阈值逻辑。
IotHttpUpstreamHandler 增加恒华D5 专用简洁响应。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-07 14:59:53 +08:00
lzh
04c61a41db fix(ops): 修复 CleanBadgeServiceImpl 调用不存在的 queryAreaNameById 方法导致编译失败
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
改用 OpsBusAreaDO.getAreaName() 获取区域名称

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-07 10:45:10 +08:00
lzh
b379fc6741 feat(ops): timeline 接口 deviceId 改为可选，支持全设备查询
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
不传 deviceId 时查询该日期所有设备的轨迹记录，复用
selectByDateAndDevice 的 LIMIT 5000 安全上限。

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
 2026-04-05 15:27:05 +08:00
lzh
54f78f8066 feat(ops): 工牌实时状态增加物理位置、电量和工单信息 
BadgeRealtimeStatusRespDTO 新增物理位置（IoT 轨迹检测 RPC）、
电量（IoT 设备属性 RPC）、当前工单信息三个维度。
RPC 调用改为串行执行避免占用 ForkJoinPool 公共线程。
设备状态写入 Redis 时同步写入区域名称。

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
 2026-04-05 15:26:43 +08:00
lzh
9ffaac5c91 feat(ops): 新增轨迹统计接口 summary/hourly-trend/area-stay-stats 
- summary: KPI 卡片（作业时长、覆盖区域数、事件数、平均停留）
- hourly-trend: 按小时聚合出入趋势
- area-stay-stats: 区域停留分布（含 fullAreaName，按时长降序）
- deviceId 可选，不传则汇总全部设备
- selectByDateAndDevice 加 LIMIT 5000 安全上限
- 删除无调用方的 selectTimeline 方法
- enrichWithAreaInfo 改用 buildPaths 批量构建路径

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
 2026-04-05 15:26:14 +08:00
lzh
368fa90156 refactor(ops): 轨迹区域展示改用 fullAreaName 替代 buildingName/floorNo 
TrajectoryRespDTO 移除 buildingName、floorNo 字段，新增 fullAreaName
（完整路径如"A园区/A栋/3层/男卫"）。AreaPathBuilder 新增 buildPaths
批量方法，一次查询所有父级区域避免 N+1；正则预编译为静态常量。

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
 2026-04-05 15:25:47 +08:00
lzh
9780d6c3f7 fix(ops): 区域设备 RPC 接口添加 @TenantIgnore 解决定时任务调用时租户上下文缺失
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
IoT 模块 BeaconRegistryServiceImpl 每30分钟通过 Feign 调用 /beacons/all 接口，
因定时任务无租户上下文导致 TenantContextHolder NPE。对跨租户查询的方法添加
@TenantIgnore 注解忽略多租户过滤。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-01 09:23:27 +08:00
lzh
da00f08262 fix(environment): 对账修复后同步清理 TTS 循环播报
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
- BadgeDeviceStatusSyncJob 在修复设备工单一致性后额外停止 TTS 循环\n- 避免工单已清除但语音循环标记残留，导致设备继续播报\n- 对 TTS 清理失败增加 warn 日志，避免影响主对账流程
 2026-03-31 22:58:40 +08:00
lzh
5d46502fb9 fix(ops): 启动时恢复工单队列缓存 
- 新增 OrderQueueInitializer\n- 服务启动时调用 QueueSyncService.forceSyncAll()\n- 在 Redis 队列数据丢失或过期后，自动用 MySQL 数据回填 Sorted Set
 2026-03-31 22:58:25 +08:00
lzh
306303ab16 fix(ops): 启动时校准人员调度状态 
- 为 UserDispatchStatusService 增加基于 DB 的重建能力\n- 扫描 Redis 中的人员调度 key，按实际活跃工单数修正 status、activeOrderCount、waitingTaskCount\n- 新增启动初始化器，服务启动时自动执行一次校准，缓解事件丢失导致的 BUSY 残留
 2026-03-31 22:58:09 +08:00
lzh
1696aeb287 fix(clean): 取消工单前先清理客流活跃标记 
- 调整 CANCELLED 事件处理顺序\n- 先移除 area 级活跃工单 Redis 标记，再执行后续取消逻辑\n- 避免后续取消处理异常时遗留错误的活跃状态
 2026-03-31 22:57:44 +08:00
lzh
f0fa5f1c46 fix(clean): 补齐客流活跃工单缓存自愈逻辑 
- 为客流活跃工单 Redis 标记补充 TTL，避免长期残留\n- 创建工单前命中 Redis 时回查 DB，自动清理终态脏数据并刷新过期状态\n- 新增启动校准器，服务启动时批量清理或刷新 area 级活跃工单缓存
 2026-03-31 22:57:28 +08:00
lzh
d3eecc63ef feat(trajectory): 新增轨迹后台查询与实时位置接口 
- 新增轨迹分页、时间线、统计摘要等查询 DTO\n- 提供轨迹后台控制器，支持工牌下拉、轨迹查询、实时位置查询\n- 接入 TrajectoryStateApi 的 Feign 配置，打通 Ops 对 IoT 实时位置状态的读取
 2026-03-31 22:56:49 +08:00
lzh
bf5aa21648 feat(trajectory): 新增轨迹事件消费与落库模型 
- 新增 ops_device_trajectory 表及轨迹数据对象、Mapper\n- 消费 trajectory-enter / trajectory-leave 事件并做幂等处理\n- 落地设备进入/离开区域记录，补充停留时长与离开原因字段\n- 在服务层封装轨迹写入、关闭未离场记录等核心逻辑
 2026-03-31 22:56:18 +08:00
lzh
11dcb57ff3 feat(trajectory): 新增轨迹检测与 Beacon 注册表 2026-03-31 22:53:06 +08:00
lzh
4c3350377e build(ci): hardcode stage deploy target 2026-03-30 23:37:02 +08:00
lzh
9e2b510cb8 build(ci): limit latest image pushes to master 2026-03-30 23:23:44 +08:00
lzh
90fa54dc11 build(ci): add stage deployment pipeline and configs 2026-03-30 22:53:46 +08:00
lzh
19cb25b0ea refactor(ops): 15 个 DO 基类从 BaseDO 规范化为 TenantBaseDO
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
数据库表已有 tenant_id 列，拦截器实际可正常工作，但 DO 继承
BaseDO 语义不明确。统一改为 TenantBaseDO 以明确租户隔离语义。

ops-biz: OpsOrderDO, OpsOrderDispatchDO, OpsOrderEventDO,
  OpsOrderQueueDO, OpsBusAreaDO, OpsAreaDeviceRelationDO,
  OpsBusinessEventLogDO
environment-biz: OpsOrderCleanExtDO, OpsInspectionRecordDO,
  OpsInspectionTemplateDO, OpsInspectionRecordItemDO,
  OpsCleanerStatusDO, OpsCleanerPerformanceMonthlyDO
security-biz: OpsOrderSecurityExtDO, OpsAreaSecurityUserDO

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 11:42:09 +08:00
lzh
fef3e13ff4 fix(iot): IoT 事件发布补充 tenantId 并修复租户上下文缺陷 
7 个事件构建点补充 .tenantId(TenantContextHolder.getTenantId())：
- TrafficThresholdRuleProcessor: CleanOrderCreateEvent
- BeaconDetectionRuleProcessor: CleanOrderArriveEvent, CleanOrderAuditEvent
- SignalLossRuleProcessor: CleanOrderCompleteEvent, CleanOrderAuditEvent
- ButtonEventRuleProcessor: confirm/query 事件 Map

其他修复：
- IotSceneRuleMessageHandler: 添加 TenantUtils.execute() 包裹
- SignalLossRuleProcessor: 硬编码 execute(1L) 改为从设备动态获取
- 更新 SignalLossRuleProcessorTest 和 RssiSlidingWindowDetectorTest

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 11:41:41 +08:00
lzh
7d19e7bafa fix(ops): RocketMQ 消费者添加租户上下文防御性兜底 
6 个消费者添加 executeInTenantContext() 统一模式：当框架 Hook
未设置租户上下文时，从事件体 tenantId 字段兜底切换。
同步为 4 个事件 DTO 添加 tenantId 字段，去重 Key 迁移至
OpsRedisKeyBuilder.eventDedup() 实现租户隔离。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 11:41:14 +08:00
lzh
74f6207843 fix(ops): XML 手写 SQL 添加 tenant_id 预编译参数过滤 
yudao 官方明确 MyBatis Plus 拦截器不处理 XML 手写 SQL，需手动过滤。
将 ${} OGNL 表达式改为 #{tenantId} 预编译参数，避免 NPE 和
@TenantIgnore 不兼容问题。

- OpsOrderMapper: 8 条统计 SQL 添加 AND tenant_id = #{tenantId}
- OpsTrafficStatisticsMapper: deleteByStatHourBefore 补上 tenant_id
- OpsStatisticsServiceImpl: 10 处调用传入 tenantId 参数
- TrafficStatisticsCleanupJob: executeIgnore → @TenantJob + 显式传参

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 11:40:39 +08:00
lzh
df2d14ce26 feat(ops): 新增 OpsRedisKeyBuilder 统一管理 Redis Key 租户隔离 
新建 OpsRedisKeyBuilder 集中式工具类，所有 Ops 模块 Redis Key 统一使用
:t{tenantId} 格式实现多租户隔离。迁移以下服务的 Key 构建：

- RedisOrderQueueServiceImpl（派单队列/信息/锁）
- UserDispatchStatusServiceImpl（调度状态）
- BadgeDeviceStatusServiceImpl（工牌状态）
- TrafficActiveOrderRedisDAO（客流活跃工单）
- TtsQueueConsumer（TTS 队列/锁/循环）
- OrderCodeGenerator（工单编码序号）
- AreaDeviceServiceImpl（区域设备配置缓存）
- TrafficStatisticsPersistJob（持久化锁）
- BadgeDeviceStatusRedisDAO（IoT 侧工牌状态）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 11:36:18 +08:00
lzh
a9941a29a9 fix(ops): 状态机允许 CONFIRMED → COMPLETED，支持安保确认后直接完单
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
安保工单不需要信标到岗检测（ARRIVED），确认接单后可直接提交处理结果完成。
原规则 CONFIRMED → {ARRIVED, CANCELLED} 缺少 COMPLETED，导致安保人员完单报错：
"非法状态转换: CONFIRMED -> COMPLETED"

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 17:11:49 +08:00
lzh
edf0a3e645 fix(clean): 修复 CleanOrderEndToEndTest 编译错误
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
sendPriorityUpgradeNotification 已从 CleanOrderEventListener 移至
CleanOrderNotificationService，测试中 verify 目标未同步更新。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:38:56 +08:00
lzh
55ef659364 feat(ops): 手动派单遵循执行人忙碌状态，忙碌时入队等待 
ManualOrderActionFacade.dispatch：
- 新增 strategy.isAssigneeIdle() 判断，空闲→DISPATCHED，忙碌→QUEUED
- 不再无条件直接派发

OrderBusinessStrategy：
- 新增 isAssigneeIdle() 默认方法，默认返回 true

CleanOrderBusinessStrategy：
- isAssigneeIdle 通过 BadgeDeviceStatusService.isBusy() 判断设备忙碌

SecurityOrderBusinessStrategy：
- isAssigneeIdle 通过 UserDispatchStatusService.isIdle() 判断人员忙碌

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:37:30 +08:00
lzh
78396cf35a fix(ops): 调度状态补偿 QUEUED→终态跳过 DISPATCHED 场景
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
UserDispatchStatusEventListener：
- assigneeId 兜底从工单主表获取（forceComplete 等 payload 缺失场景）
- QUEUED→COMPLETED/CANCELLED 补偿 decrementWaitingTaskCount

UserDispatchStatusServiceImpl：
- 新增 LUA_DECREMENT_WAITING 脚本，安全递减 waitingTaskCount（不低于 0）

OpsOrderEventService：新增 8 参数 recordEvent 重载（含 operatorName）
DispatchEngineServiceAdapter：reason 文案统一为"手动派单"

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:09:30 +08:00
lzh
06d701ed5e refactor(ops): 通用控制器收口，手动动作移至条线控制器 
OpsOrderController：
- 移除 create/assign/complete/cancel 接口，避免绕过条线入口
- 保留查询、元数据维护、设备/人员驱动的状态操作（accept/pause/resume）
- 新增 business-logs 查询接口

CleanWorkOrderController：新增手动创建/派单/取消端点
SecurityOrderController：新增手动派单/取消/升级优先级端点
ErrorCodeConstants：新增安保条线错误码

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:09:07 +08:00
lzh
1d09a50643 feat(security): 安保条线接入 ManualOrderActionFacade 
SecurityOrderBusinessStrategy：
- validateDispatch: 去除区域绑定强限制，允许跨区域派单，保留姓名回填
- afterUpgradePriority: 队列分数重算

SecurityOrderServiceImpl：
- manualDispatch: resolveUser 一次查询同时拿姓名和手机号
- manualCancel/upgradePriority: 委托 facade，传入 operatorName
- 手动创建走 OrderAuditService 审计（告警触发仅写业务日志）

SecurityOrderEventListener：
- 3 处 resolveOperatorName() 改为从 event.payload.operatorName 读取
- 移除 AdminUserApi 依赖，消除重复远程调用

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:08:48 +08:00
lzh
5d91097e75 feat(clean): 保洁条线接入 ManualOrderActionFacade 
CleanOrderBusinessStrategy：
- validateDispatch: 校验设备在线/可接单/区域匹配
- afterUpgradePriority: adjustPriority + rebuildWaitingTasks + P0 通知

CleanWorkOrderServiceImpl：
- manualCreateOrder: 主表+扩展表+创建事件+审计日志
- manualDispatch/manualCancelOrder/manualCompleteOrder/upgradePriority: 委托 facade
- 所有入口统一 resolveUserName 传入 operatorName

UpgradePriorityReqDTO：新增 newPriority/operatorId 字段

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:08:20 +08:00
lzh
333329c29c refactor(clean): 抽取 CleanOrderNotificationService，解除 listener 循环依赖 
- 通知方法（语音播报/站内信）从 CleanOrderEventListener 迁移到 CleanOrderNotificationService
- CleanOrderServiceImpl 改为依赖 NotificationService 而非 Listener
- CleanOrderEventListener 补齐 QUEUED 和 PAUSED 状态的 business log
- 派单/取消日志从 handleDispatched/handleCancelled 内联改为独立 recordXxxLog 方法
- 硬编码字符串 "CLEAN" 统一替换为 WorkOrderTypeEnum.CLEAN.getType()

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:07:57 +08:00
lzh
6e5366be57 feat(ops): OrderTransitionRequest 新增 operatorName，EventPublishHandler 透传到事件 payload 
手动操作场景下 operatorName 沿 facade → request → EventPublishHandler → payload 透传，
listener 从 payload 直接读取，不再重复调用 AdminUserApi。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:07:34 +08:00
lzh
6b01c29cb1 feat(ops): 新增统一手动动作门面与审计服务 
ManualOrderActionFacade：
- 统一骨架：查单校验 → 条线前置 → 状态变更 → 条线后置
- dispatch 支持 PENDING/QUEUED 状态，用独立对象更新 assignee 避免覆盖状态机已写入的 status
- cancel/complete 走 transition() 透传 operatorName 到领域事件
- dispatch/cancel/complete 业务日志由 listener 统一记录，不重复写

OrderAuditService：
- 仅用于 create/upgradePriority（不经过状态机的手动动作）
- 只写 ops_business_event_log，不写 ops_order_event（时间轴只由状态机写）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 16:07:13 +08:00
lzh
e1d967a65e feat(ops): 新增手动操作枚举与模型定义 
引入统一手动动作基础设施：
- ManualActionTypeEnum: 手动动作类型（创建/派单/取消/完单/升级）
- OrderActionSourceEnum: 动作来源（管理后台/开放接口）
- OrderAuditPayloadKeys: 审计 payload 标准化 key
- OrderEventTypeEnum: 事件类型枚举值对齐状态机（DISPATCHED/QUEUED/CONFIRMED）
- OperatorContext: 统一操作人上下文
- *Command: 手动动作命令模型（Dispatch/Cancel/Complete/UpgradePriority）
- OrderBusinessStrategy: 条线策略接口

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 15:53:20 +08:00
lzh
4dffd21751 fix(security): 工单取消日志区分操作来源 
根据 operatorType 区分日志描述：
- SYSTEM → "系统自动取消（原因）"
- ADMIN → "管理员手动取消（原因）"
- 其他 → "安保工单已取消（原因）"

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 16:14:34 +08:00
lzh
4763caf2cc fix(ops): 移除 OrderLifecycleManager 中重复的业务日志记录 
LifecycleManager 是通用层，业务日志统一由各业务线 EventListener 负责。
移除 cancelOrder、completeOrder(ADMIN)、pauseOrder、resumeOrder 中的
eventLogRecorder 调用，避免与 SecurityOrderEventListener 等监听器产生
重复日志记录。保留 interruptOrder 的日志（P0 打断是通用机制）。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 16:09:58 +08:00
lzh
bde680c188 fix(ops): VspNotifyClient 强制 HTTP/1.1，修复 h2c 升级导致 body 丢失
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
JDK 17 HttpClient 默认尝试 HTTP/2 升级（h2c），uvicorn 不支持 h2c
协商，处理 Upgrade 请求时丢弃 body，导致 Python 端收到空 {}。
强制 HTTP_1_1 禁用 h2c 升级。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 16:04:32 +08:00
lzh
93bc1f10c3 fix(security): 规范安保工单事件日志，消除重复记录
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
修复前同一次派发产生 4 条 ORDER_DISPATCHED 日志的问题：
- 新增 ORDER_QUEUED 枚举，handleQueued 改用正确的 event_type
- handleArrived 改用 ORDER_ARRIVED（之前错用 ORDER_CONFIRM）
- 移除 onOrderCreated 中派单成功的重复日志（由状态监听统一记录）
- 移除 DispatchEngineImpl.dispatch 上的 @BusinessLog 注解（避免与
  业务层 EventListener 日志重复）
- ORDER_DISPATCHED 描述改为"工单派发"，ORDER_ARRIVED 改为"人员到达"

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 15:30:42 +08:00
lzh
bd70f3bc8a fix(ops): 修复队列脏数据导致工单永远排队无法派发 
问题：autoCompleteOrder 直接调用 orderStateMachine.forceTransition，
绕过责任链导致队列记录残留 WAITING，autoDispatchNext 反复命中脏数据
失败，人员状态永远 BUSY，新工单全部 ENQUEUE_ONLY 形成死循环。

修复：
1. SecurityOrderServiceImpl 所有状态操作统一走 OrderLifecycleManager，
   移除对 OrderStateMachine 的直接依赖
2. autoDispatchNext 增加循环遍历 + 工单状态校验，跳过并清理非 QUEUED
   的脏队列记录，增加 maxSkip=50 防护上限
3. forceComplete 返回值校验，失败时抛异常而非静默继续

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 15:30:02 +08:00
lzh
8406a80655 feat(ops): OrderLifecycleManager 支持 forceComplete 强制完成工单 
新增 forced 字段到 OrderTransitionRequest，StateTransitionHandler 根据
该字段选择 transition 或 forceTransition，确保强制状态转换也走完整
责任链（队列同步 + 事件发布），避免绕过 QueueSyncHandler 产生脏数据。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 15:29:29 +08:00
lzh
c0c9854e73 fix(security): sendCard 改为 DISPATCHED 状态变更时发送 + @EventListener
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
- 将 sendCard 从 onOrderCreated 移至 handleDispatched
- 使用 @EventListener 替代 @TransactionalEventListener(AFTER_COMMIT)
  确保 autoDispatchNext 场景的 DISPATCHED 事件也能触发
- PAUSED → DISPATCHED 恢复场景跳过重发
- 参考保洁模块 CleanOrderEventListener 的实现模式

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-26 14:06:31 +08:00
lzh
68b6f45d53 fix(ops): 修复 prod 环境 alarm-system 签名校验失败
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details 
prod profile 启动时 application-prod.yaml 为空，主 application.yaml
缺少 viewsh.signature.apps.alarm-system 配置，导致告警系统调用
SecurityOrderOpenController.createOrder 时报错：
[appId(alarm-system)] 找不到对应的 appSecret

将签名配置添加到主 application.yaml 作为所有环境的兜底。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-25 16:48:09 +08:00