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

changes

Browse Source
master^2
Bhaskar 10 months ago
parent cfaa1a5e0e
commit 7fb3ff5033
1 changed files with 324 additions and 153 deletions
Show Stats Download Patch File Download Diff File

477
src/controllers/tanksController.js
Unescape View File

@ -6602,7 +6602,272 @@ client.on('connect', () => {
// }); // });
// Handling incoming MQTT messages // Handling incoming MQTT messages important
// client.on('message', async (topic, message) => {
// console.log(`Message received on topic ${topic}:`, message.toString());
// if (topic === 'water/iot-data') {
// try {
// const data = JSON.parse(message.toString());
// const { hw_Id, Motor_status, tanks } = data.objects; // Updated variable names according to new format
// // Get the current date and time in the required format
// const currentDate = new Date();
// const date = currentDate.toISOString(); // ISO string for date
// const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' }); // Time in 'HH:MM:SS'
// // Create array of tank documents with current date and time
// const tankDocuments = tanks.map(tank => ({
// tankhardwareId: tank.Id, // Updated to match the new format
// tankHeight: tank.level, // Updated to match the new format
// date,
// time
// }));
// // Save IoT data for the received tanks
// const iotTankData = new IotData({
// hardwareId: hw_Id, // Updated variable name
// Motor_status,
// tanks: tankDocuments,
// date,
// time
// });
// await iotTankData.save();
// // Delete excess records (keep only the latest three records)
// const recordsToKeep = 3;
// const recordsToDelete = await IotData.find({ hardwareId: hw_Id }) // Updated variable name
// .sort({ date: -1, time: -1 })
// .skip(recordsToKeep);
// for (const record of recordsToDelete) {
// await record.remove();
// }
// // Process each tank to update water level and connections
// for (const tank of tanks) {
// const { Id: tankhardwareId, level: tankHeight } = tank; // Updated to match the new format
// // Find the corresponding tank in the Tank schema using hardwareId and tankhardwareId
// const existingTank = await Tank.findOne({ hardwareId: hw_Id, tankhardwareId }); // Updated variable name
// if (!existingTank) continue;
// const customerId = existingTank.customerId;
// const tank_name = existingTank.tankName;
// // Calculate water level using tank height and capacity
// const tankHeightInCm = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48; // Convert height to cm
// const tank_height = parseInt(tankHeightInCm.toFixed(0), 10);
// const waterLevelHeight = tank_height - tankHeight;
// const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10);
// const waterLevel = parseInt(waterLevelHeight * waterCapacityPerCm, 10); // Calculated water level
// // Update water level in the existing tank
// console.log(tankHeight,"this is located in tank controllers at iot-data mqtt sub ")
// if (tankHeight>0 && waterLevel >= 0) {
// existingTank.waterlevel = waterLevel;
// await existingTank.save();
// // Update linked tanks (input/output connections)
// for (const outputConnection of existingTank.connections.outputConnections) {
// const linkedTank = await Tank.findOne({ customerId, tankName: outputConnection.outputConnections, tankLocation: outputConnection.output_type });
// if (linkedTank) {
// for (const inputConnection of linkedTank.connections.inputConnections) {
// if (inputConnection.inputConnections === tank_name) {
// inputConnection.water_level = waterLevel; // Update water level for linked tank
// await linkedTank.save(); // Save updated linked tank
// }
// }
// }
// }
// }
// }
// // Update motor status
// const status = Motor_status;
// const motorTank = await Tank.findOne({ "connections.inputConnections.motor_id": hw_Id }); // Updated variable name
// if (!motorTank) {
// console.log('Motor not found for the specified motor_id');
// return;
// }
// // Find the inputConnection for the motor and update motor status
// const inputConnection = motorTank.connections.inputConnections.find(conn => conn.motor_id === hw_Id); // Updated variable name
// const user = await User.findOne({ customerId: motorTank.customerId }); // Fetch user by customerId
// const allowNotifications = user?.manualStartAndStopNotify ?? true; // Default to true if not set
// if (!motorTank) {
// console.warn(`⚠️ Motor not found for motor_id: ${hw_Id}`);
// return;
// }
// if (!inputConnection) {
// console.warn(`⚠️ No inputConnection found for motor_id: ${hw_Id}`);
// return;
// }
// if (inputConnection) {
// inputConnection.motor_status = status; // Update motor status
// const tankName = motorTank.tankName;
// const customerId = motorTank.customerId;
// console.log("tankName",tankName)
// console.log("customerId", customerId)
// console.log("status", status)
// // Ensure fcmTokens are fetched before emitting
// // const user = await User.findOne({ customerId: motorTank.customerId }).select("fcmIds manualStartAndStopNotify");
// // const fcmTokens = user?.fcmIds || []; // Ensure fcmTokens is an array
// // console.log("fcmTokens", fcmTokens)
// const users = await User.findOne({ customerId : motorTank.customerId}).select("fcmIds");
// let fcmTokens = users.fcmIds.filter(token => token);
// console.log(`📡 Found ${fcmTokens.length} FCM tokens for Customer ID: ${customerId}`);
// if (!Array.isArray(fcmTokens) || fcmTokens.length === 0) {
// console.warn(`⚠️ No valid FCM tokens found for Customer ID: ${customerId}`);
// }
// console.log(`📢 Processing motor logic for hw_Id: ${hw_Id}`);
// const blockName = motorTank.blockName || "N/A";
// console.log("🔍 Debugging Condition Check:");
// console.log("🛠️ inputConnection.motor_stop_status:", inputConnection.motor_stop_status);
// console.log("🛠️ Motor_status:", status);
// console.log("🛠️inputConnection.motor_status:", inputConnection.motor_status);
// console.log("🛠️ inputConnection.motor_on_type:", inputConnection.motor_on_type);
// // if (status === 2 && inputConnection.motor_stop_status === "1" && inputConnection.motor_on_type !== "forced_manual") {
// // // Only update if motor_stop_status is still 1 (motor was previously OFF)
// // inputConnection.motor_stop_status ="2";
// // inputConnection.motor_on_type = "forced_manual";
// // inputConnection.startTime = new Date().toISOString();
// // // status = 1;
// // // inputConnection.motor_status = "1";
// // console.log("🛠️ IN inputConnection.motor_stop_status:", inputConnection.motor_stop_status);
// // console.log("🛠️In Motor_status:", status);
// // console.log("🛠️In inputConnection.motor_status:", inputConnection.motor_status);
// // console.log("🚀 Motor started. Updating motor_stop_status to 2.");
// // console.log("📢 Emitting sendMotorStartNotification event...");
// // await motorTank.markModified("connections.inputConnections");
// // await motorTank.save();
// // console.log("💾 motorTank saved successfully after start.");
// // eventEmitter.emit(
// // "sendMotorStartNotification",
// // hw_Id,
// // customerId,
// // fcmTokens,
// // inputConnection.water_level || 0,
// // blockName,
// // tankName,
// // "forced_manual",
// // inputConnection.stop_criteria,
// // inputConnection.typeOfWater,
// // inputConnection.manual_threshold_time
// // );
// // }
// // console.log(`🔍 Checking stop condition: status=${status}, motor_stop_status=${inputConnection.motor_stop_status}`);
// // if (status === 1 && inputConnection.motor_stop_status === "2") {
// // console.log("🛑 Motor stopping... Updating motor_stop_status to 1.");
// // inputConnection.motor_stop_status = "1";
// // inputConnection.stopTime = new Date().toISOString();
// // await motorTank.markModified("connections.inputConnections");
// // await motorTank.save(); // Ensure data is saved before emitting
// // console.log("📢 Emitting sendMotorStopNotification event...");
// // eventEmitter.emit(
// // "sendMotorStopNotification",
// // hw_Id,
// // customerId,
// // fcmTokens,
// // inputConnection.water_level || 0,
// // blockName,
// // tankName,
// // "forced_manual",
// // inputConnection.typeOfWater
// // );
// // }
// // if (status === 2 && inputConnection.motor_stop_status === "1" && inputConnection.motor_on_type !== "forced_manual") {
// // // Motor is starting (only execute this block)
// // inputConnection.motor_stop_status = "2"; // Motor is now running
// // inputConnection.motor_on_type = "forced_manual";
// // inputConnection.startTime = new Date().toISOString();
// // console.log("🚀 Motor started. Updating motor_stop_status to 2.");
// // console.log("📢 Emitting sendMotorStartNotification event...");
// // await motorTank.markModified("connections.inputConnections");
// // await motorTank.save();
// // console.log("💾 motorTank saved successfully after start.");
// // eventEmitter.emit(
// // "sendMotorStartNotification",
// // hw_Id,
// // customerId,
// // fcmTokens,
// // inputConnection.water_level || 0,
// // blockName,
// // tankName,
// // "forced_manual",
// // inputConnection.stop_criteria,
// // inputConnection.typeOfWater,
// // inputConnection.manual_threshold_time
// // );
// // } else if (status === 1 && inputConnection.motor_stop_status === "2") {
// // // Motor is stopping (only execute this block)
// // console.log("🛑 Motor stopping... Updating motor_stop_status to 1.");
// // inputConnection.motor_stop_status = "1"; // Motor is now OFF
// // inputConnection.stopTime = new Date().toISOString();
// // await motorTank.markModified("connections.inputConnections");
// // await motorTank.save(); // Ensure data is saved before emitting
// // console.log("📢 Emitting sendMotorStopNotification event...");
// // eventEmitter.emit(
// // "sendMotorStopNotification",
// // hw_Id,
// // customerId,
// // fcmTokens,
// // inputConnection.water_level || 0,
// // blockName,
// // tankName,
// // "forced_manual",
// // inputConnection.typeOfWater
// // );
// // }
// console.log(`🔍 Final condition: status=${status}, motor_stop_status=${inputConnection.motor_stop_status}`);
// await motorTank.save(); // Save the updated tank
// }
// console.log('Data processed successfully for hardwareId:', hw_Id); // Updated variable name
// } catch (err) {
// console.error('Error processing message:', err.message);
// }
// }
// });
client.on('message', async (topic, message) => { client.on('message', async (topic, message) => {
console.log(`Message received on topic ${topic}:`, message.toString()); console.log(`Message received on topic ${topic}:`, message.toString());
@ -6699,163 +6964,44 @@ client.on('message', async (topic, message) => {
const user = await User.findOne({ customerId: motorTank.customerId }); // Fetch user by customerId const user = await User.findOne({ customerId: motorTank.customerId }); // Fetch user by customerId
const allowNotifications = user?.manualStartAndStopNotify ?? true; // Default to true if not set const allowNotifications = user?.manualStartAndStopNotify ?? true; // Default to true if not set
if (!motorTank) {
console.warn(`⚠️ Motor not found for motor_id: ${hw_Id}`);
return;
}
if (!inputConnection) {
console.warn(`⚠️ No inputConnection found for motor_id: ${hw_Id}`);
return;
}
if (inputConnection) { if (inputConnection) {
inputConnection.motor_status = status; // Update motor status inputConnection.motor_status = status; // Update motor status
const tankName = motorTank.tankName; const tankName = motorTank.tankName;
const customerId = motorTank.customerId; if (allowNotifications && inputConnection.motor_stop_status === "1" && status === 2 && inputConnection.motor_on_type !== "forced_manual") {
console.log("tankName",tankName) const currentTime = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm');
console.log("customerId", customerId) inputConnection.motor_stop_status = "2";
console.log("status", status) inputConnection.motor_on_type = "forced_manual";
inputConnection.startTime = currentTime;
// Ensure fcmTokens are fetched before emitting
// const user = await User.findOne({ customerId: motorTank.customerId }).select("fcmIds manualStartAndStopNotify"); eventEmitter.emit(
// const fcmTokens = user?.fcmIds || []; // Ensure fcmTokens is an array "sendMotorStartNotification",
// console.log("fcmTokens", fcmTokens) fcmToken, // FCM tokens
hw_Id, // Motor ID
const users = await User.findOne({ customerId : motorTank.customerId}).select("fcmIds"); inputConnection.water_level || 0, // Water level
motorTank.blockName || "N/A", // Block name
let fcmTokens = users.fcmIds.filter(token => token); tankName, // Tank name
inputConnection.motor_on_type, // Motor on type
console.log(`📡 Found ${fcmTokens.length} FCM tokens for Customer ID: ${customerId}`); "threshold", // Stop criteria
manual_threshold_time // Threshold time in mins
if (!Array.isArray(fcmTokens) || fcmTokens.length === 0) { );
console.warn(`⚠️ No valid FCM tokens found for Customer ID: ${customerId}`); }
}
console.log(`📢 Processing motor logic for hw_Id: ${hw_Id}`);
const blockName = motorTank.blockName || "N/A";
console.log("🔍 Debugging Condition Check:");
console.log("🛠️ inputConnection.motor_stop_status:", inputConnection.motor_stop_status);
console.log("🛠️ Motor_status:", status);
console.log("🛠️inputConnection.motor_status:", inputConnection.motor_status);
console.log("🛠️ inputConnection.motor_on_type:", inputConnection.motor_on_type);
// if (status === 2 && inputConnection.motor_stop_status === "1" && inputConnection.motor_on_type !== "forced_manual") {
// // Only update if motor_stop_status is still 1 (motor was previously OFF)
// inputConnection.motor_stop_status ="2";
// inputConnection.motor_on_type = "forced_manual";
// inputConnection.startTime = new Date().toISOString();
// // status = 1;
// // inputConnection.motor_status = "1";
// console.log("🛠️ IN inputConnection.motor_stop_status:", inputConnection.motor_stop_status);
// console.log("🛠️In Motor_status:", status);
// console.log("🛠️In inputConnection.motor_status:", inputConnection.motor_status);
// console.log("🚀 Motor started. Updating motor_stop_status to 2.");
// console.log("📢 Emitting sendMotorStartNotification event...");
// await motorTank.markModified("connections.inputConnections");
// await motorTank.save();
// console.log("💾 motorTank saved successfully after start.");
// eventEmitter.emit(
// "sendMotorStartNotification",
// hw_Id,
// customerId,
// fcmTokens,
// inputConnection.water_level || 0,
// blockName,
// tankName,
// "forced_manual",
// inputConnection.stop_criteria,
// inputConnection.typeOfWater,
// inputConnection.manual_threshold_time
// );
// }
// console.log(`🔍 Checking stop condition: status=${status}, motor_stop_status=${inputConnection.motor_stop_status}`);
// if (status === 1 && inputConnection.motor_stop_status === "2") {
// console.log("🛑 Motor stopping... Updating motor_stop_status to 1.");
// inputConnection.motor_stop_status = "1";
// inputConnection.stopTime = new Date().toISOString();
// await motorTank.markModified("connections.inputConnections"); if (allowNotifications && inputConnection.motor_stop_status === "2" && status === 1) {
// await motorTank.save(); // Ensure data is saved before emitting const currentTime = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm');
inputConnection.motor_stop_status = "1";
inputConnection.stopTime = currentTime;
eventEmitter.emit(
"sendMotorStopNotification",
fcmToken, // FCM tokens
hw_Id, // Motor ID
inputConnection.water_level || 0, // Water level
motorTank.blockName || "N/A", // Block name
tankName, // Tank name
inputConnection.motor_on_type // Motor on type
);
}
// console.log("📢 Emitting sendMotorStopNotification event...");
// eventEmitter.emit(
// "sendMotorStopNotification",
// hw_Id,
// customerId,
// fcmTokens,
// inputConnection.water_level || 0,
// blockName,
// tankName,
// "forced_manual",
// inputConnection.typeOfWater
// );
// }
// if (status === 2 && inputConnection.motor_stop_status === "1" && inputConnection.motor_on_type !== "forced_manual") {
// // Motor is starting (only execute this block)
// inputConnection.motor_stop_status = "2"; // Motor is now running
// inputConnection.motor_on_type = "forced_manual";
// inputConnection.startTime = new Date().toISOString();
// console.log("🚀 Motor started. Updating motor_stop_status to 2.");
// console.log("📢 Emitting sendMotorStartNotification event...");
// await motorTank.markModified("connections.inputConnections");
// await motorTank.save();
// console.log("💾 motorTank saved successfully after start.");
// eventEmitter.emit(
// "sendMotorStartNotification",
// hw_Id,
// customerId,
// fcmTokens,
// inputConnection.water_level || 0,
// blockName,
// tankName,
// "forced_manual",
// inputConnection.stop_criteria,
// inputConnection.typeOfWater,
// inputConnection.manual_threshold_time
// );
// } else if (status === 1 && inputConnection.motor_stop_status === "2") {
// // Motor is stopping (only execute this block)
// console.log("🛑 Motor stopping... Updating motor_stop_status to 1.");
// inputConnection.motor_stop_status = "1"; // Motor is now OFF
// inputConnection.stopTime = new Date().toISOString();
// await motorTank.markModified("connections.inputConnections");
// await motorTank.save(); // Ensure data is saved before emitting
// console.log("📢 Emitting sendMotorStopNotification event...");
// eventEmitter.emit(
// "sendMotorStopNotification",
// hw_Id,
// customerId,
// fcmTokens,
// inputConnection.water_level || 0,
// blockName,
// tankName,
// "forced_manual",
// inputConnection.typeOfWater
// );
// }
console.log(`🔍 Final condition: status=${status}, motor_stop_status=${inputConnection.motor_stop_status}`);
await motorTank.save(); // Save the updated tank await motorTank.save(); // Save the updated tank
} }
@ -6870,6 +7016,31 @@ client.on('message', async (topic, message) => {
exports.getPendingAndCompletedsurveyOfparticularInstaller = async (request, reply) => {
try {
const { installationId } = request.params;
const survey_status = request.body;
const surveydata = await User.find({
installationId,
survey_status,
});
// Send the response, including both total consumption and filtered consumption records
reply.send({
status_code: 200,
surveydata,
});
} catch (err) {
throw boom.boomify(err);
}
};

Write Preview
Loading…
Cancel
Save