Merge pull request #63 from IUT-Blagnac/DevPierre

Enregistrement des alertes
IUT-Blagnac · Dec 3, 2024 · d2b8d95 · d2b8d95
2 parents 6280eb9 + 9757090
commit d2b8d95
Show file tree

Hide file tree

Showing 55 changed files with 68 additions and 0 deletions.
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-03_09-48-26 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-03_09-48-26
@@ -0,0 +1 @@
+{'temperature': 20.7, 'humidity': 49, 'co2': 1819}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-03_10-00-31 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-03_10-00-31
@@ -0,0 +1 @@
+{'temperature': 21.3, 'humidity': 56.5, 'co2': 1576}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-17/2024-12-03_10-05-59 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-17/2024-12-03_10-05-59
@@ -0,0 +1 @@
+{'temperature': 19.3, 'humidity': 53.5, 'co2': 494}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-03_10-00-04 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-03_10-00-04
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 53.5, 'co2': 866}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-20/2024-12-03_10-05-58 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-20/2024-12-03_10-05-58
@@ -0,0 +1 @@
+{'temperature': 21.3, 'humidity': 55.5, 'co2': 1513}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-03_09-59-19 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-03_09-59-19
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 58.5, 'co2': 1389}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-26/2024-12-03_09-54-51 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-26/2024-12-03_09-54-51
@@ -0,0 +1 @@
+{'temperature': 19.9, 'humidity': 48.5, 'co2': 598}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-03_10-00-54 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-03_10-00-54
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 54.5, 'co2': 1161}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-28/2024-12-03_10-06-24 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-28/2024-12-03_10-06-24
@@ -0,0 +1 @@
+{'temperature': 20.2, 'humidity': 51.5, 'co2': 782}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-03_09-58-58 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-03_09-58-58
@@ -0,0 +1 @@
+{'temperature': 19.7, 'humidity': 47.5, 'co2': 485}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-03_09-59-53 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-03_09-59-53
@@ -0,0 +1 @@
+{'temperature': 20, 'humidity': 51, 'co2': 941}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-33/2024-12-03_09-59-56 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-33/2024-12-03_09-59-56
@@ -0,0 +1 @@
+{'temperature': 18.2, 'humidity': 51.5, 'co2': 487}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'temperature': 21.4, 'humidity': 53, 'co2': 1357}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-03_09-59-23 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-03_09-59-23
@@ -0,0 +1 @@
+{'temperature': 23.5, 'humidity': 40.5, 'co2': 707}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-03_10-04-25 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-03_10-04-25
@@ -0,0 +1 @@
+{'temperature': 20.7, 'humidity': 46, 'co2': 501}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-03_09-58-57 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-03_09-58-57
@@ -0,0 +1 @@
+{'temperature': 19.9, 'humidity': 47, 'co2': 503}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-03_09-48-27 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-03_09-48-27
@@ -0,0 +1 @@
+{'temperature': 20.3, 'humidity': 47.5, 'co2': 479}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-03_09-59-56 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-03_09-59-56
@@ -0,0 +1 @@
+{'temperature': 18.9, 'humidity': 50.5, 'co2': 497}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-03_09-59-29 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-03_09-59-29
@@ -0,0 +1 @@
+{'temperature': 18.6, 'humidity': 52, 'co2': 514}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-54/2024-12-03_10-05-59 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-54/2024-12-03_10-05-59
@@ -0,0 +1 @@
+{'temperature': 20.9, 'humidity': 49.5, 'co2': 757}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'temperature': 20.4, 'humidity': 50.5, 'co2': 475}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'temperature': 20.4, 'humidity': 50.5, 'co2': 475}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-03_09-48-26 b/Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-03_09-48-26
@@ -0,0 +1 @@
+{'temperature': 20.7, 'humidity': 49, 'co2': 1819}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-03_10-00-32 b/Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-03_10-00-32
@@ -0,0 +1 @@
+{'temperature': 21.3, 'humidity': 56.5, 'co2': 1576}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-03_10-00-04 b/Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-03_10-00-04
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 53.5, 'co2': 866}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B112/2024-12-03_10-05-59 b/Code/Java/src/main/resources/application/capteur/AM107/B112/2024-12-03_10-05-59
@@ -0,0 +1 @@
+{'temperature': 19.3, 'humidity': 53.5, 'co2': 494}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B217/2024-12-03_10-05-58 b/Code/Java/src/main/resources/application/capteur/AM107/B217/2024-12-03_10-05-58
@@ -0,0 +1 @@
+{'temperature': 21.3, 'humidity': 55.5, 'co2': 1513}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C002/2024-12-03_10-05-59 b/Code/Java/src/main/resources/application/capteur/AM107/C002/2024-12-03_10-05-59
@@ -0,0 +1 @@
+{'temperature': 20.9, 'humidity': 49.5, 'co2': 757}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-03_09-59-19 b/Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-03_09-59-19
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 58.5, 'co2': 1389}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E001/2024-12-03_10-06-24 b/Code/Java/src/main/resources/application/capteur/AM107/E001/2024-12-03_10-06-24
@@ -0,0 +1 @@
+{'temperature': 20.2, 'humidity': 51.5, 'co2': 782}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E003/2024-12-03_09-54-52 b/Code/Java/src/main/resources/application/capteur/AM107/E003/2024-12-03_09-54-52
@@ -0,0 +1 @@
+{'temperature': 19.9, 'humidity': 48.5, 'co2': 598}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-03_10-00-54 b/Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-03_10-00-54
@@ -0,0 +1 @@
+{'temperature': 19.8, 'humidity': 54.5, 'co2': 1161}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-03_09-59-23 b/Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-03_09-59-23
@@ -0,0 +1 @@
+{'temperature': 23.5, 'humidity': 40.5, 'co2': 707}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-03_09-58-58 b/Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-03_09-58-58
@@ -0,0 +1 @@
+{'temperature': 19.7, 'humidity': 47.5, 'co2': 485}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-03_09-59-53 b/Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-03_09-59-53
@@ -0,0 +1 @@
+{'temperature': 20, 'humidity': 51, 'co2': 941}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E103/2024-12-03_09-59-56 b/Code/Java/src/main/resources/application/capteur/AM107/E103/2024-12-03_09-59-56
@@ -0,0 +1 @@
+{'temperature': 18.2, 'humidity': 51.5, 'co2': 487}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'temperature': 21.4, 'humidity': 53, 'co2': 1357}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-03_09-58-57 b/Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-03_09-58-57
@@ -0,0 +1 @@
+{'temperature': 19.9, 'humidity': 47, 'co2': 503}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-03_10-04-25 b/Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-03_10-04-25
@@ -0,0 +1 @@
+{'temperature': 20.7, 'humidity': 46, 'co2': 501}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-03_09-48-27 b/Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-03_09-48-27
@@ -0,0 +1 @@
+{'temperature': 20.3, 'humidity': 47.5, 'co2': 479}
diff --git a/Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-03_09-59-29 b/Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-03_09-59-29
@@ -0,0 +1 @@
+{'temperature': 18.6, 'humidity': 52, 'co2': 514}
diff --git a/...a/src/main/resources/application/capteur/AM107/hall-entrée-principale/2024-12-03_09-59-56 b/...a/src/main/resources/application/capteur/AM107/hall-entrée-principale/2024-12-03_09-59-56
@@ -0,0 +1 @@
+{'temperature': 18.9, 'humidity': 50.5, 'co2': 497}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-14/2024-12-03_10-00-31 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-14/2024-12-03_10-00-31
@@ -0,0 +1 @@
+{'salle': AM107-14, 'seuil_co2': 1000, 'co2': 1576}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-20/2024-12-03_10-05-58 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-20/2024-12-03_10-05-58
@@ -0,0 +1 @@
+{'salle': AM107-20, 'seuil_co2': 1000, 'co2': 1513}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-24/2024-12-03_09-59-19 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-24/2024-12-03_09-59-19
@@ -0,0 +1 @@
+{'salle': AM107-24, 'seuil_co2': 1000, 'co2': 1389}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-27/2024-12-03_10-00-54 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-27/2024-12-03_10-00-54
@@ -0,0 +1 @@
+{'salle': AM107-27, 'seuil_co2': 1000, 'co2': 1161}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-36/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-36/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'salle': AM107-36, 'seuil_co2': 1000, 'co2': 1357}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/B106/2024-12-03_10-00-32 b/Code/Java/src/main/resources/application/capteur/alerte/B106/2024-12-03_10-00-32
@@ -0,0 +1 @@
+{'salle': B106, 'seuil_co2': 1000, 'co2': 1576}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/B217/2024-12-03_10-05-58 b/Code/Java/src/main/resources/application/capteur/alerte/B217/2024-12-03_10-05-58
@@ -0,0 +1 @@
+{'salle': B217, 'seuil_co2': 1000, 'co2': 1513}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/C006/2024-12-03_09-59-19 b/Code/Java/src/main/resources/application/capteur/alerte/C006/2024-12-03_09-59-19
@@ -0,0 +1 @@
+{'salle': C006, 'seuil_co2': 1000, 'co2': 1389}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/E004/2024-12-03_10-00-54 b/Code/Java/src/main/resources/application/capteur/alerte/E004/2024-12-03_10-00-54
@@ -0,0 +1 @@
+{'salle': E004, 'seuil_co2': 1000, 'co2': 1161}
diff --git a/Code/Java/src/main/resources/application/capteur/alerte/E106/2024-12-03_10-00-55 b/Code/Java/src/main/resources/application/capteur/alerte/E106/2024-12-03_10-00-55
@@ -0,0 +1 @@
+{'salle': E106, 'seuil_co2': 1000, 'co2': 1357}
diff --git a/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-03_09-48-23 b/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-03_09-48-23
@@ -0,0 +1 @@
+{'lastUpdateTime': '2024-12-03 09:33:05', 'lifeTimeData': {'energy': 3429209}, 'lastYearData': {'energy': 2948179}, 'lastMonthData': {'energy': 13773}, 'lastDayData': {'energy': 313}, 'currentPower': {'power': 574.4218}, 'measuredBy': 'INVERTER'}
diff --git a/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-03_10-04-02 b/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-03_10-04-02
@@ -0,0 +1 @@
+{'lastUpdateTime': '2024-12-03 09:48:17', 'lifeTimeData': {'energy': 3429303}, 'lastYearData': {'energy': 2948273}, 'lastMonthData': {'energy': 13867}, 'lastDayData': {'energy': 407}, 'currentPower': {'power': 292.81964}, 'measuredBy': 'INVERTER'}
diff --git a/Code/Python/clientMQTT.py b/Code/Python/clientMQTT.py
@@ -88,7 +88,9 @@ def on_message(client, userdata, msg):
                     donnees = data[0][info]
                     seuil_alert = SEUIL_ALERT[i]
                     if(donnees>=int(seuil_alert)):
+                        message_alerte = "{"+f"'salle': {salle}, 'seuil_{info}': {seuil_alert}, '{info}': {donnees}"+"}"
                         print("ALERTE (Seuil "+info+" dépassé : "+seuil_alert+") en "+salle+" : "+f"{donnees}")
+                        enregistrer_alerte(message_alerte,topic)
                     message = message + f"'{info}': {donnees}"
                     i=i+1
                     if(i<=nb_info-1):
@@ -113,6 +115,18 @@ def enregistrer_donnees(data,topic):
         with open(BASE_PATH+flux_mqtt+"/"+salle+"/"+date, "a") as f:
             f.write(data + "\n")
 
+def enregistrer_alerte(data,topic):
+    date=datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
+    parties = topic.split("/")
+    flux_mqtt = parties[0]
+    if not exists(BASE_PATH+"alerte"):
+        os.makedirs(BASE_PATH+"alerte")
+    salle=parties[2]
+    if not exists(BASE_PATH+"alerte/"+salle):
+        os.mkdir(BASE_PATH+"alerte/"+salle)
+    with open(BASE_PATH+"alerte/"+salle+"/"+date, "a") as f:
+        f.write(data + "\n") 
+
 def gestion_periode(date_sans_seuil):
     tab_str=date_sans_seuil.split('_')[0].split('-')+date_sans_seuil.split('_')[1].split('-')
     tab_int=[]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 20.7, 'humidity': 49, 'co2': 1819}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 21.3, 'humidity': 56.5, 'co2': 1576}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.3, 'humidity': 53.5, 'co2': 494}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.8, 'humidity': 53.5, 'co2': 866}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 21.3, 'humidity': 55.5, 'co2': 1513}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.8, 'humidity': 58.5, 'co2': 1389}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.9, 'humidity': 48.5, 'co2': 598}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.8, 'humidity': 54.5, 'co2': 1161}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 20.2, 'humidity': 51.5, 'co2': 782}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{'temperature': 19.7, 'humidity': 47.5, 'co2': 485}