From c9f2c809327deb51824f0ba7e11a0234f43cfcdc Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Tue, 16 Apr 2019 11:59:53 +0500 Subject: [PATCH] day_avg_all added --- Assets/Assets.pyc | Bin 944 -> 944 bytes Queries/queries.py | 14 ++++++++++++++ Queries/queries.pyc | Bin 1733 -> 1985 bytes Queries/querybody.py | 11 ++++++++++- Queries/querybody.pyc | Bin 7454 -> 7895 bytes Reon/Reon.py | 6 +++++- Reon/Reon.pyc | Bin 13380 -> 13754 bytes ResponseDict.pyc | Bin 584 -> 586 bytes _connect.pyc | Bin 4736 -> 4756 bytes app.py | 7 ++++++- app.pyc | Bin 7106 -> 7503 bytes token.json | 1 + util.pyc | Bin 2789 -> 2805 bytes 13 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 token.json diff --git a/Assets/Assets.pyc b/Assets/Assets.pyc index 8070b12b2fcf3a27f81128cf051134e93d2a8d35..75b926ba4a0eb6ce337a0d51c9412c07cf1e8ded 100644 GIT binary patch delta 47 ycmdnMzJZ;C`7GzubU#VT}>g}4y{QbDB~S4HAND8UjsQ6gE?CKW0X72UX$ zEX9?001*%1!fj9BExds5fdl_H%$slEpKtfeYl>gjo|T``5dIg#eGij&pPD<)13+Jb zw&2LGz4s3oi>g=l!lI9T-loH;c&ldu_1oQ_t4Fh1FgiFrG-jx@%o-`a+`1W(LNPF1 zOumgM0nPz5gL?+o0I7hIf#wjD9JGKS<)ml>0&Rkp5S-z)1p#)!*S&(OZiEUM+5`-Q zEdnQyI4B{+1 t#$nz-0P~n&7PGkE7VG&|bt2b!*se;sihq5UD{~H7YEjv$p*-a%_YXQ`KNkQ1 delta 154 zcmX@ef0S36`7PO2Tq!eTBU!70Yc#mUFX&&dM-w+tag diff --git a/Queries/querybody.py b/Queries/querybody.py index 6a7ad86..c54b380 100644 --- a/Queries/querybody.py +++ b/Queries/querybody.py @@ -174,4 +174,13 @@ def query_real_dayvalue(tag_id,time,end_time): if response_data.raise_for_status() is None: return response_data.json() abort(make_response(jsonify({'response': {'message': ' Forwarding data from predix response.'}}), - response_data.raise_for_status)) \ No newline at end of file + response_data.raise_for_status)) + +def query_real_dayvalue_all(tag_id,time,end_time): + response_data = requests.post(QUERY_URL, + data=json.dumps(query.real_dayvalue_all(tag_id,time,end_time)), + headers=connection.create_header()) + if response_data.raise_for_status() is None: + return response_data.json() + abort(make_response(jsonify({'response': {'message': ' Forwarding data from predix response.'}}), + response_data.raise_for_status)) diff --git a/Queries/querybody.pyc b/Queries/querybody.pyc index 41b0dc42aa4e260e602197e73da9a2df93189bc0..9e2ed8163cc2b810fc93cf76479899ce10dbd493 100644 GIT binary patch delta 360 zcmbPdb=_8)`7VVA2A9w{f zALZ`_$;k1DZ_W~A0jbRwasyG@gy(>$V9`Dh^+;?MkOC{4A_0~#lv)B3xh8GBIY)|# zQB)A<+M?9NocNT)%Cf|q($x6GoSez^(z@(H?m(#^>B;}O<(y&)OH+#~lk!t4^$IFW z#DNlEfp`p^n?auE0}>33JdART{ER}3T#T}e8nTmxWfrpsc>yIf7$)!Ml~h1Ak^?AV YlbfGXnv-hB2xJ%QO#UdN%f!hE0CLu4WB>pF delta 199 zcmca^JI_j*`7nPb diff --git a/Reon/Reon.py b/Reon/Reon.py index 180b540..bf8107f 100644 --- a/Reon/Reon.py +++ b/Reon/Reon.py @@ -55,7 +55,11 @@ def get_aggregated_day(tag_id, get_time): end_time=time_list+86340000 return json.dumps(util.parse_data_latest(qb.query_real_dayvalue(tag_id,time_list,end_time))) - +def get_aggregated_day_all(tag_id, get_time): + df = datetime.datetime.strptime(get_time + ' 00:00:00', "%Y-%m-%d %H:%M:%S") + time_list=(int(time.mktime(utc_return_nowtime(df).timetuple()) * 1000)) + end_time=time_list+86340000 + return json.dumps(qb.query_real_dayvalue_all(tag_id,time_list,end_time)) diff --git a/Reon/Reon.pyc b/Reon/Reon.pyc index 2a77018a9a3e3c9dd182b7a9ef85bae61aff8b6e..8cf48fac05c98ee8660f93174eb7b34818af733e 100644 GIT binary patch delta 2265 zcmcJQU2Kz87{||P*TR^tWn&+#>$!w(;Ow;4Q3%+6wDED8ZuXGZvE2o$_&*5C2BSfbhi2`2 ztCkpBva_W!cFm6cr!@yX_5^Dl*%?dTooRPy6>@{91Y9)Y?V$Uej=nlMoXMNng;>_q zQ!ztdnAKBxGp46f8k`6Z&eCcsDc-L-Aw!px*Y(+gIuoJ*KiOiv`TW7u)4h_A{R6_RMyWh zO5au=Y3jumST`<2EG~a1ROI3il=~^NEwZH)>o$7et#)M6*5nU`RUNne-w~V)+zsn*4Qb zJ+DASQernCfR_Q>$CIoejR9wXS8*Y#E`0pg!o9k_r}L_U#(!MM|CN&Tc9O|>pQHru z=OxsoE|_{YmP+QVVty*C^(0l|8#(F%l4<-W-)6BxTBR2@#~^P?IHQfvmc1BOJ=gNfmV(y-+4SyG5d$2r95WXXD% zfKO3LkA3C;O03f+5)^6nK3jfGJV+ljzb{LusilGU(w>&j8`loe!b?CyS~RnnSUi(Y zTmAHR%WZy)Zncipm(*~kc`GhEpOw$12XFcB@M-$kU*BM<7y%WndPy@F=IA^BK;@bN zfyXgisBQa$^9gbVnq)MgfR7(7j0SFS=OT6-r=L2)a@DQ*CNjI1{YluhCnq*t;{gBEeG(f1tRc}!> zI7|<_`sB{7-Ck}{xceJEM1OYo37lkLRK_!-tO?AKY9=1^9dGTo_YP0Ff5-?0;R zeXpWBmA9Cpd4&qXbg!Z@<+QJ@5VrhmVPX2kWv90ChQepomOU)I-e50Z()GC)3x8BN ztxlJ)p56zDpOU^O{?d2K6vfvlhTKh_nwR|T5PiTSfFB3|9Y7}#1VXgg+(x%+sw*QH zb^%fPvnJZw2k}YZpnwT8hI&qqYpSX9L(uoqF;87xnCrQ0XyLpGkFxqw9G+e(%+?ND zM%`Fe1?&gf1We(mVwic}56w})1~slNlT$T=4?&0H>r_IVwbHU7P7LnHZdvp7Y~a(nlM%E_cz_145V7&A6IO=JlkouEpnbSu^!x z;jXRLvNDVhVo<52;m=+4_4NUi>)p4FEZ@&j&)xtx{qZ7Z-aDC%L#jog>JeHJK-7E8uNg*wX8 zS$ko^S<9+l5v$TjIa!B1PRlJR_A33>;u<~+Q_>1L1lNkgqS1$OGxz{EJ1ktM4Oi2{ zdE3mq^snnf(OW)nH?j!bbl(*6cxxl;p-k&1EJn;TQNMFZCN5*qOvLlLxtPx$q@3qU zcNV_yLlmfCS+Syq%-4Ayx>9M#s>nh28Xff>uG%rmk>~@3HSa%6T+YSzX5qlqb|)Ju z+-iTHS(mZn6pi`AVs^#v6tma;O>Bg2`PbMAod`@?FJj3B+6X))CVvgs*cAO8__}le z8jMQcc3iH$ETpY#$8+;{Q438wj+py}&P>niaZ}AEb8%$g41L_WX7gilHBbY{GBKzl zI4jQkH0Wh>v>DX=gJLc%JCAI|d&JNOa2d3`2$@WS6btom&_`^2m$&$+Sn)?*hknSDx5H!-)7cZe>|QO{8?*0^MO?2$%$>ftP_9AO*|<^MC;$>G%cUP2e4%4R{Zb!LCEX oC2sX-w;~?XryvA-F=deV{qs3(F{2Nl(v35u_J){;)_Z;b0pYokaR2}S diff --git a/ResponseDict.pyc b/ResponseDict.pyc index 6da125385a4a2f6986218b19bb46fe4a26dc0342..b7d84b4174cc8cabffa72487fd67aab9df008189 100644 GIT binary patch delta 61 zcmX@Xa*Bn6`7UsCHkA2S-BXARJw)jITLY8Cm-T`Oq|NiXShO$wcnk`n@FXTck=Eg(*D_e0mK?A SByf&ML)isIi8a(&C=dYrUzFVd diff --git a/app.py b/app.py index 25fb1c6..ba8bf29 100644 --- a/app.py +++ b/app.py @@ -39,7 +39,12 @@ def get_aggregated_day(): return reonService.get_aggregated_day(request.args.get('t'), request.args.get('time')) abort(make_response(jsonify(Auth_Token_Expired), 401)) - +@app.route("/api/aggregated_day_all") +def get_aggregated_day_all(): + if reonService.verify_auth_token(request.args.get('tok')): + return reonService.get_aggregated_day_all(request.args.get('t'), request.args.get('time')) + abort(make_response(jsonify(Auth_Token_Expired), 401)) + @app.route("/api/aggregated_week") def get_aggregated_week(): if reonService.verify_auth_token(request.args.get('tok')): diff --git a/app.pyc b/app.pyc index a07ffe23f34a1f9f3adac427b356a93e6574360b..869aaf81e51e1ce23db929c0ebd9d0b909393044 100644 GIT binary patch delta 1425 zcmb7@zi-n(6vywJ$|)vM2qm!-2O-iz(h8FF2Slw(n-t2#P`O>Gf>Mh+IiYT9*^X#b z#6lUEqH-H7Y>a>`HU`APfDl43z=ApOu~&-?UDe<&?!=tc&SBD#YSDWN^Yo%I5uDk76;Q$p@XiAE6B5Sc<` z8j%@9b%>F03n7BhYW`esAbrNUagbb|tF5?{GN>Mvcio3!QEf-gg} zg9p#cS$u6kWz%sAPRG!pjxpXI?-NNn&SOsnuV^~WqG?$!wM?IqIx#zS)3#Y9_9UHz zeT(|_|7`C^$EL*!$bi^H&<)42Ab1?WQt*CQ8F)VTl_V|)suIDALN)pkNOhCa&ALnd zw%hU+f{nu?qV;A$WSMotqwIC$yI`-Qz+MTyMnj@W`Oz9dIu;WJPXTx}SU(~Ro(6D( zJ&6AlY%vF%#aeZuuyXGl9*2Xx6WE~ zi>^|)Nj)xio9!jv;&EoE4fzZN7-!i_H8bd~XIM+%yG+$S$h;O~lKs$*4NZZ|cGRUm zf-9-P1@}`4++~kb6btQ~?iMN=ZuFNW~1j{pDw delta 1250 zcmX?ab;w+r`7fBOwB9N-~5Bcl31k?Y)V8boxG4;dNUg*6Qdzfjz}yh&?~46k^wqcd$Tnc z7o!ac+Df>A+ENlLvON}6mY@|h%EpvcSI93yJZXiZ8yasjoar2trH=$;?d+PA$qzEe07@IhjS`EThKcOA;Au+CT+CI+GnFWk_~iK`G324U=a| zUY6DX8D#(@ib1IuXpw?TYEEiNYD$pd3u5Yn2xAao dI(Z|9FmdI|sj4qSeWHlJsCmYJj0RYVxep>(l diff --git a/token.json b/token.json new file mode 100644 index 0000000..8986cc9 --- /dev/null +++ b/token.json @@ -0,0 +1 @@ +{"token": "eyJhbGciOiJSUzI1NiIsImtpZCI6ImxWeFNnIiwidHlwIjoiSldUIn0.eyJqdGkiOiJlYTM3NTM1NzUwMWI0ZWFlYmZmYzZmMjkyOTJlZGUwNyIsInN1YiI6IlJlb24iLCJzY29wZSI6WyJwcmVkaXgtYXNzZXQuem9uZXMuZjVjNTQ2M2MtODhlMC00ZTZkLThmOTEtMjcyMTE4OGI2YmRhLnVzZXIiLCJ1YWEucmVzb3VyY2UiLCJ1YWEubm9uZSIsInRpbWVzZXJpZXMuem9uZXMuMzU4OTk1ZWYtMzFlMy00OTQ0LWFmMWQtZGQ4OTZmMjkwMTU1LnVzZXIiLCJ0aW1lc2VyaWVzLnpvbmVzLjM1ODk5NWVmLTMxZTMtNDk0NC1hZjFkLWRkODk2ZjI5MDE1NS5pbmdlc3QiLCJ0aW1lc2VyaWVzLnpvbmVzLjM1ODk5NWVmLTMxZTMtNDk0NC1hZjFkLWRkODk2ZjI5MDE1NS5xdWVyeSJdLCJjbGllbnRfaWQiOiJSZW9uIiwiY2lkIjoiUmVvbiIsImF6cCI6IlJlb24iLCJncmFudF90eXBlIjoiY2xpZW50X2NyZWRlbnRpYWxzIiwicmV2X3NpZyI6Ijg1YTIzNTNmIiwiaWF0IjoxNTU1Mzk3ODAxLCJleHAiOjE1NTU0ODQyMDEsImlzcyI6Imh0dHBzOi8vNzcyZGIyZmMtMTU4YS00MzJlLWFmMTgtNGQxOWNkMGQxNGJiLnByZWRpeC11YWEucnVuLmF3cy11c3cwMi1wci5pY2UucHJlZGl4LmlvL29hdXRoL3Rva2VuIiwiemlkIjoiNzcyZGIyZmMtMTU4YS00MzJlLWFmMTgtNGQxOWNkMGQxNGJiIiwiYXVkIjpbIlJlb24iLCJ1YWEiLCJwcmVkaXgtYXNzZXQuem9uZXMuZjVjNTQ2M2MtODhlMC00ZTZkLThmOTEtMjcyMTE4OGI2YmRhIiwidGltZXNlcmllcy56b25lcy4zNTg5OTVlZi0zMWUzLTQ5NDQtYWYxZC1kZDg5NmYyOTAxNTUiXX0.OZNc4kig-yWZl2ejgNzzGeonh57kbgUVzqz3Duo6S7lpPEIhpg6RxbCnLt025NuuF2Ntggh9ipkVMgbLeqRsFdR8kKSSIyyeINgIVWzg1mVqG_uUq90fTiBVQ6gViAprmHJM2tR_tTnL05FBgmg0xWxZ3AQXPrGkL4i-GCoxmzxHw3ffUku4cajS-tmx_G4MEX2QrVJ1QtexI4-aX9qQg1eR5dQ_aKstn19dhmNiiuWg3GyFQsxFKQnjpQL-8pRdOu9hDGC1whw3LYCqH_V0FdbpgWKfQIGq-sFdFx8vAKeoUlQzI1yF32UHm0d8I3SSexMUa_NZ8ziRZ5fqn2Gbiw", "expires": "2019-04-16T21:58:47.858000"} \ No newline at end of file diff --git a/util.pyc b/util.pyc index 3f3f996a3e0adbbfafb7a53f8ac69b49603b095c..c6eca8b6f42b23a108899f0a312ed26e527f7a83 100644 GIT binary patch delta 371 zcmaDV`c;&J`7oGAm*n3kr&30xC-~^7EiV&N-Q> zc_lHE!x_I2t9Ek%lPxpRiZ8K-67LEh_NBxcJXwt6BhhMgIL{KTR*tKbXtg`IbOEaj Bf(HNq delta 355 zcmew=`c#yI`7nG5TV^7a-e3(S*8ULorNkLJS%Kptkt!`X&l0IphpUuGl_$7# E0jjllvH$=8