From 78be2591578031aad958eeee3593eecbe769f955 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 6 May 2022 16:07:26 +0900 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kv/__pycache__/crud.cpython-39.pyc | Bin 20689 -> 21062 bytes kv/__pycache__/isapi.cpython-39.pyc | Bin 2126 -> 2171 bytes kv/crud.py | 18 ++++++++++++------ kv/isapi.py | 4 ++-- .../__pycache__/reference.cpython-39.pyc | Bin 8089 -> 8112 bytes kv/routers/reference.py | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/kv/__pycache__/crud.cpython-39.pyc b/kv/__pycache__/crud.cpython-39.pyc index 18ac7459fb2a3969b03adacb5584d513e4d00de0..faceef27d751eb6140c5cdb2dc88ed2e983e2364 100644 GIT binary patch delta 6521 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 Pw`5uzmJ~|{KH2{T*L<_y delta 6043 zcma)Adr+L!73c1YSC;2)Se7LOc6n?93rKh+0RoZ-39p1aCW&@k_WKf+?6Ppb4-f*0 zO=Go*QSq3n@kNZ9qO}@dRnsQ5I*!v$o%%;#Upv!wwEyUIYNu0YI#b)8bC-mb?4}Fz z{q}z6+;h*l=bU@)z267VvX9TR44>JYmV|%%(}xG&Yq^whh3z%r>i|BA1L1JeOw#R^ z+jO&RRwpIRC(W=K-Fe-dZp<){w7{lQHXW^*Z8=&yyTCNlp)e2m)CIk!^VDdD5no8w zj1#`#xV(_WGhgf0H83M5WpGMgWXi(^x53MLt79cLwKQcc=v7o67&*){i6qRfE5q&#R9oEvnWO8rh8 zPDR>NaX7zEd(mD&#_0niDz7JH%>tQ}UpKXA5(%0BG5@E@XB?mj^6b3RI}xk4&Ai~x~t?dLo1ib`( z1V#icV>4RWE^%2=x<)X&cf-S$GPVaUTU@L5Qm}zO#<`t9`1&?#Ee#t9Jkk_;$oM2So!>V&Ec?~H0eNyj zRy~Jh)ho%WFA!8XWdnR{u7xjG=6m8N3HH)5NG>!!67UB`eL-acTJjE5d;>ZE#~RA? zDY%*!cHZ1-^6Cuiv`zee|1XC>c9 z`YEWI9;3GL*Yu*3$^?RoQNll(AN@NFO!q^>P1D zU_yQY{HxB?C+eK^knf0$J6f2JgkKWgX(}qsTJ9YP6&17%qs>~{fXc%oVKL1kNQgPj z05YD#N1>Ekh&<(0r$%MvGT4eoYeeFZOJmApk<4V6ACY-P=nA}5e5XCW5Nt0gWbeXI$%o}; zVa<`S#Hs#jhF&}=xKo6Y5p!!uYc1?^x;$gpbnAI3{v1dhSAye*173AdOOt%6&pS3Q z^Qq|Bz=G4k-iHsIZMe{8J+08`%C^T1uNCH9R`zqa+x1vOqETI;_$Fj8m;G{JRQ*VV z^>C>iXAk{zX)gN}{Im2(O*wiw2MeG|uTSY$I1?KX+-ft4myz81m!8t*qOZgyLloWgf;Vpa= zIw8@5%Fv7dJJ@ki6CgHetW#fXlu zrQlc>$&N<2XI70PFqvtRHC@au~aSbNa=vTH(KGrO(ytco!38(G(JIaCjsq5 z+)OZq;5Nmya)$U(I}(4A2-O5j>p~bz=bB1*u6}O2*b&9(G%$ah;E5Y0v>dW}l!qq* z(zPx17BZfSUJ^@V(@tUj*@of9M29p-52-XjL*q=XFqWne(}--6P^J`B4k_MAtR#5T z``b1rn3{an^Ra|rrpd`#VZNysYO0-(*_8#DU%6m?tmxT&J>9eVrBv9a>9L^oJ@kyrVFi!>ax)6A}iH<*r!C4 z4MA`FqlpD9t)q|yFXy}P2F`AIH1ahieqn*`tp)5Z7}`2lpFrrv znI89hj=3f-0w=+n&mz zV6OK>b4V|((9u`tsEL1x=z_Vv+~ZHtlxff6PZP`&JVS5+ zK{NHYi-XOxM7c=tJ%SerzEAKH!4C*tCU}M562YqkuMxaX@CLyT3Fv0Q-$u}K+NBAo z=+CmgLvQBAOz7$q8h->m{VvlL;uOIpn*~nyuP|MuR|kC5Z8M2ZKY`2r1@?EvV7q-h zaOhC~;x;PSKZP&)ZJzg#9aSF1E+Ka6bI2&6Xm(&j9KZ0i4GlZjW}EOBM$h6uKL_g0 zo}Cg6R7_Ap;3ViII7mSEb8&UzbZg;skmqv*bjstT>jonrXIHtoJ|j1yJYz*h4nFz+ E12?n*lK=n! diff --git a/kv/__pycache__/isapi.cpython-39.pyc b/kv/__pycache__/isapi.cpython-39.pyc index cec1059cdd9f76c8a1d42d3b98a8b3ebaa6e433f..b7c5008204a821835c4d4d830570a446f10725e6 100644 GIT binary patch delta 364 zcmX>n@LPa4k(ZZ?0SL~zXC>KhVsxltvQ_`Z2t>A; zOt)A{DhpC?F&CE{|&R)b`Bn8s1J^2E=tg0bM6JKUta!zSVYJ5>X(0xTnx}lZ`ao7L=W&UK` delta 318 zcmew@a87_Xk(ZZ?0SG*nr6GxPI` z*lS&M8evjW5av Ox~~XHH`Ee)4jTY-OIL~j diff --git a/kv/crud.py b/kv/crud.py index 0ba7f0c..1477176 100644 --- a/kv/crud.py +++ b/kv/crud.py @@ -5,7 +5,7 @@ from kv import schemas def exec_procedure(session, proc_name, params, database: str = None): - sql_params = ",".join(["@{0}={1}".format(name, value) + sql_params = ",".join([f"@{name}='{value}'" if type(value) in [str] else f"@{name}={value}" for name, value in params.items()]) dbstr = "" if database: @@ -20,7 +20,7 @@ def exec_procedure(session, proc_name, params, database: str = None): def exec_procedure_wo_result(session, proc_name, params, database: str = None): - sql_params = ",".join(["@{0}={1}".format(name, value) + sql_params = ",".join([f"@{name}='{value}'" if type(value) in [str] else f"@{name}={value}" for name, value in params.items()]) dbstr = "" if database: @@ -113,7 +113,8 @@ class ObjectViewSet: """get""" def get_details(db: Session, IDObject: str = None): - return exec_procedure(db, 'uspGetPersonalAccountServices', {'IDObject': IDObject}) + print(IDObject) + return exec_procedure(db, 'uspGetObjectDetails', {'IDObject': IDObject}) def get_municipals(db: Session, IDCity: int = None): return exec_procedure(db, 'uspGetObjectMunicipals', {'IDCity': IDCity}) @@ -254,7 +255,7 @@ class AccrualViewSet: """get""" def get_municipals(db: Session, data: schemas.AccountInit): - return exec_procedure(db, 'uspCalculateAccrued', **data) + return exec_procedure(db, 'uspCalculateAccrued', data.dict()) """post""" @@ -295,7 +296,8 @@ class ReferenceViewSet: return db.query(tb).with_entities(tb.c["ID"]).all() def get_objects(db: Session, data: schemas.CityInit): - return exec_procedure(db, 'uspGetObjects', **data) + + return exec_procedure(db, 'uspGetObjects', data.dict()) def get_services(db: Session): tb = get_table('uslugi', 'spr') @@ -320,7 +322,7 @@ class ReferenceViewSet: return db.query(tb).all() def get_provider_contracts(db: Session, data: schemas.PAInit): - return exec_procedure(db, 'uspGetProviderContracts', **data) + return exec_procedure(db, 'uspGetProviderContracts', data.dict()) def get_providers_utility_services(db: Session, data: schemas.CityInit): tb = get_table('RefProvidersUtilityServices', 'General') @@ -369,6 +371,10 @@ class ReferenceViewSet: tb = get_table('RefObjectWiringTypes', 'General') return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all() + def get_object_overlapping_types(db: Session): + tb = get_table('RefObjectOverlappingTypes', 'General') + return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all() + def get_object_wall_material_types(db: Session): tb = get_table('RefObjectWallMaterialTypes', 'General') return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all() diff --git a/kv/isapi.py b/kv/isapi.py index 6917be5..aae1e53 100644 --- a/kv/isapi.py +++ b/kv/isapi.py @@ -10,8 +10,8 @@ router = APIRouter() def exec_procedure(session, proc_name, params, database: str = None): sql_params = "" if params: - sql_params = ",".join(["@{0}={1}".format(name, value) - for name, value in params.items()]) + sql_params = ",".join([f"@{name}='{value}'" if type(value) in [str] else f"@{name}={value}" + for name, value in params.items()]) dbstr = "" if database: dbstr = f"[{database}]." diff --git a/kv/routers/__pycache__/reference.cpython-39.pyc b/kv/routers/__pycache__/reference.cpython-39.pyc index 0463c831d559d523f0f83ed17ed0e461a14107c5..2a30c416e0dac004d7a856c9d366b54bbd21b65f 100644 GIT binary patch delta 1025 zcmZ9LOHUI~6vyXIi@Z9}_Rn20#!q1M+=8UzB=^p_zyJT9xsNjs2X_ahq$HII z_yPx)R+w~ALSII?0J!KMYV(}j7G5oX9H$%?v|5!VP2bjwp~hGfKTaa`CD$6|!p z(HSc;inZxE`BG9dN=6iY`LwF&Mp2q6s?J0-80E9FKDjtGFHh@Q%#xqPO1WTBRFzd= z6wLRm5<}*~&WTMshMgeVNC{!C*DWPuR_l(H+2MJ47;?5pG=%CY?&Iqg#4^G{kdW?> zAUJBMD~xQEtN*gt2n)l{BRzuJ`Tz6?JgLahDAEgDIm#P_p~`Et4%wuM*TH_}V_J_) zHt~AM*t4_&*+mm?0Gnf-HX^%h;*Idku|{LamP|Yb{mxC=ge+^~O<*{;Xfv`k6K{s= zbd|Os+c5DKuvgust;ljF-U=_PZn)c!Juq=j;7e(|h#lvVz0^h8V9Rxrw&QTyWNn9f z_Y#dGdtu^n*mb8!2Y5W4qzgtp8pe1n?rwCw;Z9x{g2?!IB@FkfeK6xW0mIdiywM}Q zEim=KM)mE31dd+h9}2Wy=&H%0Hth9C9}9RNe5+9o=6L#%e=5-Uc*WNS@4Q}E_l_TC z9zeQZ;2MD6-q}Mff&6QMmVgc49&tgUc8`SMS8bq^*Bj$SWjM!Wc2${{HGC_{1!YBM zjMtPQon2C8rp+noiRHA+>R`wpf|NgE=QqRnp)-EKEDrbmy?AP${c+L_fBaF>1JOXM zpKsl8O(dC;N@?d7(^nRfy0WP9-;MQw8VHhp$OSsQd?SYQjI87L)!CCWUrgSVfFFVP Fe*qxv%c1}P delta 937 zcmY+@OH30%7{Kw)vf=16&eFUJs4jhH6flzA!}J56=xe8&_;pa zBgPQ&g@by5g9!1W7%rITMPt0+!CTLIHPNFdzrj81G}+no_n+Bqrn_&(o{cGaMQOC* z=kR4=ruD7zpbo;0#Kf+2Ax@YZJuX-4jM+KuM&78_pVUhWXNr1>Nm#1(f>xToIdfH; zEg8G=(QMYhLycZ6!n(t+`tX|<52F?bo8%x4!niFeDO?NRoD=UV^)<4@{E&80*mgXp z5zMFYFk~ETQX^pz$SIG={~6^aM;<$_U=on|L(u;rvU?mO3D(zd%lpxv_yZjbD`C3q*i_pHz^w6fq`FzJ0t<7gGZ zmz3|z$6iA|N2+jp28`2U>z?#2_Bw@$D zOjD>^!n_om2$X3b+AG2P;7i~NNkcN&UpIhdF_eOXU<)hCde@8 mYKUZDRgI7l*jA6X@ZVnbp4Uov%VOb_#_xahqGjQa`r#juM7@Ck diff --git a/kv/routers/reference.py b/kv/routers/reference.py index 1493330..fbbb2f8 100644 --- a/kv/routers/reference.py +++ b/kv/routers/reference.py @@ -18,8 +18,8 @@ def get_personal_accounts(db: Session = Depends(get_db)): @router.get("/get_objects/{IDCity}", response_model=List[schemas.ObjectsSerializer]) def get_objects(IDCity: int, db: Session = Depends(get_db)): inn = schemas.CityInit(IDCity=IDCity) - data = ReferenceViewSet.get_objects(db, inn) - return data + print(inn) + return ReferenceViewSet.get_objects(db, inn) @router.get("/get_services", response_model=List[schemas.CommonTypeSerializer])