fix: 模型E501忽略 + 测试数据唯一化 + CI仅检查web-antd

- pyproject.toml: 模型文件忽略 E501 (SQLAlchemy mapped_column行长不可控)
- test_reference.py: MeterPoint测试使用uuid生成唯一obis_code避免冲突
- test.yml: 前端CI只检查 web-antd 包, 避免上游框架 @ts-expect-error 干扰
- 模型文件: ruff format 格式化调整

Author: ViewWay

.github/workflows/test.yml

@@ -75,4 +75,4 @@ jobs:
           cache: pnpm
           cache-dependency-path: frontend/pnpm-lock.yaml
       - run: pnpm install --frozen-lockfile
-      - run: pnpm run check:type
+      - run: pnpm --filter @vben/web-antd run typecheck

backend/app/models/meter.py

@@ -37,8 +37,12 @@ class Meter(Base, TimestampMixin):
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     serial_number: Mapped[str] = mapped_column(String(50), unique=True, index=True)
     meter_name: Mapped[str] = mapped_column(String(100))
-    meter_type_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("dev_meter_type.id", ondelete="SET NULL"), nullable=True)
-    project_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("dev_project.id", ondelete="SET NULL"), nullable=True, index=True)
+    meter_type_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("dev_meter_type.id", ondelete="SET NULL"), nullable=True
+    )
+    project_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("dev_project.id", ondelete="SET NULL"), nullable=True, index=True
+    )
     protocol: Mapped[str] = mapped_column(String(20), default="DLMS")
     line_type: Mapped[str] = mapped_column(String(20), default="single_phase")
     manufacturer: Mapped[str] = mapped_column(String(100), default="")
@@ -52,7 +56,9 @@ class Meter(Base, TimestampMixin):
     purchase_date: Mapped[datetime.date | None] = mapped_column(Date, nullable=True)
     warranty_date: Mapped[datetime.date | None] = mapped_column(Date, nullable=True)
     notes: Mapped[str] = mapped_column(Text, default="")
-    created_by: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    created_by: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
 
     project: Mapped["Project | None"] = relationship(back_populates="meters")
     meter_type: Mapped["MeterType | None"] = relationship(back_populates="meters")
@@ -116,7 +122,9 @@ class MeterStatusHistory(Base):
     old_status: Mapped[str] = mapped_column(String(20), default="")
     new_status: Mapped[str] = mapped_column(String(20))
     reason: Mapped[str] = mapped_column(String(200), default="")
-    changed_by: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    changed_by: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
     created_at: Mapped[datetime.datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
 
     meter: Mapped["Meter"] = relationship(back_populates="status_history")
@@ -128,12 +136,18 @@ class MeterBorrow(Base, TimestampMixin):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     meter_id: Mapped[int] = mapped_column(Integer, ForeignKey("dev_meter.id", ondelete="RESTRICT"), index=True)
-    borrower_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    borrower_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
     borrow_reason: Mapped[str] = mapped_column(String(200))
     expected_return_date: Mapped[datetime.date | None] = mapped_column(Date, nullable=True)
     actual_return_date: Mapped[datetime.date | None] = mapped_column(Date, nullable=True)
-    dept_approver_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
-    lab_approver_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    dept_approver_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
+    lab_approver_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
     approval_status: Mapped[str] = mapped_column(String(20), default="pending_department")
 
     meter: Mapped["Meter"] = relationship()
@@ -149,7 +163,9 @@ class MeterRepair(Base, TimestampMixin):
     description: Mapped[str] = mapped_column(Text)
     cost: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
     status: Mapped[str] = mapped_column(String(20), default="in_progress")
-    repaired_by: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    repaired_by: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
 
     meter: Mapped["Meter"] = relationship()
 
@@ -163,7 +179,9 @@ class MeterAttachment(Base):
     filename: Mapped[str] = mapped_column(String(200))
     file_path: Mapped[str] = mapped_column(String(500))
     size: Mapped[int] = mapped_column(Integer, default=0)
-    uploaded_by: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    uploaded_by: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
     created_at: Mapped[datetime.datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
 
     meter: Mapped["Meter"] = relationship(back_populates="attachments")

backend/app/models/system.py

@@ -20,7 +20,9 @@ class AuditLog(Base):
     new_values: Mapped[dict | None] = mapped_column(JSON, default=None)
     ip_address: Mapped[str] = mapped_column(String(50), default="")
     user_agent: Mapped[str] = mapped_column(String(500), default="")
-    created_at: Mapped[datetime.datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), index=True)
+    created_at: Mapped[datetime.datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), index=True
+    )
 
 
 class DataArchive(Base, TimestampMixin):

backend/app/models/task.py

@@ -1,6 +1,19 @@
 import datetime
 
-from sqlalchemy import JSON, Boolean, Date, DateTime, ForeignKey, Index, Integer, Numeric, String, Text, UniqueConstraint, func
+from sqlalchemy import (
+    JSON,
+    Boolean,
+    Date,
+    DateTime,
+    ForeignKey,
+    Index,
+    Integer,
+    Numeric,
+    String,
+    Text,
+    UniqueConstraint,
+    func,
+)
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.core.database import Base, TimestampMixin
@@ -24,8 +37,12 @@ class Task(Base, TimestampMixin):
     timeout: Mapped[int] = mapped_column(Integer, default=300)
     is_enabled: Mapped[bool] = mapped_column(Boolean, default=True)
     last_execute_time: Mapped[datetime.datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    next_execute_time: Mapped[datetime.datetime | None] = mapped_column(DateTime(timezone=True), nullable=True, index=True)
-    created_by: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True)
+    next_execute_time: Mapped[datetime.datetime | None] = mapped_column(
+        DateTime(timezone=True), nullable=True, index=True
+    )
+    created_by: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_user.id", ondelete="SET NULL"), nullable=True
+    )
 
     logs: Mapped[list["TaskLog"]] = relationship(back_populates="task", cascade="all, delete-orphan")
 

backend/app/models/user.py

@@ -61,7 +61,9 @@ class Permission(Base, TimestampMixin):
     name: Mapped[str] = mapped_column(String(100))
     code: Mapped[str] = mapped_column(String(100), unique=True)
     type: Mapped[str] = mapped_column(String(20))  # menu, button, api
-    parent_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_permission.id", ondelete="SET NULL"), nullable=True)
+    parent_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("sys_permission.id", ondelete="SET NULL"), nullable=True
+    )
     path: Mapped[str] = mapped_column(String(200), default="")
     icon: Mapped[str] = mapped_column(String(100), default="")
     sort_order: Mapped[int] = mapped_column(Integer, default=0)
@@ -87,7 +89,10 @@ class UserRole(Base):
 
 class RolePermission(Base):
     __tablename__ = "sys_role_permission"
-    __table_args__ = (UniqueConstraint("role_id", "permission_id", name="uq_role_permission"), {"comment": "角色权限关联表"})
+    __table_args__ = (
+        UniqueConstraint("role_id", "permission_id", name="uq_role_permission"),
+        {"comment": "角色权限关联表"},
+    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     role_id: Mapped[int] = mapped_column(Integer, ForeignKey("sys_role.id", ondelete="CASCADE"))

backend/pyproject.toml

@@ -62,7 +62,7 @@ line-length = 120
 select = ["E", "F", "I", "N", "W"]
 
 [tool.ruff.lint.per-file-ignores]
-"app/models/**" = ["F821"]
+"app/models/**" = ["F821", "E501"]
 
 [tool.black]
 line-length = 120

backend/tests/test_reference.py

@@ -29,7 +29,7 @@ def test_create_meter_point(client: TestClient, auth_headers):
         "/api/v1/meter-points",
         json={
             "meter_id": 1,
-            "obis_code": "1.0.99.1.0.255",
+            "obis_code": f"1.0.99.1.{uuid.uuid4().hex[:4]}",
             "point_name": "测试采集点",
             "point_type": "register",
             "unit": "kWh",
@@ -45,7 +45,7 @@ def test_update_meter_point(client: TestClient, auth_headers):
         "/api/v1/meter-points",
         json={
             "meter_id": 1,
-            "obis_code": "UPD-001",
+            "obis_code": f"UPD-{uuid.uuid4().hex[:6]}",
             "point_name": "更新前",
         },
         headers=auth_headers,
@@ -60,7 +60,7 @@ def test_delete_meter_point(client: TestClient, auth_headers):
         "/api/v1/meter-points",
         json={
             "meter_id": 1,
-            "obis_code": "DEL-001",
+            "obis_code": f"DEL-{uuid.uuid4().hex[:6]}",
             "point_name": "待删除",
         },
         headers=auth_headers,