day_avg_all added

Queries/queries.py

@@ -82,4 +82,18 @@ def real_dayvalue(tag_id,time,end_time):
         "order": "asc",
         }
     ]
+    }
+
+def real_dayvalue_all(tag_id,time,end_time):
+	tag_id = tag_id.split(',')
+	return {
+        "start": time,
+        "end":end_time,
+        "tags": [
+            {
+        #"filters": {"measurements": {"values": 4294967.295, "condition": "ne"}},
+        "name": tag_id,
+        "order": "asc",
+        }
+    ]
     }

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))
+                        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))

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))
 
 
 

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')):

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"}