diff --git a/pyproject.toml b/pyproject.toml index ade1bd4..0d5aebe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,4 +9,5 @@ dependencies = [ "pip>=26.2.1", "pymysql>=1.2.3", "sqlalchemy>=2.0.54", + "uvicorn>=0.53.0", ] diff --git a/stu_jiuye/CURD_api.py b/stu_jiuye/CURD_api.py index 2ec7efc..c15176d 100644 --- a/stu_jiuye/CURD_api.py +++ b/stu_jiuye/CURD_api.py @@ -49,7 +49,7 @@ def add_address( add:AddRequest,db=Depends(get_db) ): d = add.model_dump() - r = add_employment_dao(o=d, db=db) + r = add_address_dao(o=d, db=db) if not r: raise HTTPException(status_code=500, detail='服务器繁忙,请稍后添加!') return EmpResponse(totals=1, data=d) diff --git a/stu_jiuye/dao.py b/stu_jiuye/dao.py index a1b1dc0..2be42c0 100644 --- a/stu_jiuye/dao.py +++ b/stu_jiuye/dao.py @@ -52,7 +52,7 @@ def update_orders_dao(id,update_data,db): db.commit() return rows -def get_orders_dao( +def get_emp_dao( # stuid, name ,db @@ -92,7 +92,8 @@ def get_orders_dao( def delete_orders_dao(id,db): try: # 删除有返回值,删除的行数 - rows = db.query(Employments).filter(Employments.id == id).delete() + rows = db.query(Employments).filter(Employments.id == id).update( is_deleted=1 ) + except Exception as e: print(f'删除失败,{e}') db.rollback() diff --git a/stu_jiuye/main.py b/stu_jiuye/main.py index d4be968..f1a1b49 100644 --- a/stu_jiuye/main.py +++ b/stu_jiuye/main.py @@ -4,7 +4,7 @@ from database import Base,engine import model app=FastAPI() Base.metadata.create_all(engine) -app.include_router(CURD,tags=['就业管理系统'],prefix='/employment') +app.include_router(CURD,tags=['就业管理系统']) diff --git a/stu_jiuye/model.py b/stu_jiuye/model.py index 7ba811b..8f0bdad 100644 --- a/stu_jiuye/model.py +++ b/stu_jiuye/model.py @@ -45,10 +45,14 @@ class Employments(Base): ,nullable=False ) company_id = Column(Integer + , ForeignKey('Company.id') , nullable=False ) - + address_id = Column(Integer + , ForeignKey('Address.id') + , nullable=False + ) salary = Column(Integer) employment_open_date = Column(DATETIME) @@ -67,12 +71,13 @@ class Employments(Base): class Company(Base): __tablename__ = 'Company' id = Column(Integer - , ForeignKey('Employments.company_id') + , primary_key=True ) compname = Column(String(50), nullable=False) address_id = Column(Integer + # , ForeignKey('Address.id') , nullable=False ) created_date = Column(DATETIME @@ -85,9 +90,9 @@ class Company(Base): is_deleted = Column(Integer, default=0) class Address(Base): - __tablename__ = 'address' + __tablename__ = 'Address' id = Column(Integer - , ForeignKey('Company.address_id') + , primary_key=True ) diff --git a/stu_jiuye/models.py b/stu_jiuye/models.py deleted file mode 100644 index 0984197..0000000 --- a/stu_jiuye/models.py +++ /dev/null @@ -1,6 +0,0 @@ - - - -class - - diff --git a/stu_jiuye/request.py b/stu_jiuye/request.py index 77f8415..2d3fe6d 100644 --- a/stu_jiuye/request.py +++ b/stu_jiuye/request.py @@ -7,13 +7,11 @@ class PostRequest(BaseModel): compname: str|None=None stuname: str|None=None stuclass: str|None=None + company_id:int|None=None address_id: int|None=None salary: int|None=None employment_open_date:date|None=None offer_date:date|None=None - created_date: datetime=Field(default_factory=datetime.now) - updated_date: datetime=Field(default_factory=datetime.now) - is_deleted: bool = False class EmpResponse(BaseModel): code: int = 200 detail: str = 'OK' @@ -22,10 +20,9 @@ class EmpResponse(BaseModel): class CompRequest(BaseModel): - compname:str|None=None - created_date: datetime = Field(default_factory=datetime.now) - updated_date: datetime = Field(default_factory=datetime.now) - is_deleted: bool = False + compname:str + address_id: int | None = None + class CompResponse(BaseModel): code: int = 200 detail: str = 'OK' @@ -33,10 +30,8 @@ class CompResponse(BaseModel): data: str | dict | tuple | list class AddRequest(BaseModel): - somewhere:str|None=None - created_date: datetime = Field(default_factory=datetime.now) - updated_date: datetime = Field(default_factory=datetime.now) - is_deleted: bool = False + somewhere:str + class AddResponse(BaseModel): code: int = 200 detail: str = 'OK' diff --git a/uv.lock b/uv.lock index 70a005f..48d6f35 100644 --- a/uv.lock +++ b/uv.lock @@ -845,6 +845,7 @@ dependencies = [ { name = "pip" }, { name = "pymysql" }, { name = "sqlalchemy" }, + { name = "uvicorn" }, ] [package.metadata] @@ -853,6 +854,7 @@ requires-dist = [ { name = "pip", specifier = ">=26.2.1" }, { name = "pymysql", specifier = ">=1.2.3" }, { name = "sqlalchemy", specifier = ">=2.0.54" }, + { name = "uvicorn", specifier = ">=0.53.0" }, ] [[package]]