KRBL/ArgusSite
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

live and export fix

Browse Source
This commit is contained in:
Ivan 2024-01-09 13:18:42 +03:00
parent fb53bddd37
commit e602828d5d
Signed by untrusted user who does not match committer: ppechenkoo
GPG Key ID: 0C191B86D9582583
3 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server.js
View File

@ -138,17 +138,17 @@ app.post("/videos/restart", async (req, res) => {
});
});
// const DB_User = process.env.DB_USER;
// const DB_Password = process.env.DB_PASSWORD;
// const DB_Host = process.env.DB_HOST;
// const DB_Port = process.env.DB_PORT;
// const DB_Name = process.env.DB_NAME;
const DB_User = process.env.DB_USER;
const DB_Password = process.env.DB_PASSWORD;
const DB_Host = process.env.DB_HOST;
const DB_Port = process.env.DB_PORT;
const DB_Name = process.env.DB_NAME;
const DB_User = "postgres";
const DB_Password = process.env.POSTGRES_PASSWORD;
const DB_Host = "postgres";
const DB_Port = "5432";
const DB_Name = "postgres";
// const DB_User = "postgres";
// const DB_Password = process.env.POSTGRES_PASSWORD;
// const DB_Host = "postgres";
// const DB_Port = "5432";
// const DB_Name = "postgres";
async function index(req, res) {
if (req.session.userId === undefined) {
@ -4993,7 +4993,7 @@ async function videoExport(req, res) {
// Выполняем запрос, чтобы получить все данные из таблицы registrars
const queryRegistrars = `
SELECT id, serial, channels, lastkeepalive, "group", name, plate, sim, ip, port, number
SELECT id, serial, channels, lastkeepalive, "group", name, plate, sim, ip, port, number, our_registrator
FROM registrars ${!templateData.isAdmin ? "WHERE serial = ANY($1)" : ""}
ORDER BY id
`;
@ -5022,6 +5022,7 @@ async function videoExport(req, res) {
ip: registrar.ip,
port: registrar.port,
number: registrar.number,
ourreg: registrar.our_registrator,
});
});
@ -5037,6 +5038,7 @@ async function videoExport(req, res) {
sim: registrar.sim,
ip: registrar.ip,
port: registrar.port,
ourreg: registrar.our_registrator,
}));
templateData.Groups = Object.keys(groupedRegistrars).map((groupName) => ({

44
static/templates/live.html
View File

@ -407,33 +407,33 @@
flvPlayers.push(flvPlayer);
let hasStarted = false;
// let hasStarted = false;
const checkStarted = () => {
if (!hasStarted && videoElement.readyState >= 2) {
hasStarted = true;
console.log(`Трансляция началась для камеры ${i}`);
}
};
const checkInterval = setInterval(checkStarted, 1000);
setTimeout(() => {
clearInterval(checkInterval);
if (!hasStarted) {
console.log(`Трансляция для камеры ${i} не началась, запрашиваем повторно...`);
flvPlayer.unload();
flvPlayer.load();
flvPlayer.play();
// if (i > 0) {
// i--;
// const checkStarted = () => {
// if (!hasStarted && videoElement.readyState >= 2) {
// hasStarted = true;
// console.log(`Трансляция началась для камеры ${i}`);
// }
}
}, 3000);
// };
// const checkInterval = setInterval(checkStarted, 10000);
// setTimeout(() => {
// clearInterval(checkInterval);
// if (!hasStarted) {
// console.log(`Трансляция для камеры ${i} не началась, запрашиваем повторно...`);
// flvPlayer.unload();
// flvPlayer.load();
// flvPlayer.play();
// // if (i > 0) {
// // i--;
// // }
// }
// }, 10000);
videoElementIndex++;
await new Promise(resolve => setTimeout(resolve, 2000));
await new Promise(resolve => setTimeout(resolve, 3000));
}
}

16
static/templates/videos/export.html
View File

@ -127,6 +127,7 @@
<img>
<input type="number" id="channels-{{this.serial}}" value="{{this.channels}}" hidden>
<input type="radio" name="camera-serial" id="radio-{{this.serial}}" class="radio-input" value="{{this.serial}}" hidden>
<input type="text" id="ourreg-{{this.serial}}" value="{{this.ourreg}}" hidden>
<label for="radio-{{this.serial}}" class="radio-label active-{{this.status}}">
{{#if this.number}}
{{this.number}}
@ -873,13 +874,20 @@ endVideoTimeInput.addEventListener("blur", sendPostRequest);
alert('Пожалуйста, выберите камеру из списка.');
return;
}
if (videoTimeInput.value > endVideoTimeInput.value) {
alert('Конечное время не может быть больше начального.');
return;
}
const serial = selectedDevice.value;
if ($(`#ourreg-${serial}`).val() == "true") {
} else {
if (!HasData) {
alert('Пожалуйста, выберите другой временной период.');
return;
}
if (videoTimeInput.value > endVideoTimeInput.value) {
alert('Конечное время не может быть больше начального.');
return;
}
document.getElementById("exportLoading").style.display = 'flex';
@ -900,8 +908,6 @@ endVideoTimeInput.addEventListener("blur", sendPostRequest);
const resData = await finalResponse.json();
const serial = selectedDevice.value;
const url = `http://localhost:8081/export?url=https%3A%2F%2F{{VIRTUAL_HOST}}%2Fhttp%2Fdownload.flv%3Fserial%3D${serial}%26channel%3D${channel}%26queryTime%3D${selectedDate}%26startTime%3D${startTime}%26endTime%3D${endTime}%26recordID%3D${resData.dataId}`;
document.getElementById("exportLoading").style.display = 'none';
window.open(url, '_blank');