Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b489c0d870 | ||
|
|
069a4fcea3 |
@@ -0,0 +1,63 @@
|
|||||||
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from core.database import get_db
|
||||||
|
from schemas.consultant import ConsultantCreate, ConsultantUpdate, ConsultantResponse
|
||||||
|
from dao import consultant as dao_consultant
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
path="/consultants",
|
||||||
|
tags=['顾问管理模块'],summary='顾问模糊分页查询')
|
||||||
|
def read_consultants(
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
page:int=1,
|
||||||
|
page_size:int=20,
|
||||||
|
name:str|None=None,
|
||||||
|
phone:str|None=None
|
||||||
|
):
|
||||||
|
return dao_consultant.get_consultant_list(db, page, page_size, name, phone)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/consultants", response_model=ConsultantResponse,tags=['顾问管理模块'],summary='顾问增加')
|
||||||
|
def create_consultant(
|
||||||
|
obj_in: ConsultantCreate,
|
||||||
|
db: Session = Depends(get_db)
|
||||||
|
):
|
||||||
|
return dao_consultant.create_consultant(db, obj_in)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/consultants/{id}", response_model=ConsultantResponse,tags=['顾问管理模块'],summary='顾问查询')
|
||||||
|
def read_consultant(id: int, db: Session = Depends(get_db)):
|
||||||
|
res = dao_consultant.get_consultant_by_id(db, cid=id)
|
||||||
|
if res is None:
|
||||||
|
raise HTTPException(status_code=404, detail="顾问不存在或已删除")
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
@router.put(
|
||||||
|
path="/consultants/{id}",
|
||||||
|
response_model=ConsultantResponse,
|
||||||
|
tags=['顾问管理模块'],summary='顾问更新')
|
||||||
|
def update_consultant(
|
||||||
|
id: int,
|
||||||
|
obj_in: ConsultantUpdate,
|
||||||
|
db: Session = Depends(get_db)
|
||||||
|
):
|
||||||
|
# model_dump 排除为None的字段,只更新前端传过来的字段
|
||||||
|
update_dict = obj_in.model_dump(exclude_none=True)
|
||||||
|
res = dao_consultant.update_consultant(db, cid=id, update_data=update_dict)
|
||||||
|
if res is None:
|
||||||
|
raise HTTPException(status_code=404, detail="顾问不存在或已删除")
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/consultants/{id}", response_model=ConsultantResponse,tags=['顾问管理模块'],summary='顾问删除')
|
||||||
|
def delete_consultant(id: int, db: Session = Depends(get_db)):
|
||||||
|
res = dao_consultant.delete_consultant(db, cid=id)
|
||||||
|
if res is None:
|
||||||
|
raise HTTPException(status_code=404, detail="顾问不存在或已删除")
|
||||||
|
return res
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
from models.consultant import Consultant
|
||||||
|
from schemas.consultant import ConsultantCreate, ConsultantUpdate
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
def create_consultant(db:Session, obj_in: ConsultantCreate):
|
||||||
|
try:
|
||||||
|
db_obj = Consultant(**obj_in.model_dump())
|
||||||
|
db.add(db_obj)
|
||||||
|
except:
|
||||||
|
db.rollback()
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
db.commit()
|
||||||
|
return db_obj
|
||||||
|
# 查询全部可分页(过滤已删除)
|
||||||
|
def get_consultant_list(
|
||||||
|
db: Session,
|
||||||
|
page: int = 1,
|
||||||
|
page_size: int = 20,
|
||||||
|
name: str | None = None,
|
||||||
|
phone: str | None = None
|
||||||
|
):
|
||||||
|
page_size = max(1, min(page_size, 100))
|
||||||
|
skip = (page - 1) * page_size
|
||||||
|
|
||||||
|
query = db.query(Consultant).filter(Consultant.is_deleted == 0)
|
||||||
|
# 有传参数才追加过滤条件
|
||||||
|
if name:
|
||||||
|
query = query.filter(Consultant.consultant_name.like(f"%{name}%"))
|
||||||
|
if phone:
|
||||||
|
query = query.filter(Consultant.phone.like(f"%{phone}%"))
|
||||||
|
|
||||||
|
total = query.count()
|
||||||
|
items = query.offset(skip).limit(page_size).all()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"items": items,
|
||||||
|
"total": total,
|
||||||
|
"page": page,
|
||||||
|
"page_size": page_size
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 根据id查单条
|
||||||
|
def get_consultant_by_id(db:Session, cid: int):
|
||||||
|
return db.query(Consultant).filter(Consultant.id == cid, Consultant.is_deleted == 0 ).first()
|
||||||
|
|
||||||
|
|
||||||
|
# 修改
|
||||||
|
def update_consultant(db: Session, cid: int, update_data: dict):
|
||||||
|
try:
|
||||||
|
db_obj = db.query(Consultant).filter(
|
||||||
|
Consultant.id == cid,
|
||||||
|
Consultant.is_deleted == 0
|
||||||
|
).first()
|
||||||
|
if not db_obj:
|
||||||
|
return None
|
||||||
|
# 循环赋值
|
||||||
|
for k, v in update_data.items():
|
||||||
|
setattr(db_obj, k, v)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(db_obj) # 刷新从数据库拿最新数据(updated_at)
|
||||||
|
return db_obj
|
||||||
|
except Exception:
|
||||||
|
db.rollback()
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 逻辑删除(只改is_deleted=1)
|
||||||
|
def delete_consultant(db:Session, cid: int):
|
||||||
|
try:
|
||||||
|
db_obj = get_consultant_by_id(db, cid)
|
||||||
|
if not db_obj:
|
||||||
|
return None
|
||||||
|
db_obj.is_deleted = 1
|
||||||
|
except:
|
||||||
|
db.rollback()
|
||||||
|
return None
|
||||||
|
else:
|
||||||
|
db.commit()
|
||||||
|
return db_obj
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ app.middleware("http")(log_middleware)
|
|||||||
#-------------张义---------------
|
#-------------张义---------------
|
||||||
|
|
||||||
#-------------薄鑫---------------
|
#-------------薄鑫---------------
|
||||||
|
from api import consultant
|
||||||
|
app.include_router(consultant.router)
|
||||||
#-------------张昕浩---------------
|
#-------------张昕浩---------------
|
||||||
app.include_router(example_router)
|
app.include_router(example_router)
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ from sqlalchemy import *
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from core.database import Base
|
from core.database import Base
|
||||||
class Consultant(Base):
|
class Consultant(Base):
|
||||||
__tablename__ = "consultants"
|
__tablename__ = "consultant_info_detail"
|
||||||
|
|
||||||
id = Column(Integer, primary_key=True, autoincrement=True, comment="主键")
|
id = Column(Integer, primary_key=True, autoincrement=True, comment="主键")
|
||||||
consultant_no = Column(String(50), unique=True, nullable=False, comment="顾问编号")
|
consultant_no = Column(String(50), unique=True, nullable=False, comment="顾问编号")
|
||||||
consultant_name = Column(String(50), nullable=False, comment="顾问姓名")
|
consultant_name = Column(String(50), nullable=False, comment="顾问姓名")
|
||||||
phone = Column(String(11), nullable=True, comment="联系电话")
|
phone = Column(String(20), nullable=True, comment="联系电话")
|
||||||
email = Column(String(100), nullable=True, comment="邮箱")
|
email = Column(String(100), nullable=True, comment="邮箱")
|
||||||
remark = Column(String(255), nullable=True, comment="备注")
|
remark = Column(String(255), nullable=True, comment="备注")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
from pydantic import BaseModel
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
|
||||||
|
# 新增顾问 请求体
|
||||||
|
class ConsultantCreate(BaseModel):
|
||||||
|
consultant_no: str
|
||||||
|
consultant_name: str
|
||||||
|
phone: Optional[str] = None
|
||||||
|
email: Optional[str] = None
|
||||||
|
remark: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
|
# 修改顾问 请求体
|
||||||
|
class ConsultantUpdate(BaseModel):
|
||||||
|
consultant_name: Optional[str] = None
|
||||||
|
phone: Optional[str] = None
|
||||||
|
email: Optional[str] = None
|
||||||
|
remark: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
|
# 返回模型
|
||||||
|
class ConsultantResponse(BaseModel):
|
||||||
|
id: int
|
||||||
|
consultant_no: str
|
||||||
|
consultant_name: str
|
||||||
|
phone: Optional[str]
|
||||||
|
email: Optional[str]
|
||||||
|
remark: Optional[str]
|
||||||
|
created_at: datetime
|
||||||
|
updated_at: datetime
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user