修改bug
This commit is contained in:
parent
e6a189c0ac
commit
e68e0776bc
|
@ -21,6 +21,8 @@ def daily_add(db: Session, data):
|
||||||
def daily_change(db: Session, item_id, data):
|
def daily_change(db: Session, item_id, data):
|
||||||
db.query(Daily).filter_by(id=item_id).update(data)
|
db.query(Daily).filter_by(id=item_id).update(data)
|
||||||
db.commit()
|
db.commit()
|
||||||
|
item=db.query(Daily).filter_by(id=item_id).first()
|
||||||
|
return item
|
||||||
|
|
||||||
|
|
||||||
def daily_delete(db: Session, item_id):
|
def daily_delete(db: Session, item_id):
|
||||||
|
|
|
@ -26,7 +26,10 @@ router = APIRouter(
|
||||||
@router.post("/daily_get", response_model=DailySchemas.DailyGetRes, summary="获取日报")
|
@router.post("/daily_get", response_model=DailySchemas.DailyGetRes, summary="获取日报")
|
||||||
def daily_get(req: DailySchemas.DailyGetReq, db: Session = Depends(get_db),
|
def daily_get(req: DailySchemas.DailyGetReq, db: Session = Depends(get_db),
|
||||||
token_data: TokenData = Depends(registered_depend)):
|
token_data: TokenData = Depends(registered_depend)):
|
||||||
return DailySchemas.DailyGetRes(**DailyCrud.daily_get(db, req.id).to_dict())
|
item = DailyCrud.daily_get(db, req.id)
|
||||||
|
if not item:
|
||||||
|
raise HTTPException(detail="未取到信息")
|
||||||
|
return DailySchemas.DailyGetRes(**item.to_dict())
|
||||||
|
|
||||||
|
|
||||||
@router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报")
|
@router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报")
|
||||||
|
@ -48,7 +51,8 @@ def daily_change(req: DailySchemas.DailyChangeReq, db: Session = Depends(get_db)
|
||||||
# 本部门填报权限
|
# 本部门填报权限
|
||||||
if str(req.department) not in token_data.department and not check_auth(token_data.auth_data, ['7']):
|
if str(req.department) not in token_data.department and not check_auth(token_data.auth_data, ['7']):
|
||||||
raise HTTPException(detail="没有本部门填报权限", status_code=305)
|
raise HTTPException(detail="没有本部门填报权限", status_code=305)
|
||||||
return DailyCrud.daily_change(db, req.id, req.dict())
|
new_daily = DailyCrud.daily_change(db, req.id, req.dict())
|
||||||
|
return DailySchemas.DailyChangeRes(**new_daily.to_dict())
|
||||||
|
|
||||||
|
|
||||||
@router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报")
|
@router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报")
|
||||||
|
@ -76,6 +80,6 @@ def daily_query(req: DailySchemas.DailyQuery, db: Session = Depends(get_db),
|
||||||
|
|
||||||
|
|
||||||
@router.post("/daily_delete", response_model=DailySchemas.DailyDeleteRes, summary="删除日报")
|
@router.post("/daily_delete", response_model=DailySchemas.DailyDeleteRes, summary="删除日报")
|
||||||
def daily_delete(req: DailySchemas.DailyDeleteReq,db: Session = Depends(get_db),):
|
def daily_delete(req: DailySchemas.DailyDeleteReq, db: Session = Depends(get_db), ):
|
||||||
DailyCrud.daily_delete(db,req.id)
|
DailyCrud.daily_delete(db, req.id)
|
||||||
return DailySchemas.DailyDeleteRes(msg="删除成功", state=1)
|
return DailySchemas.DailyDeleteRes(msg="删除成功", state=1)
|
||||||
|
|
|
@ -75,19 +75,20 @@ def change_user_info(req: UserSchemas.ChangeUserInfoReq, token_data: TokenData =
|
||||||
@router.post('/bind_email', tags=["用户接口"], summary='邮箱登录')
|
@router.post('/bind_email', tags=["用户接口"], summary='邮箱登录')
|
||||||
def bind_email(req: UserSchemas.BindEmailReq,
|
def bind_email(req: UserSchemas.BindEmailReq,
|
||||||
db: Session = Depends(get_db)):
|
db: Session = Depends(get_db)):
|
||||||
checked = EmailVerifyCode.check_code(req.email, req.email_code, EmailVerifyType.change)
|
email= req.email.replace(" ","")
|
||||||
|
checked = EmailVerifyCode.check_code(email, req.email_code, EmailVerifyType.change)
|
||||||
if not checked:
|
if not checked:
|
||||||
raise HTTPException(detail="邮箱验证码错误", status_code=303)
|
raise HTTPException(detail="邮箱验证码错误", status_code=303)
|
||||||
user = UserCrud.get_user_info(db, req.email)
|
user = UserCrud.get_user_info(db, email)
|
||||||
# if user:
|
# if user:
|
||||||
# # 邮箱已绑定
|
# # 邮箱已绑定
|
||||||
# if user.email and user.email != req.email:
|
# if user.email and user.email != req.email:
|
||||||
# raise HTTPException(detail="该微信已绑定邮箱,请使用该微信号绑定的邮箱登录", status_code=403)
|
# raise HTTPException(detail="该微信已绑定邮箱,请使用该微信号绑定的邮箱登录", status_code=403)
|
||||||
if not user:
|
if not user:
|
||||||
user = UserCrud.create_user(db, req.email)
|
user = UserCrud.create_user(db, email)
|
||||||
if not user.registered:
|
if not user.registered:
|
||||||
UserCrud.update_user_info_from_email(db, req.email)
|
UserCrud.update_user_info_from_email(db, email)
|
||||||
auth_data = AuthCrud.get_user_auth(db, req.email)
|
auth_data = AuthCrud.get_user_auth(db, email)
|
||||||
user_data = user.to_dict()
|
user_data = user.to_dict()
|
||||||
user_data["auth_data"] = auth_data
|
user_data["auth_data"] = auth_data
|
||||||
token_data = TokenData(**user_data)
|
token_data = TokenData(**user_data)
|
||||||
|
|
|
@ -15,17 +15,17 @@ class DailyTypeEnum(Enum):
|
||||||
|
|
||||||
|
|
||||||
class DailyInfo(BaseModel):
|
class DailyInfo(BaseModel):
|
||||||
id: int
|
id: Optional[int]
|
||||||
type: DailyTypeEnum
|
type: Optional[DailyTypeEnum]
|
||||||
fill_user: str
|
fill_user: Optional[str]
|
||||||
title:str
|
title:Optional[str]
|
||||||
department: int
|
department: Optional[int]
|
||||||
user: UserInfo
|
user: Optional[UserInfo]
|
||||||
post: int
|
post: Optional[int]
|
||||||
content: str
|
content: Optional[str]
|
||||||
daily_time: datetime
|
daily_time: Optional[datetime]
|
||||||
create_time: datetime
|
create_time: Optional[datetime]
|
||||||
update_time: datetime
|
update_time: Optional[datetime]
|
||||||
|
|
||||||
|
|
||||||
class DailyGetReq(BaseModel):
|
class DailyGetReq(BaseModel):
|
||||||
|
@ -41,7 +41,6 @@ class DailyChangeReq(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
type: Optional[DailyTypeEnum]
|
type: Optional[DailyTypeEnum]
|
||||||
fill_user: Optional[str]
|
fill_user: Optional[str]
|
||||||
name: Optional[str]
|
|
||||||
title:Optional[str]
|
title:Optional[str]
|
||||||
department: Optional[int]
|
department: Optional[int]
|
||||||
post: Optional[int]
|
post: Optional[int]
|
||||||
|
|
Loading…
Reference in New Issue