fix(ops): 安保工单自动完单支持全状态处理
autoCompleteOrder 根据当前状态分支处理: - PENDING → transition CANCELLED(未派单,告警已解除) - DISPATCHED/CONFIRMED/ARRIVED/PAUSED → forceTransition COMPLETED - 已终态 → 幂等跳过 falseAlarmOrder 复用 autoCompleteOrder 逻辑,额外更新扩展表误报标记。 移除 falseAlarmOrder 未使用的 operatorId 参数。 补充 4 个单元测试覆盖新增分支。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -94,7 +94,7 @@ public class SecurityOrderController {
|
||||
@Operation(summary = "误报标记", description = "将安保工单标记为误报并完成")
|
||||
@PreAuthorize("@ss.hasPermission('ops:security-order:complete')")
|
||||
public CommonResult<Boolean> falseAlarmOrder(@Valid @RequestBody SecurityOrderIdReqVO reqVO) {
|
||||
securityOrderService.falseAlarmOrder(reqVO.getOrderId(), SecurityFrameworkUtils.getLoginUserId());
|
||||
securityOrderService.falseAlarmOrder(reqVO.getOrderId());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ public class SecurityOrderOpenController {
|
||||
@ApiSignature
|
||||
@PermitAll
|
||||
public CommonResult<Boolean> falseAlarmOrder(@Valid @RequestBody SecurityOrderIdReqVO reqVO) {
|
||||
securityOrderService.falseAlarmOrder(reqVO.getOrderId(), null);
|
||||
securityOrderService.falseAlarmOrder(reqVO.getOrderId());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user