bd alarmas

ISIS2503 · May 19, 2018 · dad2ad7 · dad2ad7
1 parent 7433f38
commit dad2ad7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/EntidadVirtual/API_REST/insercion_alarmas.py b/EntidadVirtual/API_REST/insercion_alarmas.py
@@ -1,5 +1,6 @@
 from flask import Flask
 import paho.mqtt.client as paho
+from datetime import date as d
 
 user = mqtt_connect.Client("C1")
 
@@ -8,7 +9,16 @@
 
 def on_message(user, data, message):
     alarmas = mongo.db.alarmas
-    if 
+    data = '{"fecha":"' + d.day + '/' + d.month + '/' + d.year + ', "cerradura":1 , "immueble": 1, "conjunto": 1, "tipo": '
+    if "P2" in message:
+        data = data + '"Acceso no permitido" }'
+        alarmas.insert(data)
+    if "S1" in message:
+        data = data + '"Intento de apertura sospechoso" }'
+        alarmas.insert(data)
+    if "M1" in message:
+        data = data + '"Movimiento detectado" }'
+        alarmas.insert(data)
 
 
 user.on_message = on_message

diff --git a/EntidadVirtual/API_REST/server.py b/EntidadVirtual/API_REST/server.py
@@ -55,8 +55,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/main.py b/EntidadVirtual/main.py
@@ -3,6 +3,7 @@
 import time
 
 
+
 def funt():
     server.app.run()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,7 @@
		import time



		def funt():
		server.app.run()

Expand Down