master^2
Bhaskar 6 months ago
parent 7d52f1ab91
commit 24295e24a8

@ -1018,41 +1018,42 @@ exports.getMasterSlaveSummary = async (req, reply) => {
// Update connection status and timestamps // Update connection status and timestamps
const updateStatusPromises = allDevices.map(async device => { const updateStatusPromises = allDevices.map(async device => {
let checkHardwareId = device.hardwareId?.trim(); let checkHardwareId;
if (!checkHardwareId) return;
if (device.type === 'master') {
// For slave, check connection via master's hardwareId (i.e., connected_to) checkHardwareId = device.hardwareId?.trim();
if (device.type === 'slave') { } else if (device.type === 'slave') {
checkHardwareId = device.connected_to?.trim(); checkHardwareId = device.hardwareId?.trim(); // Use slave's own hardwareId
if (!checkHardwareId) return;
} }
if (!checkHardwareId) return;
const latestData = await IotData.findOne({ hardwareId: checkHardwareId }) const latestData = await IotData.findOne({ hardwareId: checkHardwareId })
.sort({ date: -1 }) .sort({ date: -1 })
.lean(); .lean();
let status = "disconnected"; let status = "disconnected";
let updateFields = {}; const updateFields = {};
if (latestData?.date) { if (latestData?.date) {
const now = moment(); const now = moment();
const lastSeen = moment(latestData.date); const lastSeen = moment(latestData.date);
const diff = now.diff(lastSeen, 'minutes'); const diff = now.diff(lastSeen, 'minutes');
if (diff <= 10) { if (diff <= 10) {
status = "connected"; status = "connected";
const indiaTime = moment.tz(latestData.date, "Asia/Kolkata"); const indiaTime = moment.tz(latestData.date, "Asia/Kolkata");
const date = indiaTime.format("YYYY-MM-DD"); const date = indiaTime.format("YYYY-MM-DD");
const time = indiaTime.format("HH:mm:ss"); const time = indiaTime.format("HH:mm:ss");
if (device.type === 'master') { if (device.type === 'master') {
updateFields.connected_gsm_date = date; updateFields.connected_gsm_date = date;
updateFields.connected_gsm_time = time; updateFields.connected_gsm_time = time;
device.connected_gsm_date = date; device.connected_gsm_date = date;
device.connected_gsm_time = time; device.connected_gsm_time = time;
} }
if (device.type === 'slave') { if (device.type === 'slave') {
updateFields.connected_lora_date = date; updateFields.connected_lora_date = date;
updateFields.connected_lora_time = time; updateFields.connected_lora_time = time;
@ -1061,11 +1062,13 @@ exports.getMasterSlaveSummary = async (req, reply) => {
} }
} }
} }
updateFields.connected_status = status; updateFields.connected_status = status;
await Insensors.updateOne({ _id: device._id }, { $set: updateFields }); await Insensors.updateOne({ _id: device._id }, { $set: updateFields });
device.connected_status = status; device.connected_status = status;
}); });
await Promise.all(updateStatusPromises); await Promise.all(updateStatusPromises);

Loading…
Cancel
Save