rozenrod/Sheep-Service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Додана сторінка "Стенд"

Browse Source 
Додане повідомлення про оновлення застосунку
Оновлен Service Worker
Перероблен WebSocket APІ
This commit is contained in:
Rozenrod
2025-10-19 00:55:30 +03:00
parent 6ec6523d71
commit 3f08f3f6c9
46 changed files with 2651 additions and 2691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/services/homesteads.service.js
View File

@@ -1,7 +1,7 @@
const db = require("../config/db");
class HomesteadsService {
getList(group, sheepName) {
getList(mode, id) {
return new Promise((res, rej) => {
let sql = `
SELECT
@@ -17,7 +17,7 @@ class HomesteadsService {
homestead
`;
if (group != "0" && !sheepName) {
if (mode == "group") {
sql = `
SELECT
homestead.*,
@@ -39,11 +39,9 @@ class HomesteadsService {
AND
homestead_history.name = 'Групова'
AND
homestead_history.group_id == '${group}'
homestead_history.group_id = '${id}'
`;
}
if (sheepName) {
} else if (mode == "sheep" || mode == "admin") {
sql = `
SELECT
homestead.*,
@@ -63,7 +61,7 @@ class HomesteadsService {
AND
homestead_history.working = 1
AND
homestead_history.name = '${sheepName}';
homestead_history.sheep_id = '${id}';
`;
}

14
api/services/houses.service.js
View File

@@ -45,7 +45,7 @@ class HousesService {
"history": {
"id": row.entrance_history_id ? Number(row.entrance_history_id) : null,
"name": row.entrance_history_name,
"group_id": row.entrance_history_group_id ? Number(row.entrance_history_group_id) : null,
"group_id": row.entrance_history_group_id ? Number(row.entrance_history_group_id) : null,
"sheep_id": row.entrance_history_sheep_id ? Number(row.entrance_history_sheep_id) : null,
"date": {
"start": row.entrance_history_date_start ? Number(row.entrance_history_date_start) : null,
@@ -61,7 +61,7 @@ class HousesService {
});
}
getList(group, sheepName) {
getList(mode, id) {
return new Promise((res, rej) => {
let sql = `
SELECT
@@ -72,7 +72,7 @@ class HousesService {
house
`;
if (group != "0" && !sheepName) {
if (mode == "group") {
sql = `
SELECT DISTINCT
house.*,
@@ -89,11 +89,9 @@ class HousesService {
AND
entrance_history.name = 'Групова'
AND
entrance_history.group_id == '${group}'
entrance_history.group_id = '${id}'
`;
}
if (sheepName) {
} else if (mode == "sheep" || mode == "admin") {
sql = `
SELECT DISTINCT
house.*,
@@ -108,7 +106,7 @@ class HousesService {
WHERE
entrance_history.working = 1
AND
entrance_history.name = '${sheepName}'
entrance_history.sheep_id = '${id}'
`;
}

73
api/services/stand.service.js
View File

@@ -4,7 +4,34 @@ const db = require("../config/db");
class StandService {
getStand(id) {
return new Promise((res, rej) => {
return res({ id });
const sql = `SELECT * FROM stand_list WHERE id = ?`;
db.get(sql, [id], (err, row) => {
if (err) {
console.error(err.message);
return res(false);
}
if (!row) {
console.log({ error: "id not found" });
return res(false);
}
let data = {
"id": Number(row.id),
"title": row.title,
"geo": JSON.parse(row.geo),
"hour_start": Number(row.hour_start),
"hour_end": Number(row.hour_end),
"quantity_sheep": Number(row.quantity_sheep),
"week_days": JSON.parse(row.week_days),
"processing_time": Number(row.processing_time),
"status": row.status == 1 ? true : false,
"updated_at": Number(row.updated_at)
}
return res(data);
});
});
}
@@ -165,7 +192,7 @@ class StandService {
if (row && row.max_date) {
date_start = getNextMonday(row.max_date); // заменить начальную дату
} else {
date_start = getNextMonday(Date.now()); // заменить начальную дату
date_start = getNextMonday(Date.now()); // заменить начальную дату
}
// 3. Генерация новых записей
@@ -206,7 +233,7 @@ class StandService {
console.error(err.message);
return res(false);
}
res({ status: "ok", inserted: list.length });
res({ status: "ok", inserted: list.length});
});
}
);
@@ -214,9 +241,45 @@ class StandService {
});
}
getScheduleList(data) {
getScheduleList(stand_id) {
return new Promise((res, rej) => {
return res({ data });
const sql = `
SELECT
ss.*,
s.name AS sheep_name
FROM
stand_schedule AS ss
LEFT JOIN
sheeps AS s
ON
s.id = ss.sheep_id
WHERE
ss.stand_id = ?
ORDER BY
ss.id;
`;
db.all(sql, [stand_id], (err, rows) => {
if (err) {
console.error(err.message);
return res(false);
} else {
let data = rows.map((row) => {
return {
"id": Number(row.id),
"stand_id": Number(row.stand_id),
"date": Number(row.date),
"hour": Number(row.hour),
"sheep_id": Number(row.sheep_id),
"sheep_name": row.sheep_name,
"number_sheep": Number(row.number_sheep),
"updated_at": Number(row.updated_at)
}
})
return res(data);
}
});
});
}