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

height width length display

Browse Source
master^2
Bhaskar 5 months ago
parent db5f401927
commit 915998b11d
1 changed files with 185 additions and 75 deletions
Show Stats Download Patch File Download Diff File

260
src/controllers/installationController.js
Unescape View File

@ -1228,95 +1228,95 @@ exports.createMasterSlaveData = async (req, reply) => {
}
};
exports.masterConnectedSlaveList = async (req, reply) => {
try {
const { connectedTo } = req.params;
// exports.masterConnectedSlaveList = async (req, reply) => {
// try {
// const { connectedTo } = req.params;
// Step 1: Get master device details
const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
if (!master) {
return reply.status(404).send({
success: false,
message: "Master device not found"
});
}
// // Step 1: Get master device details
// const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
// if (!master) {
// return reply.status(404).send({
// success: false,
// message: "Master device not found"
// });
// }
// Step 2: Get tank metadata for master
const tankDetails = await Tank.findOne({ hardwareId: connectedTo }, { tankLocation: 1, typeOfWater: 1 }).lean();
// // Step 2: Get tank metadata for master
// const tankDetails = await Tank.findOne({ hardwareId: connectedTo }, { tankLocation: 1, typeOfWater: 1 }).lean();
const masterTypeOfWater = tankDetails?.typeOfWater || null;
// const masterTypeOfWater = tankDetails?.typeOfWater || null;
// Step 3: Get slave tanks connected to master
const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
const slaveCount = slaveTanks.length;
// // Step 3: Get slave tanks connected to master
// const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
// const slaveCount = slaveTanks.length;
// Step 4: Get latest IotData for master
const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
// // Step 4: Get latest IotData for master
// const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
// Step 5: Fetch order to get masterName and location
const order = await Order.findOne({ "master_connections.hardwareId": connectedTo }).lean();
let masterOrderInfo = {};
if (order) {
const match = order.master_connections.find(mc => mc.hardwareId === connectedTo);
if (match) {
masterOrderInfo = {
masterName: match.master_name || "",
location: match.location || ""
};
}
}
// // Step 5: Fetch order to get masterName and location
// const order = await Order.findOne({ "master_connections.hardwareId": connectedTo }).lean();
// let masterOrderInfo = {};
// if (order) {
// const match = order.master_connections.find(mc => mc.hardwareId === connectedTo);
// if (match) {
// masterOrderInfo = {
// masterName: match.master_name || "",
// location: match.location || ""
// };
// }
// }
// Step 6: Prepare master object for response
const masterResponse = {
...master,
isMaster: true,
tankLocation: tankDetails?.tankLocation || null,
typeOfWater: masterTypeOfWater,
tankHeight: null,
masterName: masterOrderInfo.masterName,
location: masterOrderInfo.location
};
// // Step 6: Prepare master object for response
// const masterResponse = {
// ...master,
// isMaster: true,
// tankLocation: tankDetails?.tankLocation || null,
// typeOfWater: masterTypeOfWater,
// tankHeight: null,
// masterName: masterOrderInfo.masterName,
// location: masterOrderInfo.location
// };
// Step 7: Process each slave
const processedSlaves = slaveTanks.map(slave => {
const originalHardwareId = slave.hardwareId;
const tankHardwareId = slave.tankhardwareId;
// // Step 7: Process each slave
// const processedSlaves = slaveTanks.map(slave => {
// const originalHardwareId = slave.hardwareId;
// const tankHardwareId = slave.tankhardwareId;
// Determine final hardwareId: prefer tankhardwareId if exists
const finalHardwareId = tankHardwareId || originalHardwareId;
// // Determine final hardwareId: prefer tankhardwareId if exists
// const finalHardwareId = tankHardwareId || originalHardwareId;
const matchingTankData = latestIotData?.tanks?.find(t =>
t.tankhardwareId === finalHardwareId || t.hardwareId === finalHardwareId
);
// const matchingTankData = latestIotData?.tanks?.find(t =>
// t.tankhardwareId === finalHardwareId || t.hardwareId === finalHardwareId
// );
return {
...slave,
isMaster: false,
hardwareId: finalHardwareId, // Replace hardwareId with tankhardwareId if present
tankHeight: matchingTankData?.tankHeight ?? null,
typeOfWater: masterTypeOfWater === 'bore' ? 'bore' : (slave.typeOfWater || null)
};
});
// return {
// ...slave,
// isMaster: false,
// hardwareId: finalHardwareId, // Replace hardwareId with tankhardwareId if present
// tankHeight: matchingTankData?.tankHeight ?? null,
// typeOfWater: masterTypeOfWater === 'bore' ? 'bore' : (slave.typeOfWater || null)
// };
// });
// Step 8: Combine master and slaves into one array
const combinedData = [masterResponse, ...processedSlaves];
// // Step 8: Combine master and slaves into one array
// const combinedData = [masterResponse, ...processedSlaves];
return reply.send({
success: true,
tankLocation: tankDetails?.tankLocation || null,
typeOfWater: masterTypeOfWater,
connectedSlaveCount: slaveCount,
data: combinedData
});
// return reply.send({
// success: true,
// tankLocation: tankDetails?.tankLocation || null,
// typeOfWater: masterTypeOfWater,
// connectedSlaveCount: slaveCount,
// data: combinedData
// });
} catch (error) {
console.error("Error fetching master connected slave data:", error);
return reply.status(500).send({
success: false,
message: "Internal Server Error"
});
}
};
// } catch (error) {
// console.error("Error fetching master connected slave data:", error);
// return reply.status(500).send({
// success: false,
// message: "Internal Server Error"
// });
// }
// };
@ -1452,6 +1452,116 @@ exports.masterConnectedSlaveList = async (req, reply) => {
// };
exports.masterConnectedSlaveList = async (req, reply) => {
try {
const { connectedTo } = req.params;
// Step 1: Get master device details
const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
if (!master) {
return reply.status(404).send({
success: false,
message: "Master device not found"
});
}
// Step 2: Get tank metadata for master (including height, length, width)
const tankDetails = await Tank.findOne(
{ hardwareId: connectedTo },
{
tankLocation: 1,
typeOfWater: 1,
height: 1,
length: 1,
width: 1
}
).lean();
const masterTypeOfWater = tankDetails?.typeOfWater || null;
// Step 3: Get slave tanks connected to master
const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
const slaveCount = slaveTanks.length;
// Step 4: Get latest IotData for master
const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
// Step 5: Fetch order to get masterName and location
const order = await Order.findOne({ "master_connections.hardwareId": connectedTo }).lean();
let masterOrderInfo = {};
if (order) {
const match = order.master_connections.find(mc => mc.hardwareId === connectedTo);
if (match) {
masterOrderInfo = {
masterName: match.master_name || "",
location: match.location || ""
};
}
}
// Step 6: Prepare master object for response
const masterResponse = {
...master,
isMaster: true,
tankLocation: tankDetails?.tankLocation || null,
typeOfWater: masterTypeOfWater,
tankHeight: null,
masterName: masterOrderInfo.masterName,
location: masterOrderInfo.location,
height: tankDetails?.height || null,
length: tankDetails?.length || null,
width: tankDetails?.width || null
};
// Step 7: Process each slave
const processedSlaves = await Promise.all(slaveTanks.map(async slave => {
const originalHardwareId = slave.hardwareId;
const tankHardwareId = slave.tankhardwareId;
const finalHardwareId = tankHardwareId || originalHardwareId;
const matchingTankData = latestIotData?.tanks?.find(t =>
t.tankhardwareId === finalHardwareId || t.hardwareId === finalHardwareId
);
// Optionally fetch tank meta for slave too (if needed)
const slaveTankMeta = await Tank.findOne(
{ hardwareId: slave.hardwareId },
{ height: 1, length: 1, width: 1 }
).lean();
return {
...slave,
isMaster: false,
hardwareId: finalHardwareId,
tankHeight: matchingTankData?.tankHeight ?? null,
typeOfWater: masterTypeOfWater === 'bore' ? 'bore' : (slave.typeOfWater || null),
height: slaveTankMeta?.height || null,
length: slaveTankMeta?.length || null,
width: slaveTankMeta?.width || null
};
}));
// Step 8: Combine master and slaves into one array
const combinedData = [masterResponse, ...processedSlaves];
return reply.send({
success: true,
tankLocation: tankDetails?.tankLocation || null,
typeOfWater: masterTypeOfWater,
connectedSlaveCount: slaveCount,
data: combinedData
});
} catch (error) {
console.error("Error fetching master connected slave data:", error);
return reply.status(500).send({
success: false,
message: "Internal Server Error"
});
}
};
exports.mastrerList = async (req, reply) => {
try {

Write Preview
Loading…
Cancel
Save