```
feat(core): 添加多API密钥支持和配置字段 添加了api_keys、audit_api_keys、approval_api_keys等字段用于支持多个服务密钥, 新增masked_response_fields用于配置响应掩码字段,以及legacy相关配置项。 feat(core): 增强响应数据掩码功能 扩展mask_configured函数支持域名参数,实现更精确的敏感字段掩码控制, 添加自定义掩码字段配置验证器。 feat(scheduler): 添加遗留系统同步调度任务 集成遗留项目和任务同步到定时调度器中,支持通过配置启用或禁用同步功能, 并可设置不同的执行时间计划。 feat(security): 实现多服务密钥认证机制 重构API密钥验证逻辑,支持单个主密钥和多个配置密钥的混合验证模式, 增加服务密钥启用状态检查和角色映射功能。 feat(task_queue): 扩展现有队列任务处理 为日常简报和周报推送任务添加Celery异步处理支持,新增遗留项目和任务同步任务, 统一任务分发接口。 feat(business): 扩展业务模型字段 为工作任务模型添加外部系统标识和外部ID字段,为风险事件模型增加分配、解决、关闭 等相关字段,并创建风险事件操作记录表。 feat(legacy_mysql): 实现遗留任务同步功能 添加遗留任务查询和同步路由,支持从旧MySQL数据库同步任务数据到内部系统, 包括同步结果统计和运行记录。 refactor(dashboard): 更新仪表板统计数据 增加未分配风险和失败推送运行统计,在概览中显示最新的推送和同步运行记录, 完善数据序列化展示。 fix(feishu): 修复审批事件重复处理 实现审批卡片操作事件的唯一性检查,防止重复审批操作,添加事件审计日志记录。 ```
This commit is contained in:
@@ -20,6 +20,20 @@ class ReportStatus(StrEnum):
|
||||
GENERATED = "已生成"
|
||||
|
||||
|
||||
class ReportPushStatus(StrEnum):
|
||||
PENDING = "pending"
|
||||
QUEUED = "queued"
|
||||
SUCCESS = "success"
|
||||
FAILED = "failed"
|
||||
|
||||
|
||||
class ReportPushKey(StrEnum):
|
||||
ITEMS = "items"
|
||||
CODE = "code"
|
||||
TASK_ID = "task_id"
|
||||
STATUS = "status"
|
||||
|
||||
|
||||
class LifecycleSection(StrEnum):
|
||||
HEALTH = "health"
|
||||
PROJECTS = "projects"
|
||||
|
||||
@@ -58,6 +58,23 @@ def attendance_summary(
|
||||
return ReportService(db).attendance_summary(work_date)
|
||||
|
||||
|
||||
@router.get("/push-runs")
|
||||
def list_push_runs(
|
||||
status: str | None = None,
|
||||
limit: int = 100,
|
||||
db: Session = Depends(get_db),
|
||||
) -> dict:
|
||||
return {"items": ReportService(db).list_push_runs(status_filter=status, limit=limit)}
|
||||
|
||||
|
||||
@router.get("/push-runs/{code}")
|
||||
def get_push_run(
|
||||
code: str,
|
||||
db: Session = Depends(get_db),
|
||||
) -> dict:
|
||||
return ReportService(db).get_push_run(code)
|
||||
|
||||
|
||||
@router.post("/work-reports/generate")
|
||||
def generate_work_report(
|
||||
payload: WorkReportGenerateRequest,
|
||||
|
||||
@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session
|
||||
from app.core.constants import ActorValue
|
||||
from app.core.pagination import bounded_limit
|
||||
from app.core.time import utc_now
|
||||
from app.modules.audit.constants import AuditSource, AuditTargetType
|
||||
from app.modules.audit.constants import AuditAction, AuditSource, AuditTargetType
|
||||
from app.modules.audit.schemas import AuditLogCreate
|
||||
from app.modules.audit.service import AuditService
|
||||
from app.modules.business.constants import (
|
||||
@@ -27,6 +27,7 @@ from app.modules.business.models import (
|
||||
FundAccount,
|
||||
Procurement,
|
||||
Project,
|
||||
ReportPushRun,
|
||||
RiskEvent,
|
||||
Supplier,
|
||||
WorkReport,
|
||||
@@ -48,6 +49,7 @@ from app.modules.reports.constants import (
|
||||
LifecycleSection,
|
||||
MetricKey,
|
||||
ReportResponseKey,
|
||||
ReportPushStatus,
|
||||
ReportStatus,
|
||||
ReportText,
|
||||
ReportTitle,
|
||||
@@ -149,6 +151,85 @@ class ReportService:
|
||||
stmt = stmt.order_by(model.id.desc())
|
||||
return list(self.db.execute(stmt.limit(bounded_limit(limit))).scalars())
|
||||
|
||||
def create_push_run(
|
||||
self,
|
||||
report_type: str,
|
||||
title: str | None,
|
||||
receive_id: str | None,
|
||||
receive_id_type: str,
|
||||
actor: str,
|
||||
status: str = ReportPushStatus.PENDING,
|
||||
) -> ReportPushRun:
|
||||
record = ReportPushRun(
|
||||
code=_next_code("PUSH"),
|
||||
report_type=report_type,
|
||||
title=title,
|
||||
receive_id=receive_id,
|
||||
receive_id_type=receive_id_type,
|
||||
status=status,
|
||||
actor=actor,
|
||||
queued_at=utc_now(),
|
||||
)
|
||||
self.db.add(record)
|
||||
self.db.commit()
|
||||
self.db.refresh(record)
|
||||
return record
|
||||
|
||||
def update_push_run(
|
||||
self,
|
||||
code: str,
|
||||
status: str,
|
||||
task_id: str | None = None,
|
||||
provider_response: dict[str, Any] | None = None,
|
||||
error_message: str | None = None,
|
||||
sent: bool = False,
|
||||
) -> ReportPushRun:
|
||||
record = self._get_push_run(code)
|
||||
record.status = status
|
||||
if task_id is not None:
|
||||
record.task_id = task_id
|
||||
if provider_response is not None:
|
||||
record.provider_response = _json_safe(provider_response)
|
||||
record.error_message = error_message
|
||||
if sent:
|
||||
record.sent_at = utc_now()
|
||||
self.db.commit()
|
||||
self.db.refresh(record)
|
||||
return record
|
||||
|
||||
def list_push_runs(
|
||||
self,
|
||||
status_filter: str | None = None,
|
||||
limit: int = 100,
|
||||
) -> list[dict[str, Any]]:
|
||||
stmt = select(ReportPushRun).order_by(ReportPushRun.id.desc()).limit(
|
||||
bounded_limit(limit)
|
||||
)
|
||||
if status_filter:
|
||||
stmt = (
|
||||
select(ReportPushRun)
|
||||
.where(ReportPushRun.status == status_filter)
|
||||
.order_by(ReportPushRun.id.desc())
|
||||
.limit(bounded_limit(limit))
|
||||
)
|
||||
return [serialize_model(item) for item in self.db.execute(stmt).scalars()]
|
||||
|
||||
def get_push_run(self, code: str) -> dict[str, Any]:
|
||||
return serialize_model(self._get_push_run(code))
|
||||
|
||||
def _get_push_run(self, code: str) -> ReportPushRun:
|
||||
from fastapi import HTTPException, status
|
||||
|
||||
record = self.db.execute(
|
||||
select(ReportPushRun).where(ReportPushRun.code == code)
|
||||
).scalar_one_or_none()
|
||||
if record is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Report push run not found",
|
||||
)
|
||||
return record
|
||||
|
||||
def daily_brief(self) -> dict:
|
||||
project_count = self._count(Project)
|
||||
task_count = self._count(WorkTask)
|
||||
@@ -1010,9 +1091,47 @@ class ReportService:
|
||||
receive_id: str | None,
|
||||
receive_id_type: str,
|
||||
actor: str,
|
||||
push_run_code: str | None = None,
|
||||
) -> dict:
|
||||
report_type = str(report.get(ReportResponseKey.REPORT_TYPE) or report.get("type") or "report")
|
||||
title = report.get(ReportResponseKey.TITLE)
|
||||
push_run = (
|
||||
self._get_push_run(push_run_code)
|
||||
if push_run_code
|
||||
else self.create_push_run(
|
||||
report_type=report_type,
|
||||
title=title,
|
||||
receive_id=receive_id,
|
||||
receive_id_type=receive_id_type,
|
||||
actor=actor,
|
||||
)
|
||||
)
|
||||
card = FeishuService.build_basic_card(
|
||||
report[ReportResponseKey.TITLE],
|
||||
report[ReportResponseKey.LINES],
|
||||
)
|
||||
return FeishuService(self.db).send_card(card, receive_id, receive_id_type, actor)
|
||||
try:
|
||||
result = FeishuService(self.db).send_card(card, receive_id, receive_id_type, actor)
|
||||
except Exception as exc:
|
||||
self.update_push_run(
|
||||
push_run.code,
|
||||
ReportPushStatus.FAILED,
|
||||
error_message=str(exc),
|
||||
)
|
||||
raise
|
||||
self.update_push_run(
|
||||
push_run.code,
|
||||
ReportPushStatus.SUCCESS,
|
||||
provider_response=result,
|
||||
sent=True,
|
||||
)
|
||||
AuditService(self.db).log(
|
||||
AuditLogCreate(
|
||||
actor=actor,
|
||||
source=AuditSource.REPORTS,
|
||||
action=AuditAction.REPORT_PUSH,
|
||||
target_id=push_run.code,
|
||||
response_payload={"status": ReportPushStatus.SUCCESS},
|
||||
)
|
||||
)
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user