mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Di 16. Jun 23:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-16 23:31:01 +02:00
parent 2161446f72
commit 7dafb7e747
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/broker.js
View File

@ -2,6 +2,10 @@ module.exports = function (app_cfg, sql, uuidv4) {
// Module laden
const twit = require('twit');
const {
v5: uuidv5
} = require('uuid');
const custom_namespace = 'fadad35a-b9dc-42b5-9484-7459ae2a6445';
function alert_vmtl_list(list_data, callback) {
@ -19,6 +23,13 @@ module.exports = function (app_cfg, sql, uuidv4) {
console.log('Twitter-Account-Daten: ' + JSON.stringify(vmtl_data));
};
// Daten in kurzen UUID-Strings umwandeln
//FIXME
var uuid_vmlt_history = uuidv5(vmtl_data.uuid + vmtl_data.einsatzart + vmtl_data.stichwort + vmtl_data.name_wache + vmtl_data.list, custom_namespace);
// Prüfen ob zuletzt bereits eine Nachricht gesendet wurde (Doppelalarmierung vermeiden)
if (vmtl_data) {
var T = new twit({
@ -53,7 +64,7 @@ module.exports = function (app_cfg, sql, uuidv4) {
for (var i = 0; i < arrayLength; i++) {
// Mitteilungstext festelgen
var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + String.fromCodePoint(0x1F6A8) + String.fromCodePoint(0x0A) +
'Einsatz für ' + vmtl_data.name_wache + ' ' + String.fromCodePoint(0x27A1) + ' ' + vmtl_data.einsatzart + ': ' + vmtl_data.stichwort + String.fromCodePoint(0x0A) +
'Einsatz für ' + vmtl_data.name_wache + ' ' + String.fromCodePoint(0x27A1) + ' ' + vmtl_data.einsatzart + ', ' + vmtl_data.stichwort + String.fromCodePoint(0x0A) +
'jetzt Rückmeldung senden: ' + app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4();
// Parameter der Mitteilung
var msg_params = {
@ -100,9 +111,9 @@ module.exports = function (app_cfg, sql, uuidv4) {
callback && callback(null);
};
};
return {
alert_vmtl_list: alert_vmtl_list
};
};
return {
alert_vmtl_list: alert_vmtl_list
};
};

3
server/sql_cfg.js
View File

@ -132,7 +132,8 @@ module.exports = function (fs, bcrypt, app_cfg) {
waip_wachenname TEXT,
vmtl_typ TEXT,
vmtl_account_name TEXT,
vmtl_account_group TEXT)`);
vmtl_account_group TEXT,
vmtl_history TEXT)`);
// Twitter-Account-Tabelle erstellen
db.run(`CREATE TABLE waip_tw_accounts (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,

4
server/sql_qry.js
View File

@ -120,7 +120,7 @@ module.exports = function (db, app_cfg) {
function db_einsatz_check_history(waip_id, einsatzdaten, socket_id, callback) {
// Prüfen ob Wachalarm bereits in dieser Form an diesen Socket gesendet wurde (Doppelalarmierung vermeiden)
const custom_namespace = '59cc72ec-4ff5-499d-81e2-ec49c1d01252'
const custom_namespace = '59cc72ec-4ff5-499d-81e2-ec49c1d01252';
// neues Object mit Einsatzdaten erstellen
var missiondata = Object.assign({}, einsatzdaten);
// Einsatzdaten in kuzre UUID-Strings umwandeln, diese UUIDs werden dann verglichen
@ -336,7 +336,7 @@ module.exports = function (db, app_cfg) {
// Einsatz loeschen
db.run(`DELETE FROM waip_einsaetze WHERE id = ?`, [id]);
// History loeschen
db.run(`DELETE FROM waip_history WHERE waip_id = ?`, [id]);
db.run(`DELETE FROM waip_history WHERE waip_uuid = (select uuid from waip_einsaetze where id = ?)`, [id]);
};
function db_wache_get_all(callback) {