Исправления

This commit is contained in:
Gitea
2022-06-16 09:38:24 +09:00
parent 21e5ad26f2
commit 8d82068324
12 changed files with 175 additions and 103 deletions

View File

@ -33,6 +33,11 @@ def exec_procedure_wo_result(session, proc_name, params, database: str = None):
session.commit()
class GeneralViewSet:
def get_changing_list(db: Session, data: schemas.ChangingListInit):
return exec_procedure(db, 'uspGetChangingList', data.dict(), 'General')
class FilterViewSet:
"""get"""
@ -45,4 +50,4 @@ class FilterViewSet:
return exec_procedure(db, 'uspGetFilterList', data.dict(), 'ISJKHRSTO')
def set_filter_list(db: Session, data: schemas.FilterSetInit):
return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict(), 'ISJKHRSTO')
return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict(), 'ISJKHRSTO')

View File

@ -2,9 +2,10 @@ from fastapi import APIRouter, Depends
from auth.login.schemas import login as models
from auth import oauth2
from databases.mssql import general
import kv.schemas as schemas
import isjkhrs.schemas as schemas
from sqlalchemy.orm import Session
from typing import List
import isjkhrs.crud as crud
router = APIRouter(dependencies= [Depends(oauth2.get_current_user) ])
@ -20,6 +21,11 @@ async def get_cities(db = Depends(general.get_db)):
async def get_city(region_id: int,db = Depends(general.get_db)):
return db.execute(f"SELECT id, name FROM General.dbo.vCities WHERE id_region = {region_id}").fetchall()
@router.get('/getBoilersByRegion/IDRegion={IDRegion}')
async def get_boiler_by_region(IDRegion: int,db = Depends(general.get_db)):
return db.execute(f"select * from General..vBoilers b "
+"inner join General..vCities c on c.id = b.id_city "
+"where c.id_region = {IDRegion}").fetchall()
@router.get('/getAddress/city-id={city_id}')
async def get_address(city_id: int, db= Depends(general.get_db)):
@ -27,4 +33,8 @@ async def get_address(city_id: int, db= Depends(general.get_db)):
@router.get('/getRegions')
async def get_region(db = Depends(general.get_db)):
return db.execute("SELECT id, name FROM General.dbo.vRegions").fetchall()
return db.execute("SELECT id, name FROM General.dbo.vRegions").fetchall()
@router.post('/get_changing_list')
async def get_filter_list(request: schemas.ChangingListInit, db: Session = Depends(general.get_db)):
return crud.GeneralViewSet.get_changing_list(db, request)

View File

@ -29,4 +29,8 @@ class FilterTypeSerializer(BaseModel):
class FilterListSerializer(BaseModel):
ID: int
Name: Optional[str] = None
IsChecked: bool
IsChecked: bool
class ChangingListInit(BaseModel):
IDGetType: int
IDRegion: int