|
|
@ -5099,19 +5099,25 @@ exports.particularCategory = async (req, reply) => {
|
|
|
|
connected_status: "disconnected"
|
|
|
|
connected_status: "disconnected"
|
|
|
|
}).lean();
|
|
|
|
}).lean();
|
|
|
|
|
|
|
|
|
|
|
|
const slaveDetails = slaves.map(slave => ({
|
|
|
|
const slaveDetails = slaves.map(slave => {
|
|
|
|
hardwareId: slave.hardwareId,
|
|
|
|
const slaveIssue = issues.find(i => i.hardwareId === slave.hardwareId);
|
|
|
|
tankName: slave.tankName || "",
|
|
|
|
return {
|
|
|
|
location: slave.tankLocation || "",
|
|
|
|
hardwareId: slave.hardwareId,
|
|
|
|
connected_status: slave.connected_status,
|
|
|
|
tankName: slave.tankName || "",
|
|
|
|
lora_last_disconnect_time: slave.lora_last_disconnect_time || null,
|
|
|
|
location: slave.tankLocation || "",
|
|
|
|
connected_to: slave.connected_to || "",
|
|
|
|
connected_status: slave.connected_status,
|
|
|
|
masterName: orderMap[master.hardwareId]?.masterName || "",
|
|
|
|
lora_last_disconnect_time: slave.lora_last_disconnect_time || null,
|
|
|
|
type: "slave",
|
|
|
|
connected_to: slave.connected_to || "",
|
|
|
|
typeOfWater: slave.typeOfWater || "",
|
|
|
|
masterName: orderMap[master.hardwareId]?.masterName || "",
|
|
|
|
support_lora_last_check_time: null,
|
|
|
|
type: "slave",
|
|
|
|
category // category included for each slave
|
|
|
|
typeOfWater: slave.typeOfWater || "",
|
|
|
|
}));
|
|
|
|
support_lora_last_check_time: null,
|
|
|
|
|
|
|
|
category,
|
|
|
|
|
|
|
|
assignedTo: slaveIssue?.assignedTo || null // <-- Include assigned details here
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const masterIssue = issues.find(i => i.hardwareId === master.hardwareId);
|
|
|
|
|
|
|
|
|
|
|
|
disconnectedIssues.push({
|
|
|
|
disconnectedIssues.push({
|
|
|
|
hardwareId: master.hardwareId,
|
|
|
|
hardwareId: master.hardwareId,
|
|
|
@ -5123,7 +5129,8 @@ exports.particularCategory = async (req, reply) => {
|
|
|
|
support_gsm_last_check_time: null,
|
|
|
|
support_gsm_last_check_time: null,
|
|
|
|
connected_slave_count: slaveDetails.length,
|
|
|
|
connected_slave_count: slaveDetails.length,
|
|
|
|
connected_slaves: slaveDetails,
|
|
|
|
connected_slaves: slaveDetails,
|
|
|
|
category // category included for master
|
|
|
|
category,
|
|
|
|
|
|
|
|
assignedTo: masterIssue?.assignedTo || null // <-- Include assigned details here
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|