```
feat(ai_agent): 新增openclaw_hermes混合AI适配器 新增OpenClawHermesAdapter适配器,结合Hermes记忆功能和OpenClaw执行能力, 实现AI问答流程中的记忆召回、执行操作和记忆存储的完整闭环。 同时更新NoopAdapter提示信息,添加新的模型提供商选项。 feat(business): 新增考勤、工作报告和风险事件业务模型 新增AttendanceRecord、WorkReport、RiskEvent和LegacySyncRun四个业务模型, 扩展业务领域注册表,支持考勤管理、工作报告生成和风险事件跟踪等核心业务功能。 feat(reports): 实现考勤汇总和工作日报周报生成功能 新增attendance_summary方法用于统计每日考勤情况, 新增generate_work_report方法用于生成日/周经营报告, 包含任务完成情况、待处理事项和风险指标等综合信息。 feat(risk): 扩展风险管理API端点和供应商风险检测 新增供应商风险查询端点和风险事件管理端点, 提供风险事件列表查询和自动生成功能, 增强供应商风险评估能力。 feat(feishu): 添加考勤查询命令和风险摘要增强 集成考勤汇总查询功能到飞书命令系统, 在风险摘要中添加供应商风险和开放风险事件统计, 丰富日常经营管理信息展示。 refactor(service): 优化业务服务数据验证和类型转换 重构_model_payload函数实现数据验证和类型转换, 添加列值类型强制转换逻辑,提高API数据处理的准确性和安全性。 build(deps): 添加postgresql数据库驱动依赖 在Dockerfile中添加psycopg[binary]==3.2.3依赖包, 支持PostgreSQL数据库连接和操作。 chore(config): 更新.gitignore文件排除备份和迁移目录 在.gitignore中添加AGENTS.md.bak-*和migration/目录排除规则, 避免备份文件和本地迁移工作区被提交到版本控制系统。 ```
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Date, DateTime, Integer, Numeric, String, Text
|
||||
from sqlalchemy import JSON, Date, DateTime, Integer, Numeric, String, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.core.database import Base
|
||||
@@ -157,3 +157,78 @@ class Supplier(Base, TimestampMixin):
|
||||
price_score: Mapped[Decimal] = mapped_column(Numeric(5, 2), default=0)
|
||||
risk_level: Mapped[str] = mapped_column(String(32), default="low", index=True)
|
||||
blacklist_status: Mapped[str] = mapped_column(String(32), default="normal", index=True)
|
||||
|
||||
|
||||
class AttendanceRecord(Base, TimestampMixin):
|
||||
__tablename__ = "attendance_records"
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
code: Mapped[str] = mapped_column(String(64), unique=True, index=True)
|
||||
employee_name: Mapped[str] = mapped_column(String(128), index=True)
|
||||
employee_id: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
department: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
project_code: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
work_date: Mapped[date] = mapped_column(Date, index=True)
|
||||
check_in_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
check_out_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
status: Mapped[str] = mapped_column(String(64), default="正常", index=True)
|
||||
location: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||
source_system: Mapped[str] = mapped_column(String(64), default="internal")
|
||||
external_id: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
note: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
|
||||
|
||||
class WorkReport(Base, TimestampMixin):
|
||||
__tablename__ = "work_reports"
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
code: Mapped[str] = mapped_column(String(64), unique=True, index=True)
|
||||
report_type: Mapped[str] = mapped_column(String(32), index=True)
|
||||
title: Mapped[str] = mapped_column(String(255), index=True)
|
||||
reporter: Mapped[str] = mapped_column(String(128), default="system", index=True)
|
||||
department: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
project_code: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
period_start: Mapped[date] = mapped_column(Date, index=True)
|
||||
period_end: Mapped[date] = mapped_column(Date, index=True)
|
||||
content: Mapped[str] = mapped_column(Text)
|
||||
metrics: Mapped[dict | None] = mapped_column(JSON, nullable=True)
|
||||
risk_summary: Mapped[dict | None] = mapped_column(JSON, nullable=True)
|
||||
status: Mapped[str] = mapped_column(String(64), default="已生成", index=True)
|
||||
source_system: Mapped[str] = mapped_column(String(64), default="internal")
|
||||
|
||||
|
||||
class RiskEvent(Base, TimestampMixin):
|
||||
__tablename__ = "risk_events"
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
code: Mapped[str] = mapped_column(String(64), unique=True, index=True)
|
||||
title: Mapped[str] = mapped_column(String(255), index=True)
|
||||
risk_type: Mapped[str] = mapped_column(String(64), index=True)
|
||||
risk_level: Mapped[str] = mapped_column(String(32), default="medium", index=True)
|
||||
status: Mapped[str] = mapped_column(String(32), default="open", index=True)
|
||||
source_domain: Mapped[str] = mapped_column(String(128), index=True)
|
||||
source_record_id: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
project_code: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
owner: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
detected_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, index=True)
|
||||
due_date: Mapped[date | None] = mapped_column(Date, nullable=True, index=True)
|
||||
description: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
mitigation: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
evidence: Mapped[dict | None] = mapped_column(JSON, nullable=True)
|
||||
|
||||
|
||||
class LegacySyncRun(Base, TimestampMixin):
|
||||
__tablename__ = "legacy_sync_runs"
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
code: Mapped[str] = mapped_column(String(64), unique=True, index=True)
|
||||
domain: Mapped[str] = mapped_column(String(128), index=True)
|
||||
source_table: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
|
||||
status: Mapped[str] = mapped_column(String(32), default="running", index=True)
|
||||
started_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, index=True)
|
||||
finished_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
created_count: Mapped[int] = mapped_column(Integer, default=0)
|
||||
updated_count: Mapped[int] = mapped_column(Integer, default=0)
|
||||
skipped_count: Mapped[int] = mapped_column(Integer, default=0)
|
||||
error_message: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
note: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
|
||||
@@ -13,9 +13,25 @@ DOMAIN_MODELS: dict[str, type[DeclarativeMeta]] = {
|
||||
"standards": models.Standard,
|
||||
"performance-metrics": models.PerformanceMetric,
|
||||
"suppliers": models.Supplier,
|
||||
"attendance-records": models.AttendanceRecord,
|
||||
"work-reports": models.WorkReport,
|
||||
"risk-events": models.RiskEvent,
|
||||
"legacy-sync-runs": models.LegacySyncRun,
|
||||
}
|
||||
|
||||
LOW_RISK_DOMAINS = {"projects", "tasks", "procurements", "expenses", "policies", "standards"}
|
||||
LOW_RISK_DOMAINS = {
|
||||
"projects",
|
||||
"tasks",
|
||||
"procurements",
|
||||
"expenses",
|
||||
"policies",
|
||||
"standards",
|
||||
"suppliers",
|
||||
"attendance-records",
|
||||
"work-reports",
|
||||
"risk-events",
|
||||
"legacy-sync-runs",
|
||||
}
|
||||
HIGH_RISK_DOMAINS = {"fund-accounts", "performance-metrics"}
|
||||
|
||||
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
from decimal import Decimal, InvalidOperation
|
||||
from typing import Any
|
||||
|
||||
from fastapi import HTTPException, status
|
||||
from sqlalchemy import Date as SQLDate
|
||||
from sqlalchemy import DateTime as SQLDateTime
|
||||
from sqlalchemy import Numeric as SQLNumeric
|
||||
from sqlalchemy import Select, func, select
|
||||
from sqlalchemy.sql.schema import Column
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.modules.audit.schemas import AuditLogCreate
|
||||
@@ -27,6 +31,39 @@ def serialize_model(record: Any) -> dict[str, Any]:
|
||||
return data
|
||||
|
||||
|
||||
def _coerce_column_value(column: Column, value: Any) -> Any:
|
||||
"""Coerce API JSON values into the Python type expected by a SQLAlchemy column."""
|
||||
|
||||
if value is None:
|
||||
return None
|
||||
if isinstance(column.type, SQLDateTime) and isinstance(value, str):
|
||||
return datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||
if isinstance(column.type, SQLDate) and isinstance(value, str):
|
||||
return date.fromisoformat(value)
|
||||
if isinstance(column.type, SQLNumeric) and not isinstance(value, Decimal):
|
||||
return Decimal(str(value))
|
||||
return value
|
||||
|
||||
|
||||
def _model_payload(model: Any, data: dict[str, Any]) -> dict[str, Any]:
|
||||
"""Filter unknown keys and coerce values according to model column types."""
|
||||
|
||||
columns = {column.name: column for column in model.__table__.columns if column.name != "id"}
|
||||
payload: dict[str, Any] = {}
|
||||
for key, value in data.items():
|
||||
column = columns.get(key)
|
||||
if column is None:
|
||||
continue
|
||||
try:
|
||||
payload[key] = _coerce_column_value(column, value)
|
||||
except (ValueError, TypeError, InvalidOperation) as exc:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
||||
detail=f"Invalid value for field '{key}'",
|
||||
) from exc
|
||||
return payload
|
||||
|
||||
|
||||
class BusinessService:
|
||||
"""Manage generic CRUD operations across registered business domains."""
|
||||
|
||||
@@ -65,8 +102,7 @@ class BusinessService:
|
||||
actor: str = "api",
|
||||
) -> dict[str, Any]:
|
||||
model = get_domain_model(domain)
|
||||
allowed = {column.name for column in model.__table__.columns if column.name != "id"}
|
||||
payload = {key: value for key, value in data.items() if key in allowed}
|
||||
payload = _model_payload(model, data)
|
||||
record = model(**payload)
|
||||
self.db.add(record)
|
||||
self.db.commit()
|
||||
@@ -116,10 +152,8 @@ class BusinessService:
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Record not found",
|
||||
)
|
||||
allowed = {column.name for column in model.__table__.columns if column.name != "id"}
|
||||
for key, value in data.items():
|
||||
if key in allowed:
|
||||
setattr(record, key, value)
|
||||
for key, value in _model_payload(model, data).items():
|
||||
setattr(record, key, value)
|
||||
self.db.commit()
|
||||
self.db.refresh(record)
|
||||
result = serialize_model(record)
|
||||
|
||||
Reference in New Issue
Block a user