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

update Mi 17. Jun 12:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-17 12:31:01 +02:00
parent cb4392e2d9
commit 5c76906b02
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/sql_qry.js
View File

@ -848,21 +848,27 @@ module.exports = function (db, app_cfg) {
var uuid_vmlt_history = uuidv5(data.uuid + data.einsatzart + data.stichwort + data.name_wache + data.list, custom_namespace); var uuid_vmlt_history = uuidv5(data.uuid + data.einsatzart + data.stichwort + data.name_wache + data.list, custom_namespace);
db.get(`select tw.tw_screen_name, tw.tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, we.stichwort, wa.name_wache
from waip_tw_accounts tw, waip_einsaetze we, waip_wachen wa // Abfrage ob zu Socket und Waip-ID bereits History-Daten hinterlegt sind
where tw.tw_screen_name = ? AND we.id = ? AND wa.name_wache like ?`, [list_data.vmtl_account_name, list_data.waip_id, list_data.waip_wachenname], function (err, vmtl_daten) { db.get('select vmtl_history from waip_vmtl where vmtl_history like ?', [uuid_vmlt_history], function (err, row) {
if (err == null && vmtl_daten) { // uuid_einsatz_grunddaten, uuid_em_alarmiert, uuid_em_weitere
// Listen-Name zu Daten hinzufuegen if (err == null && row) {
vmtl_daten.list = list_data.vmtl_account_group; // Liste wurde bereits zu diesem Einsatz beschickt
callback && callback(vmtl_daten); callback && callback(true);
} else { } else {
callback && callback(null); // wenn keine History-Daten hinterlegt sind, diese speichern
}; db.run(`UPDATE waip_vmtl
}); SET
vmtl_history=\'` + uuid_vmlt_history + `\'
WHERE waip_wachenname like \'` + socket_id + `\'
AND vmtl_typ
AND vmtl_account_name
AND vmtl_account_group`);
// callback History = false
callback && callback(false);
};
}; };
function db_export_get_for_rmld(arry_wachen, callback) { function db_export_get_for_rmld(arry_wachen, callback) {
// saubere String-Werte erstellen // saubere String-Werte erstellen
arry_wachen = arry_wachen.map(String); arry_wachen = arry_wachen.map(String);