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

update Do 28. Mai 16:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-05-28 16:31:01 +02:00
parent 34b7918469
commit 28c2f07409
4 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/api.js
View File

@ -26,7 +26,7 @@ module.exports = function (io, sql, app_cfg, waip) {
});
// neue externe Rueckmeldung speichern
socket.on('new_rmld', function (data) {
sql.db_save_rmld(data, function (result) {
sql.db_rmld_save(data, function (result) {
if (result) {
waip.rmld_verteilen_by_uuid(data.waip_uuid, data.rmld_uuid);
sql.db_log('API', 'Rückmeldung von ' + remote_ip + ' gespeichert: ' + data);

12
server/routing.js
View File

@ -97,7 +97,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// Einstellungen anzeigen
app.get('/config', auth.ensureAuthenticated, function (req, res) {
sql.db_get_userconfig(req.user.id, function (data) {
sql.db_user_get_config(req.user.id, function (data) {
res.render('user/user_config', {
public: app_cfg.public,
title: 'Einstellungen',
@ -109,7 +109,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// Einstellungen speichern
app.post('/config', auth.ensureAuthenticated, function (req, res) {
sql.db_set_userconfig(req.user.id, req.body.set_reset_counter, function (data) {
sql.db_user_set_config(req.user.id, req.body.set_reset_counter, function (data) {
res.redirect('/config');
});
});
@ -210,7 +210,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
var rmld_uuid = req.params.rmld_uuid;
sql.db_get_einsatzdaten_by_uuid(waip_uuid, function (einsatzdaten) {
if (einsatzdaten) {
sql.db_check_permission(req.user, einsatzdaten.id, function (valid) {
sql.db_user_check_permission(req.user, einsatzdaten.id, function (valid) {
if (!valid) {
delete einsatzdaten.objekt;
delete einsatzdaten.besonderheiten;
@ -240,7 +240,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
app.post('/rmld/:waip_uuid/:rmld_uuid', function (req, res) {
var waip_uuid = req.body.waip_uuid;
var rmld_uuid = req.body.rmld_uuid;
sql.db_save_rmld(req.body, function (result) {
sql.db_rmld_save(req.body, function (result) {
if (result) {
req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!');
res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid);
@ -282,7 +282,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// Logdatei
app.get('/adm_show_log', auth.ensureAdmin, function (req, res) {
sql.db_get_log(function (data) {
sql.db_log_get_all(function (data) {
res.render('admin/adm_show_log', {
public: app_cfg.public,
title: 'Log-Datei',
@ -308,7 +308,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// Benutzer editieren
app.get('/adm_edit_users', auth.ensureAdmin, function (req, res) {
sql.db_get_users(function (data) {
sql.db_user_get_all(function (data) {
res.render('admin/adm_edit_users', {
public: app_cfg.public,
title: 'Benutzer und Rechte verwalten',

97
server/sql_qry.js
View File

@ -375,7 +375,7 @@ module.exports = function (db, uuidv4, app_cfg) {
};
};
function db_get_socket_by_id(content, callback) {
function db_socket_get_by_id(content, callback) {
db.get('select * from waip_clients where socket_id = ? ', [content], function (err, row) {
if (err == null && row) {
callback && callback(row);
@ -463,7 +463,7 @@ module.exports = function (db, uuidv4, app_cfg) {
)`);
};
function db_get_log(callback) {
function db_log_get_all(callback) {
db.all(`select * from waip_log order by id desc LIMIT 5000`, function (err, rows) {
if (err == null && rows) {
callback && callback(rows);
@ -501,7 +501,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_get_users(callback) {
function db_user_get_all(callback) {
db.all('SELECT id, user, permissions, ip_address FROM waip_users', function (err, rows) {
if (err == null && rows) {
callback && callback(rows);
@ -511,7 +511,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_check_permission(user_obj, waip_id, callback) {
function db_user_check_permission(user_obj, waip_id, callback) {
if (user_obj && user_obj.permissions) {
if (user_obj.permissions == 'admin') {
callback && callback(true);
@ -539,7 +539,7 @@ module.exports = function (db, uuidv4, app_cfg) {
};
};
function db_get_userconfig(user_id, callback) {
function db_user_get_config(user_id, callback) {
db.get(`SELECT reset_counter FROM waip_user_config
WHERE user_id = ?`, [user_id], function (err, row) {
if (err == null && row) {
@ -550,7 +550,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_set_userconfig(user_id, reset_counter, callback) {
function db_user_set_config(user_id, reset_counter, callback) {
// reset_counter validieren, ansonsten default setzen
if (!(reset_counter >= 1 && reset_counter <= app_cfg.global.time_to_delete_waip)) {
reset_counter = app_cfg.global.default_time_for_standby;
@ -569,7 +569,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_get_sockets_to_standby(callback) {
function db_socket_get_all_to_standby(callback) {
db.all(`select socket_id from waip_clients
where reset_timestamp < DATETIME(\'now\')`, function (err, rows) {
if (err == null && rows) {
@ -580,7 +580,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_save_rmld(responseobj, callback) {
function db_rmld_save(responseobj, callback) {
// Rueckmeldung aufarbeiten
var reuckmeldung = {};
@ -668,7 +668,7 @@ module.exports = function (db, uuidv4, app_cfg) {
};
function db_get_response_for_wache(waip_einsaetze_id, wachen_nr, callback) {
function db_rmld_get_fuer_wache(waip_einsaetze_id, wachen_nr, callback) {
db.all(`SELECT * FROM waip_response WHERE waip_uuid = (select uuid from waip_einsaetze where id = ?)`, [waip_einsaetze_id], function (err, rows) {
if (err == null && rows) {
@ -726,7 +726,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_get_single_response_by_rmlduuid(rmld_uuid, callback) {
function db_rmld_get_by_rmlduuid(rmld_uuid, callback) {
db.all(`SELECT * FROM waip_response WHERE rmld_uuid like ?`, [rmld_uuid], function (err, row) {
if (err == null && row) {
console.log('single_rmld_uuid ' + row);
@ -800,7 +800,7 @@ module.exports = function (db, uuidv4, app_cfg) {
});
};
function db_get_vmtl_list(waip_id, callback) {
function db_vmtl_get_list(waip_id, callback) {
// Pruefen ob fuer eine Wache in diesem Einsatz ein Twitter-Account mit Liste hinterlegt ist
db.get(`select t.waip_wachen_id, t.tw_account_id, t.tw_account_list from waip_vmlt_tw_wachen t
where waip_wachen_id = (select distinct w.id wachen_id from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache
@ -831,41 +831,58 @@ module.exports = function (db, uuidv4, app_cfg) {
db_einsatz_speichern: db_einsatz_speichern,
db_einsatz_laden: db_einsatz_laden,
db_einsatz_ermitteln: db_einsatz_ermitteln,
db_wache_vorhanden: db_wache_vorhanden,
db_einsatz_uuid_vorhanden: db_einsatz_uuid_vorhanden,
db_wache_id_ermitteln: db_wache_id_ermitteln,
db_get_einsatzdaten: db_get_einsatzdaten,
db_get_einsatz_rooms: db_get_einsatz_rooms,
db_get_alle_wachen: db_get_alle_wachen,
db_einsatz_loeschen: db_einsatz_loeschen,
db_get_alte_einsaetze: db_get_alte_einsaetze,
db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid,
db_get_einsatz_rooms: db_get_einsatz_rooms,
db_client_delete: db_client_delete,
db_tts_einsatzmittel: db_tts_einsatzmittel,
db_get_socket_by_id: db_get_socket_by_id,
db_einsatz_uuid_vorhanden: db_einsatz_uuid_vorhanden,
db_get_einsatzdaten: db_get_einsatzdaten,
db_get_waipid_by_uuid: db_get_waipid_by_uuid,
db_get_active_waips: db_get_active_waips,
db_get_alle_wachen: db_get_alle_wachen,
db_wache_vorhanden: db_wache_vorhanden,
db_wache_id_ermitteln: db_wache_id_ermitteln,
db_einsatz_loeschen: db_einsatz_loeschen,
db_update_client_status: db_update_client_status,
db_get_active_clients: db_get_active_clients,
db_client_delete: db_client_delete,
db_tts_einsatzmittel: db_tts_einsatzmittel,
db_check_client_waipid: db_check_client_waipid,
db_log: db_log,
db_get_log: db_get_log,
db_get_active_clients: db_get_active_clients,
db_get_active_waips: db_get_active_waips,
db_get_users: db_get_users,
db_check_permission: db_check_permission,
db_get_userconfig: db_get_userconfig,
db_set_userconfig: db_set_userconfig,
db_get_sockets_to_standby: db_get_sockets_to_standby,
db_log_get_all: db_log_get_all,
db_save_rmld: db_save_rmld,
db_get_response_for_wache: db_get_response_for_wache,
db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid,
db_get_waipid_by_uuid: db_get_waipid_by_uuid,
db_get_single_response_by_rmlduuid,
db_get_single_response_by_rmlduuid,
db_get_vmtl_list: db_get_vmtl_list
db_socket_get_by_id: db_socket_get_by_id,
db_socket_get_all_to_standby: db_socket_get_all_to_standby,
db_user_set_config: db_user_set_config,
db_user_get_config: db_user_get_config,
db_user_get_all: db_user_get_all,
db_user_check_permission: db_user_check_permission,
db_rmld_save: db_rmld_save,
db_rmld_get_fuer_wache: db_rmld_get_fuer_wache,
db_rmld_get_by_rmlduuid: db_rmld_get_by_rmlduuid,
db_vmtl_get_list: db_vmtl_get_list
};
};
@ -884,7 +901,7 @@ db_list_wachen: db_list_wachen,
db_client_save: db_client_save,
function db_get_response_gesamter_einsatz(waip_einsaetze_id, callback) {

14
server/waip.js
View File

@ -26,7 +26,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
};
});
// pruefen ob für die beteiligten Wachen eine Verteiler-Liste hinterlegt ist, falls ja, Rueckmeldungs-Link senden
sql.db_get_vmtl_list(waip_id, function (vmtl_data) {
sql.db_vmtl_get_list(waip_id, function (vmtl_data) {
if (vmtl_data) {
brk.alert_vmtl_list(vmtl_data, function (result) {
if (!result) {
@ -49,7 +49,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
sql.db_get_einsatzdaten(waip_id, wachen_nr, user_obj.id, function (einsatzdaten) {
if (einsatzdaten) {
// Berechtigung ueberpruefen
sql.db_check_permission(user_obj, waip_id, function (valid) {
sql.db_user_check_permission(user_obj, waip_id, function (valid) {
if (!valid) {
einsatzdaten.objekt = '';
einsatzdaten.besonderheiten = '';
@ -92,7 +92,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
if (typeof room_sockets !== 'undefined') {
Object.keys(room_sockets.sockets).forEach(function (socket_id) {
// wenn Raum zum Einsatz aufgerufen ist, dann Rueckmeldung aus DB laden und an diesen versenden
sql.db_get_single_response_by_rmlduuid(rmld_uuid, function (rmld_obj) {
sql.db_rmld_get_by_rmlduuid(rmld_uuid, function (rmld_obj) {
if (rmld_obj) {
// Rückmeldung an Clients/Räume senden, wenn richtiger Einsatz angezeigt wird
sql.db_check_client_waipid(socket_id, waip_id, function (same_id) {
@ -135,7 +135,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
function rmld_verteilen_for_one_client(waip_id, socket, wachen_id) {
if (typeof socket !== 'undefined') {
sql.db_get_response_for_wache(waip_id, wachen_id, function (rmld_obj) {
sql.db_rmld_get_fuer_wache(waip_id, wachen_id, function (rmld_obj) {
if (rmld_obj) {
// Rueckmeldung nur an den einen Socket senden
socket.emit('io.response', rmld_obj);
@ -263,7 +263,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
// Aufräumen (alle 10 Sekunden)
setInterval(function () {
// alle User-Einstellungen prüfen und ggf. Standby senden
sql.db_get_sockets_to_standby(function (socket_ids) {
sql.db_socket_get_all_to_standby(function (socket_ids) {
if (socket_ids) {
socket_ids.forEach(function (row) {
var socket = io.of('/waip').connected[row.socket_id];
@ -313,7 +313,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
fs.readdirSync(process.cwd() + app_cfg.global.soundpath).forEach(file => {
// nur die mp3s von alten clients loeschen
if (file.substring(0, 4) != 'bell' && file.substring(file.length - 3) == 'mp3' && file.substring(file.length - 8) != '_tmp.mp3') {
sql.db_get_socket_by_id(file.substring(0, file.length - 4), function (data) {
sql.db_socket_get_by_id(file.substring(0, file.length - 4), function (data) {
if (!data) {
fs.unlink(process.cwd() + app_cfg.global.soundpath + file, function (err) {
if (err) return sql.db_log('Fehler-WAIP', err);
@ -329,7 +329,7 @@ module.exports = function (io, sql, brk, async, app_cfg) {
console.log(JSON.stringify(dbrd_uuid));
sql.db_get_einsatzdaten_by_uuid(dbrd_uuid, function(einsatzdaten) {
if (einsatzdaten) {
sql.db_check_permission(socket.request.user, einsatzdaten.id, function(valid) {
sql.db_user_check_permission(socket.request.user, einsatzdaten.id, function(valid) {
if (!valid) {
delete einsatzdaten.objekt;
delete einsatzdaten.besonderheiten;