Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
master^2
Bhaskar 6 months ago
parent 205c892738
commit c25d1635f1
1 changed files with 265 additions and 79 deletions
Show Stats Download Patch File Download Diff File

342
src/controllers/installationController.js
Unescape View File

@ -1035,116 +1035,302 @@ exports.mastrerList = async (req, reply) => {
// } // }
// exports.getMasterSlaveSummary = async (req, reply) => {
// try {
// const { customerId } = req.params;
// if (!customerId) {
// return reply.status(400).send({ message: "Missing customerId" });
// }
// const allDevices = await Insensors.find({ customerId });
// const masters = allDevices.filter(device => device.type === 'master');
// const slaves = allDevices.filter(device => device.type === 'slave');
// const enrichDeviceWithTimestamp = async (device) => {
// const hardwareId = device.hardwareId?.trim();
// if (!hardwareId) return device.toObject();
// const latestData = await IotData.findOne({ hardwareId }).sort({ date: -1 }).lean();
// const enriched = device.toObject();
// if (latestData?.date) {
// const indiaTime = moment.tz(latestData.date, "Asia/Kolkata");
// const date = indiaTime.format("DD-MM-YYYY");
// const time = indiaTime.format("HH:mm:ss");
// const now = moment.tz("Asia/Kolkata");
// const diffInMinutes = now.diff(indiaTime, "minutes");
// const isGSMConnected = diffInMinutes <= 1;
// const gsmStatus = isGSMConnected ? "connected" : "disconnected";
// if (device.type === 'master') {
// enriched.connected_gsm_date = date;
// enriched.connected_gsm_time = time;
// enriched.gsm_connected_status = gsmStatus;
// enriched.gsm_last_check_time = indiaTime.format("YYYY-MM-DD HH:mm:ss");
// }
// }
// if (latestData?.tanks && Array.isArray(latestData.tanks)) {
// const enrichedTanks = latestData.tanks.map(tank => {
// const tankMoment = moment.tz(tank.date, "Asia/Kolkata");
// const tankDiff = moment.tz("Asia/Kolkata").diff(tankMoment, "minutes");
// const loraStatus = tankDiff <= 1 ? "connected" : "disconnected";
// return {
// ...tank,
// connected_status: loraStatus
// };
// });
// enriched.tanks = enrichedTanks;
// if (device.type === 'slave') {
// const connectedTank = enrichedTanks.find(tank => tank.tankhardwareId === device.hardwareId);
// enriched.lora_connected_status = connectedTank ? connectedTank.connected_status : "disconnected";
// enriched.connected_lora_date = connectedTank ? moment(connectedTank.date).tz("Asia/Kolkata").format("DD-MM-YYYY") : null;
// enriched.connected_lora_time = connectedTank ? connectedTank.time : null;
// enriched.lora_last_check_time = connectedTank ? moment(connectedTank.date).tz("Asia/Kolkata").format("YYYY-MM-DD HH:mm:ss") : null;
// }
// }
// if (device.type === 'slave') {
// delete enriched.connected_gsm_date;
// delete enriched.connected_gsm_time;
// delete enriched.gsm_connected_status;
// delete enriched.gsm_last_check_time;
// }
// if (device.type === 'master') {
// delete enriched.connected_lora_date;
// delete enriched.connected_lora_time;
// delete enriched.lora_connected_status;
// delete enriched.lora_last_check_time;
// delete enriched.tanks; // ✅ Remove tanks for master
// }
// return enriched;
// };
// const enrichedMasters = await Promise.all(masters.map(enrichDeviceWithTimestamp));
// const enrichedSlaves = await Promise.all(slaves.map(enrichDeviceWithTimestamp));
// const masterSummary = enrichedMasters.map(master => {
// const connectedSlaves = enrichedSlaves.filter(slave => slave.connected_to === master.connected_to);
// return {
// ...master,
// connected_slave_count: connectedSlaves.length,
// connected_slaves: connectedSlaves
// };
// });
// return reply.send({
// status_code: 200,
// message: "Success",
// master_count: enrichedMasters.length,
// slave_count: enrichedSlaves.length,
// data: masterSummary
// });
// } catch (err) {
// console.error("Error in getMasterSlaveSummary:", err);
// return reply.status(500).send({
// status_code: 500,
// message: "Internal Server Error"
// });
// }
// };
// exports.getMasterSlaveSummary = async (req, reply) => {
// try {
// const { customerId } = req.params;
// if (!customerId) {
// return reply.status(400).send({ message: "Missing customerId" });
// }
// const allDevices = await Insensors.find({ customerId });
// const masters = allDevices.filter(d => d.type === 'master');
// const slaves = allDevices.filter(d => d.type === 'slave');
// const enrichDevice = async (device) => {
// const enriched = device.toObject();
// const hardwareId = device.hardwareId?.trim();
// if (!hardwareId) return enriched;
// // Fetch latest IotData blindly for this device
// const latestData = await IotData.findOne({ hardwareId }).sort({ date: -1 }).lean();
// if (latestData?.date) {
// const indiaTime = moment.tz(latestData.date, "Asia/Kolkata");
// const now = moment.tz("Asia/Kolkata");
// const diffMins = now.diff(indiaTime, "minutes");
// const isConnected = diffMins <= 1;
// enriched.connected_gsm_date = indiaTime.format("DD-MM-YYYY");
// enriched.connected_gsm_time = indiaTime.format("HH:mm:ss");
// enriched.gsm_connected_status = isConnected ? "connected" : "disconnected";
// enriched.gsm_last_check_time = indiaTime.format("YYYY-MM-DD HH:mm:ss");
// }
// // Only apply LoRa logic for slaves
// if (device.type === 'slave' && latestData?.tanks?.length) {
// const matchingTank = latestData.tanks.find(
// tank => tank.tankhardwareId?.trim() === hardwareId
// );
// if (matchingTank) {
// const loraTime = moment.tz(matchingTank.date, "Asia/Kolkata");
// const loraDiff = moment.tz("Asia/Kolkata").diff(loraTime, "minutes");
// const isLoraConnected = loraDiff <= 1;
// enriched.connected_lora_date = loraTime.format("DD-MM-YYYY");
// enriched.connected_lora_time = matchingTank.time;
// enriched.lora_connected_status = isLoraConnected ? "connected" : "disconnected";
// enriched.lora_last_check_time = loraTime.format("YYYY-MM-DD HH:mm:ss");
// } else {
// enriched.connected_lora_date = null;
// enriched.connected_lora_time = null;
// enriched.lora_connected_status = "disconnected";
// enriched.lora_last_check_time = null;
// }
// }
// // Remove irrelevant fields
// if (device.type === 'slave') {
// delete enriched.tanks;
// }
// if (device.type === 'master') {
// delete enriched.connected_lora_date;
// delete enriched.connected_lora_time;
// delete enriched.lora_connected_status;
// delete enriched.lora_last_check_time;
// delete enriched.tanks;
// }
// return enriched;
// };
// const enrichedMasters = await Promise.all(masters.map(enrichDevice));
// const enrichedSlaves = await Promise.all(slaves.map(enrichDevice));
// const masterSummary = enrichedMasters.map(master => {
// const connectedSlaves = enrichedSlaves.filter(
// slave => slave.connected_to === master.connected_to
// );
// return {
// ...master,
// connected_slave_count: connectedSlaves.length,
// connected_slaves: connectedSlaves
// };
// });
// return reply.send({
// status_code: 200,
// message: "Success",
// master_count: enrichedMasters.length,
// slave_count: enrichedSlaves.length,
// data: masterSummary
// });
// } catch (err) {
// console.error("Error in getMasterSlaveSummary:", err);
// return reply.status(500).send({
// status_code: 500,
// message: "Internal Server Error"
// });
// }
// };
exports.getMasterSlaveSummary = async (req, reply) => { exports.getMasterSlaveSummary = async (req, reply) => {
try { try {
const { customerId } = req.params; const { customerId } = req.params;
if (!customerId) { if (!customerId) {
return reply.status(400).send({ message: "Missing customerId" }); return reply.status(400).send({ error: 'customerId is required' });
} }
const allDevices = await Insensors.find({ customerId }); // Fetch all devices for the customer
const allDevices = await Insensors.find({ customerId }).lean();
const masters = allDevices.filter(device => device.type === 'master'); // Group devices
const slaves = allDevices.filter(device => device.type === 'slave'); const masters = allDevices.filter(dev => dev.type === 'master');
const slaves = allDevices.filter(dev => dev.type === 'slave');
const enrichDeviceWithTimestamp = async (device) => { // Create a map of slaves by connected_to hardwareId
const hardwareId = device.hardwareId?.trim(); const slaveMap = {};
if (!hardwareId) return device.toObject(); for (const slave of slaves) {
const masterId = slave.connected_to;
const latestData = await IotData.findOne({ hardwareId }).sort({ date: -1 }).lean(); if (!slaveMap[masterId]) {
const enriched = device.toObject(); slaveMap[masterId] = [];
}
if (latestData?.date) { const loraTime = slave.connected_lora_time || null;
const indiaTime = moment.tz(latestData.date, "Asia/Kolkata"); const loraDate = slave.connected_lora_date || null;
const date = indiaTime.format("DD-MM-YYYY");
const time = indiaTime.format("HH:mm:ss");
const now = moment.tz("Asia/Kolkata");
const diffInMinutes = now.diff(indiaTime, "minutes");
const isGSMConnected = diffInMinutes <= 1;
const gsmStatus = isGSMConnected ? "connected" : "disconnected";
if (device.type === 'master') { slaveMap[masterId].push({
enriched.connected_gsm_date = date; hardwareId: slave.hardwareId,
enriched.connected_gsm_time = time; tankName: slave.tankName || null,
enriched.gsm_connected_status = gsmStatus; location: slave.tankLocation || null,
enriched.gsm_last_check_time = indiaTime.format("YYYY-MM-DD HH:mm:ss"); connected_status: slave.connected_status || 'disconnected',
} connected_lora_time: loraTime,
connected_lora_date: loraDate
});
} }
if (latestData?.tanks && Array.isArray(latestData.tanks)) { const response = [];
const enrichedTanks = latestData.tanks.map(tank => {
const tankMoment = moment.tz(tank.date, "Asia/Kolkata"); for (const master of masters) {
const tankDiff = moment.tz("Asia/Kolkata").diff(tankMoment, "minutes"); // Fetch latest IoT data for this master
const loraStatus = tankDiff <= 1 ? "connected" : "disconnected"; const latestData = await IotData.findOne({ hardwareId: master.hardwareId })
return { .sort({ date: -1 })
...tank, .lean();
connected_status: loraStatus
const enriched = {
...master,
connected_status: master.connected_status || 'disconnected',
connected_slave_count: slaveMap[master.hardwareId]?.length || 0,
connected_slaves: slaveMap[master.hardwareId] || []
}; };
});
enriched.tanks = enrichedTanks; // Use saved GSM fields from Insensors
if (master.gsm_last_check_time) {
enriched.gsm_last_check_time = master.gsm_last_check_time;
if (device.type === 'slave') { const indiaTime = moment.tz(master.gsm_last_check_time, 'Asia/Kolkata');
const connectedTank = enrichedTanks.find(tank => tank.tankhardwareId === device.hardwareId); enriched.connected_gsm_date = indiaTime.format('DD-MM-YYYY');
enriched.lora_connected_status = connectedTank ? connectedTank.connected_status : "disconnected"; enriched.connected_gsm_time = indiaTime.format('HH:mm:ss');
enriched.connected_lora_date = connectedTank ? moment(connectedTank.date).tz("Asia/Kolkata").format("DD-MM-YYYY") : null;
enriched.connected_lora_time = connectedTank ? connectedTank.time : null;
enriched.lora_last_check_time = connectedTank ? moment(connectedTank.date).tz("Asia/Kolkata").format("YYYY-MM-DD HH:mm:ss") : null;
}
} }
if (device.type === 'slave') { // If LoRa timestamps are available from master (some masters act like slaves too)
delete enriched.connected_gsm_date; if (master.connected_lora_date && master.connected_lora_time) {
delete enriched.connected_gsm_time; enriched.connected_lora_date = master.connected_lora_date;
delete enriched.gsm_connected_status; enriched.connected_lora_time = master.connected_lora_time;
delete enriched.gsm_last_check_time;
} }
if (device.type === 'master') { response.push(enriched);
delete enriched.connected_lora_date;
delete enriched.connected_lora_time;
delete enriched.lora_connected_status;
delete enriched.lora_last_check_time;
delete enriched.tanks; // ✅ Remove tanks for master
} }
return enriched;
};
const enrichedMasters = await Promise.all(masters.map(enrichDeviceWithTimestamp));
const enrichedSlaves = await Promise.all(slaves.map(enrichDeviceWithTimestamp));
const masterSummary = enrichedMasters.map(master => {
const connectedSlaves = enrichedSlaves.filter(slave => slave.connected_to === master.connected_to);
return {
...master,
connected_slave_count: connectedSlaves.length,
connected_slaves: connectedSlaves
};
});
return reply.send({ return reply.send({
status_code: 200, status_code: 200,
message: "Success", message: 'Master-slave summary retrieved successfully',
master_count: enrichedMasters.length, data: response
slave_count: enrichedSlaves.length,
data: masterSummary
}); });
} catch (err) { } catch (err) {
console.error("Error in getMasterSlaveSummary:", err); console.error('Error in getMasterSlaveSummary:', err);
return reply.status(500).send({ return reply.status(500).send({ error: 'Internal Server Error' });
status_code: 500,
message: "Internal Server Error"
});
} }
}; };
// exports.getIotDataByCustomer = async (req, reply) => { // exports.getIotDataByCustomer = async (req, reply) => {
// try { // try {
// const { customerId } = req.params; // const { customerId } = req.params;

Write Preview
Loading…
Cancel
Save