alarms update
This commit is contained in:
Ivan
parent
f60324de4f
commit
9c6689c538
GPG Key ID:
0C191B86D9582583
163
server.js
163
server.js
@ -103,6 +103,8 @@ async function live(req, res) {
|
||||
User: "Тестовое Имя",
|
||||
ifDBError: false,
|
||||
Registrars: [],
|
||||
Alarms: [],
|
||||
Count: 0,
|
||||
};
|
||||
|
||||
try {
|
||||
@ -115,7 +117,7 @@ async function live(req, res) {
|
||||
});
|
||||
const client = await pool.connect();
|
||||
|
||||
const minuteInMillis = 60 * 1000;
|
||||
const minuteInMillis = 90 * 1000;
|
||||
|
||||
const query = `
|
||||
SELECT id, serial, lastkeepalive FROM registrars ORDER BY id ASC
|
||||
@ -128,7 +130,152 @@ async function live(req, res) {
|
||||
status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
|
||||
}));
|
||||
|
||||
console.log(templateData);
|
||||
const subquery = `
|
||||
SELECT a.id, a.cmdno, a.time, a.serial, a.st, r.plate, g.latitude, g.longitude
|
||||
FROM (
|
||||
SELECT id, cmdno, time, serial, st
|
||||
FROM alarms
|
||||
WHERE alarmtype = 56
|
||||
ORDER BY time DESC
|
||||
LIMIT 100
|
||||
) AS a
|
||||
LEFT JOIN registrars AS r ON a.serial = r.serial
|
||||
LEFT JOIN (
|
||||
SELECT *,
|
||||
ROW_NUMBER() OVER (PARTITION BY serial ORDER BY ABS(EXTRACT(EPOCH FROM (time - $1)))) AS row_num
|
||||
FROM geo
|
||||
) AS g ON a.serial = g.serial AND g.row_num = 1
|
||||
ORDER BY a.time DESC;
|
||||
`;
|
||||
const alarms = await client.query(subquery, [new Date()]); // Pass current date/time to the query for finding the nearest geoposition.
|
||||
|
||||
function formatDate(date) {
|
||||
const options = {
|
||||
year: "2-digit",
|
||||
month: "2-digit",
|
||||
day: "2-digit",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
};
|
||||
const formattedDate = new Date(date).toLocaleString("ru-RU", options);
|
||||
return formattedDate.replace(",", "");
|
||||
}
|
||||
|
||||
(templateData.Alarms = alarms.rows.map((alarm) => {
|
||||
let type;
|
||||
switch (alarm.st) {
|
||||
case "0":
|
||||
type = "Усталость";
|
||||
break;
|
||||
case "1":
|
||||
type = "Водитель пропал";
|
||||
break;
|
||||
case "2":
|
||||
type = "Разговор по телефону";
|
||||
break;
|
||||
case "3":
|
||||
type = "Курение за рулём";
|
||||
break;
|
||||
case "4":
|
||||
type = "Водитель отвлекся";
|
||||
break;
|
||||
case "5":
|
||||
type = "Выезд с полосы движения";
|
||||
break;
|
||||
case "6":
|
||||
type = "!!! Лобовое столкновение";
|
||||
break;
|
||||
case "7":
|
||||
type = "Скорость превышена";
|
||||
break;
|
||||
case "8":
|
||||
type = "Распознавание номерных знаков";
|
||||
break;
|
||||
case "9":
|
||||
type = "!! Маленькое расстояние спереди";
|
||||
break;
|
||||
case "10":
|
||||
type = "Водитель зевает";
|
||||
break;
|
||||
case "11":
|
||||
type = "!!! Столкновение с пешеходом";
|
||||
break;
|
||||
case "12":
|
||||
type = "Проходы переполнены";
|
||||
break;
|
||||
case "13":
|
||||
type = "!! Посадка/высадка вне остановки";
|
||||
break;
|
||||
case "14":
|
||||
type = "!! Смена полосы с нарушением ПДД";
|
||||
break;
|
||||
case "15":
|
||||
type = "! Включенный телефон у водителя";
|
||||
break;
|
||||
case "16":
|
||||
type = "!!! Ремень безопасности";
|
||||
break;
|
||||
case "17":
|
||||
type = "Проверка не удалась";
|
||||
break;
|
||||
case "18":
|
||||
type = "Слепые зоны справа";
|
||||
break;
|
||||
case "19":
|
||||
type = "!!! Заднее столкновение";
|
||||
break;
|
||||
case "20":
|
||||
type = "!!! Управление без рук";
|
||||
break;
|
||||
case "21":
|
||||
type = "!! Управление одной рукой";
|
||||
break;
|
||||
case "22":
|
||||
type = "Очки, блокирующие инфракрасное излучение";
|
||||
break;
|
||||
case "23":
|
||||
type = "Слепые зоны слева";
|
||||
break;
|
||||
case "24":
|
||||
type = "Помехи для пассажиров";
|
||||
break;
|
||||
case "25":
|
||||
type = "На перекрестке ограничена скорость";
|
||||
break;
|
||||
case "26":
|
||||
type = "Обнаружен перекресток";
|
||||
break;
|
||||
case "27":
|
||||
type = "Пешеходы на переходе";
|
||||
break;
|
||||
case "28":
|
||||
type = "! Неучтивое отношение к пешеходам";
|
||||
break;
|
||||
case "29":
|
||||
type = "Обнаружен пешеходный переход";
|
||||
break;
|
||||
case "30":
|
||||
type = "Водитель матерится";
|
||||
break;
|
||||
default:
|
||||
type = "Неизвестный тип";
|
||||
}
|
||||
|
||||
return {
|
||||
id: alarm.id,
|
||||
cmdno: alarm.cmdno,
|
||||
time: formatDate(alarm.time),
|
||||
serial: alarm.serial,
|
||||
st: alarm.st,
|
||||
type: type,
|
||||
plate: alarm.plate,
|
||||
latitude: (alarm.latitude).toFixed(6),
|
||||
longitude: (alarm.longitude).toFixed(6),
|
||||
geo: alarm.latitude + "," + alarm.longitude,
|
||||
};
|
||||
}))
|
||||
|
||||
templateData.Count = templateData.Alarms.length;
|
||||
|
||||
const source = fs.readFileSync("static/templates/live.html", "utf8");
|
||||
const template = handlebars.compile(source);
|
||||
@ -229,6 +376,7 @@ async function reports(req, res) {
|
||||
FROM (
|
||||
SELECT id, cmdno, time, serial, st
|
||||
FROM alarms
|
||||
WHERE alarmtype = 56
|
||||
ORDER BY time DESC
|
||||
LIMIT 100
|
||||
) AS a
|
||||
@ -362,12 +510,11 @@ async function reports(req, res) {
|
||||
st: alarm.st,
|
||||
type: type,
|
||||
plate: alarm.plate,
|
||||
latitude: alarm.latitude,
|
||||
longitude: alarm.longitude,
|
||||
geo: alarm.latitude + "," + alarm.longitude,
|
||||
latitude: (alarm.latitude).toFixed(6),
|
||||
longitude: (alarm.longitude).toFixed(6),
|
||||
geo: (alarm.latitude).toFixed(6) + "," + (alarm.longitude).toFixed(6),
|
||||
};
|
||||
})),
|
||||
console.log(templateData);
|
||||
}))
|
||||
|
||||
const source = fs.readFileSync(
|
||||
"static/templates/reports/index.html",
|
||||
@ -498,7 +645,7 @@ async function devices(req, res) {
|
||||
});
|
||||
const client = await pool.connect();
|
||||
|
||||
const minuteInMillis = 60 * 1000;
|
||||
const minuteInMillis = 90 * 1000;
|
||||
|
||||
// Выполняем запрос, чтобы получить все данные из таблицы registrars
|
||||
const queryRegistrars = `
|
||||
|
||||
@ -119,14 +119,39 @@
|
||||
|
||||
<section class="table" style="position: relative;">
|
||||
<div id="signals-list" class="signals-list">
|
||||
<h1>Сигналы ТС - 17</h1>
|
||||
<h1>Сигналы ТС - {{Count}}</h1>
|
||||
<svg id="left-slider" class="left-slider" xmlns="http://www.w3.org/2000/svg" width="19" height="19" fill="none" viewBox="0 0 11 19">
|
||||
<path fill="#000" fill-opacity=".75" d="M0 9.495c0 .273.101.514.315.722l8.92 8.477a.981.981 0 0 0 .73.295c.585 0 1.035-.427 1.035-.995 0-.285-.124-.525-.304-.711L2.508 9.495l8.188-7.789c.18-.186.304-.437.304-.71C11 .425 10.55 0 9.965 0c-.292 0-.54.098-.73.284L.314 8.773A.955.955 0 0 0 0 9.495Z"/>
|
||||
</svg>
|
||||
<input class="search" type="text" placeholder="Поиск">
|
||||
|
||||
<ul id="list">
|
||||
{{#each Alarms}}
|
||||
<li>
|
||||
<input type="radio" name="signal" id="signal-{{this.id}}" hidden>
|
||||
<label for="signal-{{this.id}}">
|
||||
<h2>{{this.type}}</h2>
|
||||
<span>ID {{this.id}}</span>
|
||||
<p><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14">
|
||||
<path fill="#000" fill-opacity=".75" d="M3.41 7.737h3.583c.268 0 .48-.205.48-.48V2.634a.472.472 0 0 0-.48-.473.466.466 0 0 0-.473.473v4.15H3.41a.467.467 0 0 0-.48.473c0 .275.206.48.48.48ZM7 13.993c3.83 0 7-3.176 7-6.996C14 3.169 10.822 0 6.993 0 3.171 0 0 3.169 0 6.997c0 3.82 3.177 6.996 7 6.996Zm0-1.166a5.804 5.804 0 0 1-5.826-5.83c0-3.238 2.58-5.83 5.82-5.83a5.815 5.815 0 0 1 5.84 5.83A5.81 5.81 0 0 1 7 12.827Z"/>
|
||||
</svg>{{this.time}}</p>
|
||||
<p><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 5 14">
|
||||
<path fill="#000" fill-opacity=".75" d="M0 2.402c0 1.122.792 2.059 1.877 2.32v5.913c0 1.88.353 2.906.62 2.906.273 0 .619-1.02.619-2.906V4.722C4.2 4.467 5 3.524 5 2.402 5 1.083 3.888 0 2.497 0 1.112 0 0 1.083 0 2.402Zm1.784.134c-.46 0-.859-.382-.859-.828 0-.44.4-.816.86-.816.465 0 .851.376.851.816 0 .446-.386.828-.852.828Z"/>
|
||||
</svg>{{this.latitude}},{{this.longitude}}</p>
|
||||
<p class="name"><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 24 19">
|
||||
<path fill="#000" fill-opacity=".75" d="M4.58 6.143c-.078.341.068.478.44.459 1.562-.108 3.418-.196 6.533-.196 3.125 0 4.98.088 6.543.196.361.02.508-.118.43-.46-.235-1.035-.684-2.382-.997-2.92-.254-.439-.537-.634-1.045-.702-.703-.098-2.304-.166-4.931-.166-2.617 0-4.219.068-4.932.166-.508.068-.79.263-1.045.703-.312.537-.752 1.884-.996 2.92Zm-.068 6.65c.888 0 1.572-.684 1.572-1.572 0-.899-.684-1.573-1.572-1.573-.889 0-1.573.674-1.573 1.573 0 .888.684 1.572 1.573 1.572Zm4.463-.39h5.166c.664 0 1.123-.46 1.123-1.133 0-.665-.46-1.123-1.123-1.123H8.975c-.674 0-1.133.458-1.133 1.123 0 .673.459 1.132 1.133 1.132Zm9.619.39c.898 0 1.572-.684 1.572-1.572 0-.899-.674-1.573-1.572-1.573-.889 0-1.563.674-1.563 1.573 0 .888.674 1.572 1.563 1.572Zm-7.041 2.637c3.281 0 7.646-.166 9.492-.381 1.328-.147 2.06-.88 2.06-2.13v-1.718c0-1.65-.332-2.568-1.23-3.74l-.83-1.065c-.352-1.757-1.006-3.603-1.338-4.326C19.18.967 18.174.313 16.875.137 16.221.049 14.082 0 11.553 0 9.033 0 6.895.059 6.24.137 4.941.293 3.926.967 3.408 2.07c-.342.723-.986 2.569-1.347 4.326l-.82 1.065C.331 8.633 0 9.55 0 11.2v1.719c0 1.25.742 1.982 2.06 2.129 1.856.215 6.211.38 9.493.38Zm0-1.28c-3.32 0-7.578-.156-9.15-.351-.83-.098-1.124-.527-1.124-1.27v-1.328c0-1.338.215-1.963.977-2.959l.996-1.308c.264-1.416.898-3.39 1.318-4.288.313-.673.928-1.093 1.817-1.2.625-.079 2.607-.167 5.166-.167 2.568 0 4.58.088 5.146.166.918.117 1.524.537 1.846 1.201.42.899 1.055 2.872 1.308 4.288l1.006 1.308c.752.996.967 1.621.967 2.96v1.327c0 .742-.293 1.172-1.123 1.27-1.562.195-5.83.351-9.15.351Zm-9.756 3.965h1.142c.733 0 1.3-.566 1.3-1.289v-2.324l-3.741-.537v2.861c0 .723.566 1.29 1.299 1.29Zm18.369 0h1.152a1.27 1.27 0 0 0 1.29-1.289v-2.861l-3.731.537v2.324a1.27 1.27 0 0 0 1.289 1.29Z"/>
|
||||
</svg>{{this.serial}}</p>
|
||||
|
||||
<!-- <p class="name"><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 13 14">
|
||||
<path fill="#000" fill-opacity=".75" d="M1.82 14h9.335c1.233 0 1.82-.371 1.82-1.188 0-1.946-2.458-4.761-6.484-4.761C2.458 8.05 0 10.866 0 12.81 0 13.63.587 14 1.82 14Zm-.35-1.121c-.193 0-.274-.053-.274-.208 0-1.218 1.886-3.499 5.295-3.499 3.402 0 5.288 2.28 5.288 3.499 0 .155-.074.208-.267.208H1.47ZM6.492 7.13C8.26 7.13 9.7 5.555 9.7 3.64 9.7 1.737 8.266.244 6.49.244c-1.76 0-3.208 1.523-3.208 3.41C3.29 5.562 4.723 7.13 6.49 7.13Zm0-1.121c-1.084 0-2.012-1.04-2.012-2.355 0-1.292.913-2.287 2.012-2.287 1.107 0 2.013.98 2.013 2.272 0 1.315-.921 2.37-2.013 2.37Z"/>
|
||||
</svg></p>
|
||||
<p class="phone"><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14">
|
||||
<path fill="#000" fill-opacity=".75" d="M10.38 14c1.25 0 2.07-.336 2.792-1.15.057-.056.114-.12.164-.178.428-.478.628-.95.628-1.4 0-.513-.3-.992-.935-1.434l-2.077-1.442c-.643-.443-1.393-.493-1.992.1l-.55.55c-.164.164-.307.17-.464.07-.386-.242-1.164-.92-1.692-1.448-.557-.55-1.092-1.164-1.378-1.614-.093-.164-.086-.3.079-.464l.542-.55c.6-.6.55-1.356.107-1.992L4.162.971C3.72.336 3.242.043 2.727.036c-.45-.007-.92.2-1.4.628-.063.057-.12.107-.178.157C.336 1.549 0 2.371 0 3.605c0 2.042 1.256 4.527 3.562 6.832C5.854 12.73 8.346 14 10.38 14Zm.008-1.1c-1.82.036-4.155-1.363-6.005-3.205-1.863-1.856-3.326-4.27-3.29-6.09.014-.785.292-1.463.849-1.949.05-.043.086-.078.136-.114.214-.186.442-.285.65-.285.206 0 .392.078.527.292L4.64 3.627c.15.221.165.47-.057.692l-.628.628c-.492.493-.457 1.093-.1 1.571.407.55 1.114 1.35 1.664 1.892.542.55 1.406 1.32 1.963 1.735.478.357 1.078.393 1.57-.1l.629-.628c.221-.222.464-.207.692-.065l2.078 1.385a.6.6 0 0 1 .292.536c0 .207-.1.435-.285.65l-.114.135c-.486.557-1.164.828-1.956.843Z"/>
|
||||
</svg></p> -->
|
||||
</label>
|
||||
</li>
|
||||
{{/each}}
|
||||
<!-- <li>
|
||||
<input type="radio" name="signal" id="signal-1" hidden checked>
|
||||
<label for="signal-1">
|
||||
<h2>Водитель отвлекся</h2>
|
||||
@ -258,7 +283,7 @@
|
||||
<path fill="#000" fill-opacity=".75" d="M10.38 14c1.25 0 2.07-.336 2.792-1.15.057-.056.114-.12.164-.178.428-.478.628-.95.628-1.4 0-.513-.3-.992-.935-1.434l-2.077-1.442c-.643-.443-1.393-.493-1.992.1l-.55.55c-.164.164-.307.17-.464.07-.386-.242-1.164-.92-1.692-1.448-.557-.55-1.092-1.164-1.378-1.614-.093-.164-.086-.3.079-.464l.542-.55c.6-.6.55-1.356.107-1.992L4.162.971C3.72.336 3.242.043 2.727.036c-.45-.007-.92.2-1.4.628-.063.057-.12.107-.178.157C.336 1.549 0 2.371 0 3.605c0 2.042 1.256 4.527 3.562 6.832C5.854 12.73 8.346 14 10.38 14Zm.008-1.1c-1.82.036-4.155-1.363-6.005-3.205-1.863-1.856-3.326-4.27-3.29-6.09.014-.785.292-1.463.849-1.949.05-.043.086-.078.136-.114.214-.186.442-.285.65-.285.206 0 .392.078.527.292L4.64 3.627c.15.221.165.47-.057.692l-.628.628c-.492.493-.457 1.093-.1 1.571.407.55 1.114 1.35 1.664 1.892.542.55 1.406 1.32 1.963 1.735.478.357 1.078.393 1.57-.1l.629-.628c.221-.222.464-.207.692-.065l2.078 1.385a.6.6 0 0 1 .292.536c0 .207-.1.435-.285.65l-.114.135c-.486.557-1.164.828-1.956.843Z"/>
|
||||
</svg>+7 999 123 45 67</p>
|
||||
</label>
|
||||
</li>
|
||||
</li> -->
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
@ -604,7 +629,7 @@ setInterval(() => {
|
||||
{{/if}}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
<!-- <script>
|
||||
const panel = document.getElementById('signals-list');
|
||||
const slider = document.getElementById('left-slider');
|
||||
|
||||
@ -613,7 +638,7 @@ setInterval(() => {
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</script> -->
|
||||
|
||||
<script>
|
||||
// Скрытие/Показ дополнительных меню аккаунта
|
||||
|
||||
@ -136,9 +136,9 @@
|
||||
<div id="pagination">
|
||||
<!-- Сюда будут добавляться ссылки для переключения между страницами -->
|
||||
</div>
|
||||
<!-- <br>
|
||||
<br>
|
||||
<br>
|
||||
<span style="opacity:50%">Временное ограничение: 100 последних предупреждений</span>
|
||||
<span style="opacity:50%">Временное ограничение: 100 последних предупреждений</span> -->
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user