diff --git a/EntidadVirtual/API_REST/insercion_alarmas.py b/EntidadVirtual/API_REST/insercion_alarmas.py index f802a35..9789493 100644 --- a/EntidadVirtual/API_REST/insercion_alarmas.py +++ b/EntidadVirtual/API_REST/insercion_alarmas.py @@ -1,15 +1,54 @@ from flask import Flask +from flask_pymongo import PyMongo import paho.mqtt.client as paho +from datetime import date as d +import time +import json -user = mqtt_connect.Client("C1") -user.connect('localhost', port=8083) -user.subscribe("conjunto1/residencia1/alerta") +app = Flask(__name__) + +app.config['MONGO_DBNAME'] = 'restdb' +app.config['MONGO_URI'] = 'mongodb://localhost:27017/restdb' + +mongo = PyMongo(app) + +user = paho.Client() + + + +def on_connect(client, userdata, flags, rc): + print("CONNACK received with code %d." % (rc)) def on_message(user, data, message): - alarmas = mongo.db.alarmas - if + print(str(message.payload)) + m = str(message.payload) + with app.app_context(): + alarmas = mongo.db.alarmas + data = '{ "fecha":"' + d.today().day.__str__() + '/' + d.today().month.__str__() + '/' + d.today().year.__str__() + '", "cerradura":1 , "immueble": 1, "conjunto": 1, "tipo": ' + if "P2" in m: + data = data + '"Acceso no permitido" ' + alarmas.insert(data) + if "S1" in m: + data = data + '"Intento de apertura sospechoso" ' + alarmas.insert(data) + if "M1" in m: + data = data + '"Movimiento detectado" }' + alarmas.insert(json.loads(data)) + print(data) + +def on_subscribe(client, userdata,mid,granted_qos): + print("subscribed: "+str(mid)+" "+str(granted_qos)) +user.on_connect = on_connect +user.on_subscribe = on_subscribe user.on_message = on_message -user.loop_start() \ No newline at end of file +user.connect("broker.mqtt-dashboard.com", port=1883) +print("suscribe 1") +user.subscribe("conjunto1/residencia1/alerta") +print("suscribe 2") +user.loop_forever() + +if __name__ == "__main__": + app.run() \ No newline at end of file diff --git a/EntidadVirtual/API_REST/server.py b/EntidadVirtual/API_REST/server.py index 733ad65..e65c2a0 100644 --- a/EntidadVirtual/API_REST/server.py +++ b/EntidadVirtual/API_REST/server.py @@ -13,7 +13,7 @@ import json from os import environ as env from werkzeug.exceptions import HTTPException -# import horarios.horariosLogic as hl +#import horarios.horariosLogic as hl from authlib.flask.client import OAuth from six.moves.urllib.parse import urlencode import requests @@ -56,8 +56,9 @@ def insert_cerradura(): hora_inicio = request.json['hora_inicio'] hora_fin = request.json['hora_fin'] - nuevo_candado = "0;"+password+";"+posicion; - + nuevo_candado = "0;"+password+";"+posicion + user.on_message = on_message + user.loop_start() #hl.agregar_candado(hora_inicio, hora_fin, posicion) # hl.agregar_candado(hora_inicio, hora_fin, posicion) client.publish(topico, nuevo_candado) diff --git a/EntidadVirtual/ServidorMensajeriaYCorreo/NotificadorYale.py b/EntidadVirtual/ServidorMensajeriaYCorreo/NotificadorYale.py index 12149f7..e22512f 100644 --- a/EntidadVirtual/ServidorMensajeriaYCorreo/NotificadorYale.py +++ b/EntidadVirtual/ServidorMensajeriaYCorreo/NotificadorYale.py @@ -93,3 +93,5 @@ def send_msg(mensaje, asunto): user.loop_start() time.sleep(1000) user.loop_stop() + + diff --git a/EntidadVirtual/main.py b/EntidadVirtual/main.py index 3f3da04..a40ea8b 100644 --- a/EntidadVirtual/main.py +++ b/EntidadVirtual/main.py @@ -3,6 +3,7 @@ import time + def funt(): server.app.run()