refactor: 清理废弃模块并重构管理端与全端代码

- 移除所有废弃的旧首页配置模块，包括destinationHero、demand相关、HomeExperience、vehicleService等表结构与代码，新增数据库迁移删除遗留表 - 重构管理端后台布局为标准RuoYi风格，新增Sidebar、Navbar、SettingsDrawer等组件，替换旧的过渡菜单实现 - 调整移动端响应断点为768px，更新布局相关测试用例，新增布局组件测试 - 删除OperationsTools发布/重置页面，移除/tools菜单入口，清理对应的API调用与测试代码 - 重构玩法模块编辑器：替换旧的图片手动输入框为图片上传组件，移除冗余的取消按钮 - 新增线索查询offset参数支持，完善查询参数处理逻辑 - 优化rbac菜单构建逻辑，新增可见性控制参数 - 修正管家编辑器提示文案，优化系统资源编辑器表单初始化逻辑 - 清理小程序端废弃的体验推荐组件与相关测试代码 - 更新文档与种子脚本，匹配新的API契约与使用说明
2026-08-26 23:24:28 +08:00
1 parent f6c5ad589f
commit fbf2c772a8
@@ -19,20 +19,13 @@ from ..models import (
    AuditLog,
    ConciergeAdvisor,
    DetailRecord,
-    DemandFeatureCard,
-    DemandForm,
-    DemandHero,
-    DestinationHero,
    HeroSlide,
-    HomeExperience,
    HomeTeamBuilding,
    HomeWanfaRecommendation,
    HomeWildArchive,
    Lead,
    MediaAsset,
-    SiteVersion,
    VehicleOption,
-    VehicleServiceConfig,
    WanfaCategory,
    WanfaRoute,
    utc_now,
@@ -44,8 +37,6 @@ from ..schemas import (
    LeadStatus,
    LeadStatusIn,
    LoginIn,
-    HomeExperienceCreate,
-    HomeExperiencePatch,
    HomeReorderIn,
    HomeTeamBuildingCreate,
    HomeTeamBuildingPatch,
@@ -65,7 +56,7 @@ from ..schemas import (
    DetailCreate,
    DetailPatch,
 )
-from ..seed import create_media, reset_guizhou_content
+from ..seed import create_media
 from ..serializers import concierge_advisor_dict, detail_record_dict, encode_value, lead_dict, model_dict
 from .shared import site_config

@@ -90,63 +81,6 @@ SITE_CONFIG_MODULES = {
        "none_to_empty": {"image"},
        "create_defaults": {"kicker": "", "image": ""},
    },
-    "destinationHero": {
-        "model": DestinationHero,
-        "entity": "destination_hero",
-        "primary": "title",
-        "fields": {"title", "kicker", "image", "isActive", "sortOrder"},
-        "none_to_empty": set(),
-        "empty_to_none": {"kicker", "image"},
-        "create_defaults": {"kicker": None, "image": None},
-    },
-    "demandHero": {
-        "model": DemandHero,
-        "entity": "demand_hero",
-        "primary": "title",
-        "fields": {"title", "kicker", "description", "steps", "isActive", "sortOrder"},
-        "none_to_empty": set(),
-        "empty_to_none": {"kicker", "description"},
-        "create_defaults": {"kicker": None, "description": None, "steps": []},
-    },
-    "demandFeatureCards": {
-        "model": DemandFeatureCard,
-        "entity": "demand_feature_card",
-        "primary": "title",
-        "fields": {"title", "description", "isActive", "sortOrder"},
-        "none_to_empty": set(),
-        "empty_to_none": {"description"},
-        "create_defaults": {"description": None},
-    },
-    "demandForm": {
-        "model": DemandForm,
-        "entity": "demand_form",
-        "primary": "submitLabel",
-        "fields": {
-            "destinationLabel",
-            "destinationPlaceholder",
-            "phoneLabel",
-            "phonePlaceholder",
-            "noteLabel",
-            "notePlaceholder",
-            "submitLabel",
-            "chips",
-            "isActive",
-        },
-        "none_to_empty": set(),
-        "empty_to_none": {"destinationPlaceholder", "phonePlaceholder", "notePlaceholder"},
-        "create_defaults": {
-            "destinationLabel": "目的地/玩法",
-            "destinationPlaceholder": "例如：贵州、黄果树、西江苗寨",
-            "phoneLabel": "联系方式",
-            "phonePlaceholder": "手机号 / 微信号",
-            "noteLabel": "补充说明",
-            "notePlaceholder": "出行日期、人数、酒店偏好、预算范围",
-            "submitLabel": "提交出行需求",
-            "chips": ["贵州", "黄果树", "荔波小七孔", "西江苗寨", "梵净山", "万峰林"],
-        },
-        "ordered": False,
-        "singleton": True,
-    },
    "vehicleOptions": {
        "model": VehicleOption,
        "entity": "vehicle_option",
@@ -156,17 +90,6 @@ SITE_CONFIG_MODULES = {
        "empty_to_none": {"description", "image"},
        "create_defaults": {"description": None, "image": None},
    },
-    "vehicleService": {
-        "model": VehicleServiceConfig,
-        "entity": "vehicle_service_config",
-        "primary": "introTitle",
-        "fields": {"introTitle", "intro", "serviceSections", "advantages", "processSteps", "isActive"},
-        "none_to_empty": set(),
-        "empty_to_none": set(),
-        "create_defaults": {"intro": "", "serviceSections": [], "advantages": [], "processSteps": []},
-        "ordered": False,
-        "singleton": True,
-    },
 }

 def media_error(status_code: int, message: str, code: str, details: dict | None = None) -> None:
@@ -542,8 +465,6 @@ def create_home_item(db: Session, request: Request, body, model, entity: str):
    audit(db, get_actor_id(request), "create", entity, item.id, after=after)
    db.commit()
    return success_response(after, status_code=status.HTTP_201_CREATED)
-
-
 def update_home_item(db: Session, request: Request, item_id: str, body, model, entity: str, label: str, code: str):
    item = home_item_or_error(db, model, item_id, label, code)
    before = model_dict(item)
@@ -580,52 +501,6 @@ def reorder_home_items(db: Session, request: Request, body: HomeReorderIn, model
    return success_response({"items": after})


-@router.get("/home/experiences")
-def list_home_experiences(_user: AdminUser = Depends(require_admin), db: Session = Depends(get_db)):
-    return success_response({"items": [model_dict(item) for item in home_items(db, HomeExperience)]})
-
-
-@router.post("/home/experiences", status_code=status.HTTP_201_CREATED)
-def create_home_experience(
-    body: HomeExperienceCreate,
-    request: Request,
-    _user: AdminUser = Depends(require_admin),
-    db: Session = Depends(get_db),
-):
-    return create_home_item(db, request, body, HomeExperience, "home_experience")
-
-
-@router.patch("/home/experiences/reorder")
-def reorder_home_experiences(
-    body: HomeReorderIn,
-    request: Request,
-    _user: AdminUser = Depends(require_admin),
-    db: Session = Depends(get_db),
-):
-    return reorder_home_items(db, request, body, HomeExperience, "home_experience")
-
-
-@router.patch("/home/experiences/{experience_id}")
-def update_home_experience(
-    experience_id: str,
-    body: HomeExperiencePatch,
-    request: Request,
-    _user: AdminUser = Depends(require_admin),
-    db: Session = Depends(get_db),
-):
-    return update_home_item(db, request, experience_id, body, HomeExperience, "home_experience", "体验推荐", "HOME_EXPERIENCE_NOT_FOUND")
-
-
-@router.delete("/home/experiences/{experience_id}")
-def delete_home_experience(
-    experience_id: str,
-    request: Request,
-    _user: AdminUser = Depends(require_admin),
-    db: Session = Depends(get_db),
-):
-    return delete_home_item(db, request, experience_id, HomeExperience, "home_experience", "体验推荐", "HOME_EXPERIENCE_NOT_FOUND")
-
-
@router.get("/home/team-buildings")
 def list_home_team_buildings(_user: AdminUser = Depends(require_admin), db: Session = Depends(get_db)):
    return success_response({"items": [model_dict(item) for item in home_items(db, HomeTeamBuilding)]})
@@ -776,8 +651,6 @@ def create_home_wanfa_recommendation(
    audit(db, get_actor_id(request), "create", "home_wanfa_recommendation", recommendation.id, after=after)
    db.commit()
    return success_response(after, status_code=status.HTTP_201_CREATED)
-
-
@router.patch("/home/play-recommendations/reorder")
 def reorder_home_wanfa_recommendations(
    body: HomeReorderIn,
@@ -946,8 +819,6 @@ def create_detail(
    audit(db, get_actor_id(request), "create", "detail_record", detail.id, after=after)
    db.commit()
    return success_response(after, status_code=status.HTTP_201_CREATED)
-
-
@router.patch("/details/{detail_id}")
 def update_detail(
    detail_id: str,
@@ -1420,30 +1291,10 @@ def admin_site_config(_user: AdminUser = Depends(require_admin_permission("admin
                hero_slide_admin_dict(item)
                for item in scoped_items(db, HeroSlide, _user, HeroSlide.sortOrder.asc())
            ],
-            "destinationHero": [
-                model_dict(item)
-                for item in scoped_items(db, DestinationHero, _user, DestinationHero.sortOrder.asc())
-            ],
            "vehicleOptions": [
                model_dict(item)
                for item in scoped_items(db, VehicleOption, _user, VehicleOption.sortOrder.asc())
            ],
-            "vehicleService": [
-                model_dict(item)
-                for item in scoped_items(db, VehicleServiceConfig, _user, VehicleServiceConfig.createdAt.asc())
-            ],
-            "demandHero": [
-                model_dict(item)
-                for item in scoped_items(db, DemandHero, _user, DemandHero.sortOrder.asc())
-            ],
-            "demandFeatureCards": [
-                model_dict(item)
-                for item in scoped_items(db, DemandFeatureCard, _user, DemandFeatureCard.sortOrder.asc())
-            ],
-            "demandForm": [
-                model_dict(item)
-                for item in scoped_items(db, DemandForm, _user, DemandForm.createdAt.asc())
-            ],
        }
    )

@@ -1557,6 +1408,7 @@ def list_leads(
    keyword: str | None = None,
    createdFrom: str | None = None,
    createdTo: str | None = None,
+    offset: int = Query(default=0, ge=0),
    take: int = Query(default=100, ge=1, le=200),
    _user: AdminUser = Depends(require_admin_permission("admin:leads:read")),
    db: Session = Depends(get_db),
@@ -1574,6 +1426,7 @@ def list_leads(
        select(Lead)
        .options(selectinload(Lead.assignedUser))
        .order_by(Lead.createdAt.desc())
+        .offset(offset)
        .limit(query.take)
    )
    if query.status:
@@ -1595,8 +1448,24 @@ def list_leads(
                Lead.note.ilike(pattern),
            )
        ).distinct()
-    leads = db.scalars(apply_data_scope(stmt, Lead, _user, db)).all()
-    return success_response({"items": [lead_dict(lead) for lead in leads]})
+    scoped_stmt = apply_data_scope(stmt, Lead, _user, db)
+    leads = db.scalars(scoped_stmt).all()
+    count_stmt = select(func.count()).select_from(Lead)
+    if query.status:
+        count_stmt = count_stmt.where(Lead.status == query.status)
+    if query.leadType:
+        count_stmt = count_stmt.where(Lead.leadType == query.leadType)
+    if query.sourcePage:
+        count_stmt = count_stmt.where(Lead.sourcePage == query.sourcePage.strip())
+    if query.createdFrom:
+        count_stmt = count_stmt.where(Lead.createdAt >= query.createdFrom)
+    if query.createdTo:
+        count_stmt = count_stmt.where(Lead.createdAt < query.createdTo)
+    if query.keyword and query.keyword.strip():
+        pattern = f"%{query.keyword.strip()}%"
+        count_stmt = count_stmt.where(or_(Lead.phone.ilike(pattern), Lead.destination.ilike(pattern), Lead.note.ilike(pattern)))
+    total = db.scalar(apply_data_scope(count_stmt, Lead, _user, db)) or 0
+    return success_response({"items": [lead_dict(lead) for lead in leads], "total": total, "offset": offset, "take": query.take})


@router.patch("/leads/{lead_id}/status")
@@ -1646,20 +1515,3 @@ def upload_media_asset(
    return success_response(after, status_code=status.HTTP_201_CREATED)


-@router.post("/reset-guizhou-content")
-def reset_content(request: Request, _user: AdminUser = Depends(require_admin), db: Session = Depends(get_db)):
-    result = reset_guizhou_content(db)
-    audit(db, get_actor_id(request), "reset_guizhou_content", "site_content", after=result)
-    db.commit()
-    return success_response(result)
-
-
-@router.post("/publish", status_code=status.HTTP_201_CREATED)
-def publish(request: Request, _user: AdminUser = Depends(require_admin), db: Session = Depends(get_db)):
-    snapshot = site_config(db, active_only=True)
-    version = SiteVersion(title=f"manual-{utc_now().isoformat()}", status="published", snapshot=snapshot, publishedAt=utc_now())
-    db.add(version)
-    db.flush()
-    audit(db, get_actor_id(request), "publish", "site_version", version.id, model_dict(version))
-    db.commit()
-    return success_response(model_dict(version), status_code=status.HTTP_201_CREATED)
@@ -1,6 +1,6 @@
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from ..models import DemandFeatureCard, DemandForm, DemandHero, DestinationHero, HeroSlide, VehicleOption, VehicleServiceConfig
+from ..models import HeroSlide, VehicleOption
 from ..serializers import model_dict


@@ -13,32 +13,15 @@ def public_model_dict(item) -> dict:

 def site_config(db: Session, active_only: bool, include_public_extras: bool = True) -> dict:
    hero_stmt = select(HeroSlide).order_by(HeroSlide.sortOrder.asc())
-    destination_hero_stmt = select(DestinationHero).order_by(DestinationHero.sortOrder.asc())
    vehicle_stmt = select(VehicleOption).order_by(VehicleOption.sortOrder.asc())
-    demand_hero_stmt = select(DemandHero).order_by(DemandHero.sortOrder.asc())
-    demand_feature_card_stmt = select(DemandFeatureCard).order_by(DemandFeatureCard.sortOrder.asc())
-    demand_form_stmt = select(DemandForm).order_by(DemandForm.createdAt.asc())
-    vehicle_service_stmt = select(VehicleServiceConfig).order_by(VehicleServiceConfig.createdAt.asc())
    if active_only:
        hero_stmt = hero_stmt.where(HeroSlide.isActive.is_(True))
-        destination_hero_stmt = destination_hero_stmt.where(DestinationHero.isActive.is_(True))
        vehicle_stmt = vehicle_stmt.where(VehicleOption.isActive.is_(True))
-        demand_hero_stmt = demand_hero_stmt.where(DemandHero.isActive.is_(True))
-        demand_feature_card_stmt = demand_feature_card_stmt.where(DemandFeatureCard.isActive.is_(True))
-        demand_form_stmt = demand_form_stmt.where(DemandForm.isActive.is_(True))
-        vehicle_service_stmt = vehicle_service_stmt.where(VehicleServiceConfig.isActive.is_(True))

    hero_slides = db.scalars(hero_stmt).all()
-    destination_hero = db.scalars(destination_hero_stmt).all()
    result = {
        "heroSlides": [public_model_dict(item) for item in hero_slides],
-        "destinationHero": [public_model_dict(item) for item in destination_hero],
    }
    if include_public_extras:
        result["vehicleOptions"] = [public_model_dict(item) for item in db.scalars(vehicle_stmt).all()]
-        vehicle_service = db.scalars(vehicle_service_stmt).first()
-        result["vehicleService"] = public_model_dict(vehicle_service) if vehicle_service else None
-    result["demandHero"] = [public_model_dict(item) for item in db.scalars(demand_hero_stmt).all()]
-    result["demandFeatureCards"] = [public_model_dict(item) for item in db.scalars(demand_feature_card_stmt).all()]
-    result["demandForm"] = [public_model_dict(item) for item in db.scalars(demand_form_stmt).all()]
    return result
@@ -202,6 +202,27 @@ def update_user(
    return {"code": 200, "msg": "success", "data": {"id": user.id}}


+@router.delete("/users/{user_id}")
+def delete_user(
+    user_id: str,
+    request: Request,
+    current_user: AdminUser = Depends(require_permission("system:user:delete")),
+    db: Session = Depends(get_db),
+    store: AdminSessionStore = Depends(get_admin_session_store),
+):
+    user = db.get(AdminUser, user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="管理员不存在")
+    if user.id == current_user.id:
+        raise HTTPException(status_code=400, detail="不能删除当前登录账号")
+    before = model_dict(user)
+    db.delete(user)
+    _audit(db, request, "delete", "admin_user", user.id, before=before, after={"id": user.id})
+    db.commit()
+    _invalidate_permissions(store, [user.id])
+    return {"code": 200, "msg": "success", "data": {"id": user.id}}
+
+
@router.get("/roles")
 def list_roles(_user: AdminUser = Depends(require_permission("system:role:read")), db: Session = Depends(get_db)):
    roles = list(db.scalars(select(AdminRole).order_by(AdminRole.createdAt.asc())).all())
@@ -219,7 +240,7 @@ def list_roles(_user: AdminUser = Depends(require_permission("system:role:read")
@router.get("/menus")
 def list_menus(_user: AdminUser = Depends(require_permission("system:menu:read")), db: Session = Depends(get_db)):
    menus = list(db.scalars(select(AdminMenu).order_by(AdminMenu.sortOrder.asc(), AdminMenu.id.asc())).all())
-    return {"code": 200, "msg": "success", "data": {"items": [_menu_dict(menu) for menu in menus], "tree": build_menu_tree(menus)}}
+    return {"code": 200, "msg": "success", "data": {"items": [_menu_dict(menu) for menu in menus], "tree": build_menu_tree(menus, visible_only=False)}}


@router.get("/depts")
@@ -279,6 +300,28 @@ def update_role(role_id: str, body: AdminRolePatch, request: Request, _user: Adm
    return {"code": 200, "msg": "success", "data": {"id": role.id}}


+@router.delete("/roles/{role_id}")
+def delete_role(
+    role_id: str,
+    request: Request,
+    _user: AdminUser = Depends(require_permission("system:role:delete")),
+    db: Session = Depends(get_db),
+    store: AdminSessionStore = Depends(get_admin_session_store),
+):
+    role = db.get(AdminRole, role_id)
+    if not role:
+        raise HTTPException(status_code=404, detail="角色不存在")
+    if role.code == "super_admin":
+        raise HTTPException(status_code=400, detail="系统内置角色不能删除")
+    before = _role_dict(role)
+    affected_user_ids = list(db.scalars(select(AdminUserRole.userId).where(AdminUserRole.roleId == role.id)).all())
+    db.delete(role)
+    _audit(db, request, "delete", "admin_role", role.id, before=before, after={"id": role.id})
+    db.commit()
+    _invalidate_permissions(store, affected_user_ids)
+    return {"code": 200, "msg": "success", "data": {"id": role.id}}
+
+
@router.post("/menus", status_code=status.HTTP_201_CREATED)
 def create_menu(body: AdminMenuCreate, request: Request, _user: AdminUser = Depends(require_permission("system:menu:create")), db: Session = Depends(get_db)):
    if body.parentId and not db.get(AdminMenu, body.parentId):
@@ -311,6 +354,27 @@ def update_menu(menu_id: str, body: AdminMenuPatch, request: Request, _user: Adm
    return {"code": 200, "msg": "success", "data": {"id": menu.id}}


+@router.delete("/menus/{menu_id}")
+def delete_menu(
+    menu_id: str,
+    request: Request,
+    _user: AdminUser = Depends(require_permission("system:menu:delete")),
+    db: Session = Depends(get_db),
+    store: AdminSessionStore = Depends(get_admin_session_store),
+):
+    menu = db.get(AdminMenu, menu_id)
+    if not menu:
+        raise HTTPException(status_code=404, detail="菜单不存在")
+    if db.scalar(select(AdminMenu.id).where(AdminMenu.parentId == menu.id).limit(1)):
+        raise HTTPException(status_code=409, detail="该菜单存在子菜单，请先删除或移动子菜单")
+    before = _menu_dict(menu)
+    db.delete(menu)
+    _audit(db, request, "delete", "admin_menu", menu.id, before=before, after={"id": menu.id})
+    db.commit()
+    _invalidate_permissions(store)
+    return {"code": 200, "msg": "success", "data": {"id": menu.id}}
+
+
@router.post("/depts", status_code=status.HTTP_201_CREATED)
 def create_dept(body: AdminDepartmentCreate, request: Request, _user: AdminUser = Depends(require_permission("system:dept:create")), db: Session = Depends(get_db)):
    if body.parentId and not db.get(AdminDepartment, body.parentId):
@@ -337,3 +401,24 @@ def update_dept(dept_id: str, body: AdminDepartmentPatch, request: Request, _use
    db.commit()
    _invalidate_permissions(store)
    return {"code": 200, "msg": "success", "data": {"id": dept.id}}
+
+
+@router.delete("/depts/{dept_id}")
+def delete_dept(
+    dept_id: str,
+    request: Request,
+    _user: AdminUser = Depends(require_permission("system:dept:delete")),
+    db: Session = Depends(get_db),
+    store: AdminSessionStore = Depends(get_admin_session_store),
+):
+    dept = db.get(AdminDepartment, dept_id)
+    if not dept:
+        raise HTTPException(status_code=404, detail="部门不存在")
+    if db.scalar(select(AdminDepartment.id).where(AdminDepartment.parentId == dept.id).limit(1)):
+        raise HTTPException(status_code=409, detail="该部门存在子部门，请先删除或移动子部门")
+    before = _dept_dict(dept)
+    db.delete(dept)
+    _audit(db, request, "delete", "admin_department", dept.id, before=before, after={"id": dept.id})
+    db.commit()
+    _invalidate_permissions(store)
+    return {"code": 200, "msg": "success", "data": {"id": dept.id}}