Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
firediag
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hicham Brahimi
firediag
Commits
bf24bf46
Commit
bf24bf46
authored
6 years ago
by
Hicham Brahimi
Browse files
Options
Downloads
Patches
Plain Diff
Ajout des millisecondes
parent
f81f12ba
Branches
Branches containing commit
No related merge requests found
Pipeline
#131
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MQTT_MySQL.py
+4
-3
4 additions, 3 deletions
MQTT_MySQL.py
application/models/Valeur_model.php
+5
-1
5 additions, 1 deletion
application/models/Valeur_model.php
with
9 additions
and
4 deletions
MQTT_MySQL.py
+
4
−
3
View file @
bf24bf46
...
@@ -2,6 +2,7 @@ import MySQLdb
...
@@ -2,6 +2,7 @@ import MySQLdb
import
paho.mqtt.client
as
mqtt
import
paho.mqtt.client
as
mqtt
import
time
import
time
import
sys
import
sys
from
datetime
import
datetime
db
=
MySQLdb
.
connect
(
host
=
"
pil-09.univlehavre.lan
"
,
db
=
MySQLdb
.
connect
(
host
=
"
pil-09.univlehavre.lan
"
,
user
=
"
firediag
"
,
user
=
"
firediag
"
,
...
@@ -44,9 +45,9 @@ def on_message(client, userdata, msg):
...
@@ -44,9 +45,9 @@ def on_message(client, userdata, msg):
if
capteur
[
0
]
==
message_topic
:
if
capteur
[
0
]
==
message_topic
:
try
:
try
:
cursor
.
execute
(
"
INSERT INTO `valeur` (`temps`, `valeur`, `idCapteur`) VALUES (
'"
+
cursor
.
execute
(
"
INSERT INTO `valeur` (`temps`, `valeur`, `idCapteur`) VALUES (
'"
+
time
.
strftime
(
'
%Y-%m-%d %H:%M:%S
'
)
+
"'
,
'"
+
str
(
message_valeur
)
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
)
"
);
datetime
.
now
()
.
strftime
(
'
%Y-%m-%d %H:%M:%S
.%f
'
)
+
"'
,
'"
+
str
(
message_valeur
)
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
)
"
);
print
(
"
Nouvelle valeur (
'"
+
time
.
strftime
(
'
%Y-%m-%d %H:%M:%S
'
)
+
"'
,
'"
+
str
(
message_valeur
)
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
)
"
);
print
(
"
Nouvelle valeur (
'"
+
datetime
.
now
()
.
strftime
(
'
%Y-%m-%d %H:%M:%S
.%f
'
)
+
"'
,
'"
+
str
(
message_valeur
)
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
)
"
);
if
unicode
(
str
(
message_valeur
).
strip
(),
'
utf-8
'
).
isnumeric
():
# Si c'est une valeur numerique
if
unicode
(
str
(
message_valeur
).
strip
(),
'
utf-8
'
).
isnumeric
():
# Si c'est une valeur numerique
# Gestion des notifications des utilisateurs (ajout des alertes)
# Gestion des notifications des utilisateurs (ajout des alertes)
...
@@ -76,7 +77,7 @@ def on_message(client, userdata, msg):
...
@@ -76,7 +77,7 @@ def on_message(client, userdata, msg):
message
+=
str
(
int
(
seuil
[
2
]))
+
"
)
"
;
message
+=
str
(
int
(
seuil
[
2
]))
+
"
)
"
;
cursorNotif
.
execute
(
"
INSERT INTO `notification` (`temps`, `titre`, `message`, `idUser`, `idCapteur`, `vu`) VALUES (
'"
+
cursorNotif
.
execute
(
"
INSERT INTO `notification` (`temps`, `titre`, `message`, `idUser`, `idCapteur`, `vu`) VALUES (
'"
+
time
.
strftime
(
'
%Y-%m-%d %H:%M:%S
'
)
+
"'
,
'"
+
titre
+
"'
,
'"
+
message
+
"'
,
'"
+
str
(
capteur
[
2
])
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
, false)
"
)
datetime
.
now
()
.
strftime
(
'
%Y-%m-%d %H:%M:%S
.%f
'
)
+
"'
,
'"
+
titre
+
"'
,
'"
+
message
+
"'
,
'"
+
str
(
capteur
[
2
])
+
"'
,
'"
+
str
(
capteur
[
1
])
+
"'
, false)
"
)
# notification du changement
# notification du changement
client
.
publish
(
"
/system/notification/
"
+
str
(
capteur
[
2
]),
str
(
capteur
[
4
])
+
"
/
"
+
str
(
capteur
[
1
]));
client
.
publish
(
"
/system/notification/
"
+
str
(
capteur
[
2
]),
str
(
capteur
[
4
])
+
"
/
"
+
str
(
capteur
[
1
]));
...
...
This diff is collapsed.
Click to expand it.
application/models/Valeur_model.php
+
5
−
1
View file @
bf24bf46
...
@@ -9,8 +9,12 @@ class Valeur_model extends CI_Model {
...
@@ -9,8 +9,12 @@ class Valeur_model extends CI_Model {
$this
->
db
->
set
(
'idCapteur'
,
$idCapteur
);
$this
->
db
->
set
(
'idCapteur'
,
$idCapteur
);
$this
->
db
->
set
(
'valeur'
,
$valeur
);
$this
->
db
->
set
(
'valeur'
,
$valeur
);
$t
=
microtime
(
true
);
$micro
=
sprintf
(
"%06d"
,(
$t
-
floor
(
$t
))
*
1000000
);
$d
=
new
DateTime
(
date
(
'Y-m-d H:i:s.'
.
$micro
,
$t
)
);
// Ces données ne seront pas échappées
// Ces données ne seront pas échappées
$this
->
db
->
set
(
'temps'
,
'NOW()'
,
false
);
$this
->
db
->
set
(
'temps'
,
$d
->
format
(
"Y-m-d H:i:s.u"
)
);
// Une fois que tous les champs ont bien été définis, on "insert" le tout
// Une fois que tous les champs ont bien été définis, on "insert" le tout
return
$this
->
db
->
insert
(
$this
->
table
);
return
$this
->
db
->
insert
(
$this
->
table
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment